rework the text wrapping stuff. Now we use pango to figure out where

Wed Sep 24 16:34:02 2003  George Lebl <jirka@5z.com>

	* gui/greeter/greeter_item_pam.c, gui/greeter/greeter_geometry.c,
	  gui/greeter/greeter_canvas_item.[ch]: rework the text wrapping
	  stuff.  Now we use pango to figure out where breaks should be
	  and then do a pretty stupid algorithm to break the string at
	  the requested length.  This works better it seems and isn't
	  perhaps on as much crack as messing with the canvas text items
	  pango layout.  It's still on crack however.

3 files changed, 66 insertions, 66 deletions

diff --git a/gui/greeter/themes/circles/circles.xml.in b/gui/greeter/themes/circles/circles.xml.in
index 21f69e9c..078b79c8 100644
--- a/gui/greeter/themes/circles/circles.xml.in
+++ b/gui/greeter/themes/circles/circles.xml.in
@@ -24,9 +24,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Language -->
 		<stock type="language"/>
@@ -44,9 +44,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Session -->
 		<stock type="session"/>
@@ -65,9 +65,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Actions -->
 		<stock type="system"/>
@@ -86,18 +86,18 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: D_isconnect -->
 		<stock type="disconnect"/>
 	        <show modes="remote"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Quit -->
 		<stock type="quit"/>
@@ -114,7 +114,7 @@
     <pos x="100%" y="100%" anchor="se"/>
   </item>
   <item type="label" id="clock">
-    <normal color="#000000" font="Sans 16"/>
+    <normal color="#000000" font="Sans 12"/>
     <pos x="-20" y="-37" anchor="e"/>
     <text>%c</text>
   </item>
@@ -124,7 +124,7 @@
     <pos anchor="c" x="50%" y="75%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: You've got capslock on! -->
 	<stock type="caps-lock-warning"/>
@@ -138,7 +138,7 @@
     <pos anchor="c" x="50%" y="25%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label" id="timed-label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: User %s will login in %d seconds -->
 	<stock type="timed-label"/>
@@ -152,13 +152,13 @@
     <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 18"/>
+        <normal color="#000000" font="Sans 14"/>
 	<!-- Stock label for: Welcome to %h -->
 	<stock type="welcome-label"/>
       </item>
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
 	<!-- Stock label for: Username: -->
 	<stock type="username-label"/>
       </item>
@@ -173,14 +173,14 @@
       </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
 	<text></text>
       </item>
     </box>
     <fixed>
       <item type="label" id="pam-error">
         <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <text></text>
       </item>
     </fixed>
diff --git a/gui/greeter/themes/happygnome-list/happygnome.xml.in b/gui/greeter/themes/happygnome-list/happygnome.xml.in
index 015048b5..3e8bc5e1 100644
--- a/gui/greeter/themes/happygnome-list/happygnome.xml.in
+++ b/gui/greeter/themes/happygnome-list/happygnome.xml.in
@@ -24,9 +24,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Language -->
 		<stock type="language"/>
@@ -44,9 +44,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Session -->
 		<stock type="session"/>
@@ -65,9 +65,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Actions -->
 		<stock type="system"/>
@@ -86,18 +86,18 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: D_isconnect -->
 		<stock type="disconnect"/>
 	        <show modes="remote"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Quit -->
 		<stock type="quit"/>
@@ -114,7 +114,7 @@
     <pos x="-10" y="-10" anchor="se"/>
   </item>
   <item type="label" id="clock">
-    <normal color="#000000" font="Sans 16"/>
+    <normal color="#000000" font="Sans 12"/>
     <pos x="-160" y="-37" anchor="e"/>
     <text>%c</text>
   </item>
@@ -124,7 +124,7 @@
     <pos anchor="c" x="75%" y="75%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: You've got capslock on! -->
 	<stock type="caps-lock-warning"/>
@@ -138,7 +138,7 @@
     <pos anchor="c" x="75%" y="25%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label" id="timed-label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: User %s will login in %d seconds -->
 	<stock type="timed-label"/>
@@ -168,13 +168,13 @@
     <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 18"/>
+        <normal color="#000000" font="Sans 14"/>
 	<!-- Stock label for: Welcome to %h -->
 	<stock type="welcome-label"/>
       </item>
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 12"/>
 	<!-- Stock label for: Username: -->
 	<stock type="username-label"/>
       </item>
@@ -189,14 +189,14 @@
       </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 12"/>
 	<text></text>
       </item>
     </box>
     <fixed>
       <item type="label" id="pam-error">
         <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 12"/>
         <text></text>
       </item>
     </fixed>
diff --git a/gui/greeter/themes/happygnome/happygnome.xml.in b/gui/greeter/themes/happygnome/happygnome.xml.in
index 87927368..278f98cb 100644
--- a/gui/greeter/themes/happygnome/happygnome.xml.in
+++ b/gui/greeter/themes/happygnome/happygnome.xml.in
@@ -24,9 +24,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Language -->
 		<stock type="language"/>
@@ -44,9 +44,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Session -->
 		<stock type="session"/>
@@ -65,9 +65,9 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Actions -->
 		<stock type="system"/>
@@ -86,18 +86,18 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: D_isconnect -->
 		<stock type="disconnect"/>
 	        <show modes="remote"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#000000" font="Sans 14"/>
-		<prelight color="#666666" font="Sans 14"/>
-		<active color="#ff0000" font="Sans 14"/>
+	        <normal color="#000000" font="Sans 12"/>
+		<prelight color="#666666" font="Sans 12"/>
+		<active color="#ff0000" font="Sans 12"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Quit -->
 		<stock type="quit"/>
@@ -114,7 +114,7 @@
     <pos x="-10" y="-10" anchor="se"/>
   </item>
   <item type="label" id="clock">
-    <normal color="#000000" font="Sans 16"/>
+    <normal color="#000000" font="Sans 12"/>
     <pos x="-160" y="-37" anchor="e"/>
     <text>%c</text>
   </item>
@@ -124,7 +124,7 @@
     <pos anchor="c" x="50%" y="75%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: You've got capslock on! -->
 	<stock type="caps-lock-warning"/>
@@ -138,7 +138,7 @@
     <pos anchor="c" x="50%" y="25%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label" id="timed-label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: User %s will login in %d seconds -->
 	<stock type="timed-label"/>
@@ -152,13 +152,13 @@
     <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 18"/>
+        <normal color="#000000" font="Sans 14"/>
 	<!-- Stock label for: Welcome to %h -->
 	<stock type="welcome-label"/>
       </item>
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
 	<!-- Stock label for: Username: -->
 	<stock type="username-label"/>
       </item>
@@ -173,14 +173,14 @@
       </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#000000" font="Sans 12"/>
 	<text></text>
       </item>
     </box>
     <fixed>
       <item type="label" id="pam-error">
         <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 12"/>
         <text></text>
       </item>
     </fixed>