[Xcb-commit] 2 commits - neko xcbrandr.c

[Ian Osgood]

 neko/xcbneko.c |   26 +++++++++++++-------------
 xcbrandr.c     |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
diff-tree a1736e6a47325317b4988b1a9acc97fb718380a6 (from d545bbb314880ae23fb15742b12d98796d596cfc)
Author: Ian Osgood <iano at quirkster.com>
Date:   Fri Apr 13 13:36:42 2007 -0700

    Adapt for recent util/icccm renaming.

diff --git a/neko/xcbneko.c b/neko/xcbneko.c
index 8df938e..23b150e 100644
--- a/neko/xcbneko.c
+++ b/neko/xcbneko.c
@@ -680,37 +680,37 @@ InitScreen( char *DisplayName, char *the
 
 	/* new: obey the window-delete protocol, look for XCB_CLIENT_MESSAGE */
 	deleteWindowAtom = GetAtom(xc, "WM_DELETE_WINDOW");
-	set_wm_protocols( xc, theWindow, 1, &deleteWindowAtom );
+	xcb_set_wm_protocols( xc, theWindow, 1, &deleteWindowAtom );
 
 	theIconPixmap = CreateBitmapFromData( xc, theWindow,
 										  icon_bits, icon_width, icon_height );
 
-	wm_hints_t *theWMHints = alloc_wm_hints();
+	xcb_wm_hints_t *theWMHints = xcb_alloc_wm_hints();
 
-	wm_hints_set_icon_pixmap( theWMHints, theIconPixmap );
+	xcb_wm_hints_set_icon_pixmap( theWMHints, theIconPixmap );
 
 	if ( iconicState )
-	  wm_hints_set_iconic( theWMHints );
+	  xcb_wm_hints_set_iconic( theWMHints );
 	else
-	  wm_hints_set_normal( theWMHints );
+	  xcb_wm_hints_set_normal( theWMHints );
 	
-	set_wm_hints( xc, theWindow, theWMHints);
+	xcb_set_wm_hints( xc, theWindow, theWMHints);
 	
 	free( theWMHints );
 
 	/* why hide the structure? */
-	size_hints_t *theSizeHints = alloc_size_hints();
+	xcb_size_hints_t *theSizeHints = xcb_alloc_size_hints();
 
 	/* need enum for second param (user specified) */
-	size_hints_set_position(theSizeHints, 0, WindowPointX, WindowPointY);
-	size_hints_set_size(theSizeHints, 0, WindowWidth, WindowHeight);
+	xcb_size_hints_set_position(theSizeHints, 0, WindowPointX, WindowPointY);
+	xcb_size_hints_set_size(theSizeHints, 0, WindowWidth, WindowHeight);
 
-	set_wm_normal_hints(xc, theWindow, theSizeHints);
+	xcb_set_wm_normal_hints(xc, theWindow, theSizeHints);
 
-	free_size_hints(theSizeHints);
+	xcb_free_size_hints(theSizeHints);
 
-	set_wm_name( xc, theWindow, STRING, strlen(theTitle), theTitle );
-	set_wm_icon_name( xc, theWindow, STRING, strlen(theTitle), theTitle );
+	xcb_set_wm_name( xc, theWindow, STRING, strlen(theTitle), theTitle );
+	xcb_set_wm_icon_name( xc, theWindow, STRING, strlen(theTitle), theTitle );
 
 	xcb_map_window( xc, theWindow );
 
diff-tree d545bbb314880ae23fb15742b12d98796d596cfc (from 1a64624e3860d4b9436449a386a09f60da0eac58)
Author: Ian Osgood <iano at quirkster.com>
Date:   Fri Apr 13 13:35:57 2007 -0700

    Fix misspelled struct members.

diff --git a/xcbrandr.c b/xcbrandr.c
index ecf00d7..ed8eebf 100644
--- a/xcbrandr.c
+++ b/xcbrandr.c
@@ -422,7 +422,7 @@ main (int argc, char **argv)
 	       sce->timestamp, sce->config_timestamp);
 	  printf(" Rotation = %x\n", sce->rotation);
 	  printf(" %d X %d pixels, %d X %d mm\n",
-		 sce->width, sce->height, sce->mmWidth, sce->mmHeight);
+		 sce->width, sce->height, sce->mwidth, sce->mheight);
 	  
 	  printf("Display width   %d, height   %d\n",
 		 root->width_in_pixels, root->height_in_pixels);