--- sourceforge.net/trunk/rdesktop/xwin.c 2002/07/29 20:16:22 76 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/07/29 20:17:10 77 @@ -527,7 +527,8 @@ case EnterNotify: if (grab_keyboard) XGrabKeyboard(display, wnd, True, - GrabModeAsync, GrabModeAsync, + GrabModeAsync, + GrabModeAsync, CurrentTime); break; @@ -606,8 +607,8 @@ tdata = (owncolmap ? data : translate_image(width, height, data)); bitmap = XCreatePixmap(display, wnd, width, height, depth); - image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata, - width, height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); @@ -625,8 +626,8 @@ uint8 *tdata; tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata, - width, height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); if (ownbackstore) { @@ -662,7 +663,7 @@ bitmap = XCreatePixmap(display, wnd, width, height, 1); gc = XCreateGC(display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *)data, + image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data, width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; @@ -1174,8 +1175,9 @@ if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)data, - cx, cy, BitmapPad(display), cx * bpp / 8); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), + cx * bpp / 8); if (ownbackstore) {