comparison src/video/x11/SDL_x11window.c @ 2718:abacf2555bb4

Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton
author Szymon Wilczek <kazeuser@gmail.com>
date Mon, 25 Aug 2008 18:02:14 +0000
parents 44e49d3fa6cf
children 6ce6d56b63bf
comparison
equal deleted inserted replaced
2717:50bc882455e5 2718:abacf2555bb4
481 #ifdef X_HAVE_UTF8_STRING 481 #ifdef X_HAVE_UTF8_STRING
482 { 482 {
483 Uint32 fevent = 0; 483 Uint32 fevent = 0;
484 pXGetICValues(((SDL_WindowData *) window->driverdata)->ic, 484 pXGetICValues(((SDL_WindowData *) window->driverdata)->ic,
485 XNFilterEvents, &fevent, NULL); 485 XNFilterEvents, &fevent, NULL);
486 XMapWindow(data->display, w);
487 XSelectInput(data->display, w, 486 XSelectInput(data->display, w,
488 (FocusChangeMask | EnterWindowMask | LeaveWindowMask | 487 (FocusChangeMask | EnterWindowMask | LeaveWindowMask |
489 ExposureMask | ButtonPressMask | ButtonReleaseMask | 488 ExposureMask | ButtonPressMask | ButtonReleaseMask |
490 PointerMotionMask | KeyPressMask | KeyReleaseMask | 489 PointerMotionMask | KeyPressMask | KeyReleaseMask |
491 PropertyChangeMask | StructureNotifyMask | 490 PropertyChangeMask | StructureNotifyMask |
492 KeymapStateMask | fevent)); 491 KeymapStateMask | fevent));
493 } 492 }
494 #else 493 #else
495 XMapWindow(data->display, w); 494 {
496 XSelectInput(data->display, w, 495 XSelectInput(data->display, w,
497 (FocusChangeMask | EnterWindowMask | LeaveWindowMask | 496 (FocusChangeMask | EnterWindowMask | LeaveWindowMask |
498 ExposureMask | ButtonPressMask | ButtonReleaseMask | 497 ExposureMask | ButtonPressMask | ButtonReleaseMask |
499 PointerMotionMask | KeyPressMask | KeyReleaseMask | 498 PointerMotionMask | KeyPressMask | KeyReleaseMask |
500 PropertyChangeMask | StructureNotifyMask | 499 PropertyChangeMask | StructureNotifyMask |
501 KeymapStateMask)); 500 KeymapStateMask));
501 }
502 #endif 502 #endif
503 503
504 /* we're informing the display what extension events we want to receive from it */ 504 /* we're informing the display what extension events we want to receive from it */
505 XSelectExtensionEvent(data->display, w, SDL_XEvents, SDL_NumOfXEvents); 505 XSelectExtensionEvent(data->display, w, SDL_XEvents, SDL_NumOfXEvents);
506 506