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.373 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif 169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || 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
… …
311 { 311 {
312#if USE_XIM 312#if USE_XIM
313 im_ev.stop (display); 313 im_ev.stop (display);
314#endif 314#endif
315 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
318#endif 318#endif
319 termwin_ev.stop (display); 319 termwin_ev.stop (display);
320 vt_ev.stop (display); 320 vt_ev.stop (display);
321 } 321 }
… …
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#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
399 } 445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
451 }
452
400 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 456 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 458 || event->error_code == BadColor
406 (event->error_code == BadGC) || 459 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 461 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
410 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 468 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 470
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
420 } 472 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 473}
425#endif 474#endif
426 475
427int ecb_cold 476int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
572 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
574 623
575 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
576} 629}
577 630
578/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
579/* 632/*
580 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
764 817
765 delete fontset[0]; 818 delete fontset[0];
766 fontset[0] = fs; 819 fontset[0] = fs;
767 820
768 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
769 prop.width += letterSpace; 822 prop.width = max (prop.width + letterSpace, 1);
770 823
771 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
772 825
773 fwidth = prop.width; 826 fwidth = prop.width;
774 fheight = prop.height + lineSpace; 827 fheight = prop.height + lineSpace;
… …
961 1014
962 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
964 { 1017 {
965 sprintf (bstr, "%d", i - Color_Black); 1018 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 1020 xpmb = "default;";
968#endif 1021#endif
969 break; 1022 break;
970 } 1023 }
971 1024
… …
1074 1127
1075 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
1077 vt_width, vt_height); 1130 vt_width, vt_height);
1078 1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1133
1079#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
1081 update_background (); 1136 update_background ();
1082#endif 1137#endif
1083 } 1138 }
1084 1139
1085 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
1086 scr_reset (); 1141 scr_reset ();
1087 1142
1088#ifdef USE_XIM 1143#if USE_XIM
1089 im_set_position (); 1144 im_set_position ();
1090#endif 1145#endif
1091} 1146}
1092 1147
1093/* 1148/*
… …
1118} 1173}
1119 1174
1120/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1178#if USE_XIM
1124 1179
1125void 1180void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1182{
1128 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1620{ 1675{
1621 Window cr; 1676 Window cr;
1622 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1677 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1623} 1678}
1624 1679
1625Pixmap
1626rxvt_term::get_pixmap_property (Atom property)
1627{
1628 Pixmap pixmap = None;
1629
1630 int aformat;
1631 unsigned long nitems, bytes_after;
1632 Atom atype;
1633 unsigned char *prop;
1634 int result = XGetWindowProperty (dpy, display->root, property,
1635 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1636 &nitems, &bytes_after, &prop);
1637 if (result == Success)
1638 {
1639 if (atype == XA_PIXMAP)
1640 pixmap = *(Pixmap *)prop;
1641 XFree (prop);
1642 }
1643
1644 return pixmap;
1645}
1646
1647#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1648 1681
1649void 1682void
1650rxvt_term::update_background () 1683rxvt_term::update_background ()
1651{ 1684{

Diff Legend

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