Mercurial > mplayer.hg
comparison gui/wm/ws.c @ 35636:840e473ba4c0
Restore GUI's X error handler after gtk_init().
GDK sets its own handler.
| author | ib |
|---|---|
| date | Thu, 10 Jan 2013 15:40:43 +0000 |
| parents | ac2a7944829c |
| children | 58d55c933757 |
comparison
equal
deleted
inserted
replaced
| 35635:ac2a7944829c | 35636:840e473ba4c0 |
|---|---|
| 247 win->Width = wsMaxX; | 247 win->Width = wsMaxX; |
| 248 win->Height = wsMaxY; | 248 win->Height = wsMaxY; |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 | 251 |
| 252 /** | |
| 253 * @brief Set the X error handler. | |
| 254 */ | |
| 255 void wsSetErrorHandler(void) | |
| 256 { | |
| 257 XSetErrorHandler(wsErrorHandler); | |
| 258 } | |
| 259 | |
| 252 void wsXInit(Display *display) | 260 void wsXInit(Display *display) |
| 253 { | 261 { |
| 254 int eventbase; | 262 int eventbase; |
| 255 int errorbase; | 263 int errorbase; |
| 256 | 264 |
| 257 mp_msg(MSGT_GPLAYER, MSGL_V, "X init.\n"); | 265 mp_msg(MSGT_GPLAYER, MSGL_V, "X init.\n"); |
| 258 | 266 |
| 259 wsDisplay = display; | 267 wsDisplay = display; |
| 260 | 268 |
| 261 XSetErrorHandler(wsErrorHandler); | 269 wsSetErrorHandler(); |
| 262 | 270 |
| 263 /* enable DND atoms */ | 271 /* enable DND atoms */ |
| 264 wsXDNDInitialize(); | 272 wsXDNDInitialize(); |
| 265 | 273 |
| 266 { /* on remote display XShm will be disabled - LGB */ | 274 { /* on remote display XShm will be disabled - LGB */ |