ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.374 by root, Sun Jun 3 10:42:34 2012 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 2012 UTC

… …
172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif 175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#ifdef USE_XIM 177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
179#endif 179#endif
180#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
182#endif 182#endif
… …
231 if (display) 231 if (display)
232 { 232 {
233 selection_clear (); 233 selection_clear ();
234 selection_clear (true); 234 selection_clear (true);
235 235
236#ifdef USE_XIM 236#if USE_XIM
237 im_destroy (); 237 im_destroy ();
238#endif 238#endif
239 scrollBar.destroy (); 239 scrollBar.destroy ();
240 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
241 241
… …
362} 362}
363 363
364/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
365/* 365/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 367 */
369static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
370 369
371static void 370static void
372rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
380print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
381{ 380{
382 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
384 char number[32]; 383 char number[32];
385 const char mtype[] = "XlibMessage"; 384
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
392 sprintf(number, "%d", event->request_code); 396
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer);
395 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
399#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 436
437 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
399 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
400 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 454 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 456 || event->error_code == BadColor
406 (event->error_code == BadGC) || 457 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 459 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
410 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 466 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 468
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
420 } 470 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 471}
425#endif 472#endif
426 473
427int ecb_cold 474int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
572 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
574 621
575 XrmInitialize (); 622 XrmInitialize ();
576 623
577#ifdef HAVE_PIXBUF 624#if HAVE_PIXBUF
578 g_type_init (); 625 g_type_init ();
579#endif 626#endif
580} 627}
581 628
582/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
… …
965 1012
966 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
967 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
968 { 1015 {
969 sprintf (bstr, "%d", i - Color_Black); 1016 sprintf (bstr, "%d", i - Color_Black);
970#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
971 xpmb = "default;"; 1018 xpmb = "default;";
972#endif 1019#endif
973 break; 1020 break;
974 } 1021 }
975 1022
… …
1078 1125
1079 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1080 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1081 vt_width, vt_height); 1128 vt_width, vt_height);
1082 1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1131
1083#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1084 if (bg_window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1085 update_background (); 1134 update_background ();
1086#endif 1135#endif
1087 } 1136 }
1088 1137
1089 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1090 scr_reset (); 1139 scr_reset ();
1091 1140
1092#ifdef USE_XIM 1141#if USE_XIM
1093 im_set_position (); 1142 im_set_position ();
1094#endif 1143#endif
1095} 1144}
1096 1145
1097/* 1146/*
… …
1122} 1171}
1123 1172
1124/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1125 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1126 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1127#ifdef USE_XIM 1176#if USE_XIM
1128 1177
1129void 1178void
1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1131{ 1180{
1132 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1624{ 1673{
1625 Window cr; 1674 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627} 1676}
1628 1677
1629Pixmap
1630rxvt_term::get_pixmap_property (Atom property)
1631{
1632 Pixmap pixmap = None;
1633
1634 int aformat;
1635 unsigned long nitems, bytes_after;
1636 Atom atype;
1637 unsigned char *prop;
1638 int result = XGetWindowProperty (dpy, display->root, property,
1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1640 &nitems, &bytes_after, &prop);
1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 }
1647
1648 return pixmap;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP 1678#ifdef HAVE_BG_PIXMAP
1652 1679
1653void 1680void
1654rxvt_term::update_background () 1681rxvt_term::update_background ()
1655{ 1682{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines