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.369 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 UTC

… …
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <locale.h> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
233 if (display) 231 if (display)
234 { 232 {
235 selection_clear (); 233 selection_clear ();
236 selection_clear (true); 234 selection_clear (true);
237 235
238#ifdef USE_XIM 236#if USE_XIM
239 im_destroy (); 237 im_destroy ();
240#endif 238#endif
241 scrollBar.destroy (); 239 scrollBar.destroy ();
242 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
243 241
… …
364} 362}
365 363
366/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
367/* 365/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 367 */
371static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
372 369
373static void 370static void
374rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
378} 375}
379 376
380#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
381static void 378static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
383{ 380{
384 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
386 char number[32]; 383 char number[32];
387 const char mtype[] = "XlibMessage"; 384
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 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);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396
394 sprintf(number, "%d", event->request_code); 397 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("+ (which is %s)\n", buffer);
400
397 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 405 }
406
402 if ((event->error_code == BadWindow) || 407 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 408 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 409 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 410 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 411 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 412 || event->error_code == BadColor
408 (event->error_code == BadGC) || 413 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 414 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 415 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 416 || event->error_code == BadAtom)
417 {
412 if (event->error_code == BadValue) 418 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 422 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 424
429int 425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 }
427}
428#endif
429
430int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 431rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 432{
432 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
434 else 435 else
… …
443 } 444 }
444 445
445 return 0; 446 return 0;
446} 447}
447 448
448int 449int ecb_cold
449rxvt_xioerror_handler (Display *display) 450rxvt_xioerror_handler (Display *display)
450{ 451{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 453 DisplayString (display));
453 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
576 577
577 XrmInitialize (); 578 XrmInitialize ();
579
580#if HAVE_PIXBUF
581 g_type_init ();
582#endif
578} 583}
579 584
580/*----------------------------------------------------------------------*/ 585/*----------------------------------------------------------------------*/
581/* 586/*
582 * window size/position calculations for XSizeHint and other storage. 587 * window size/position calculations for XSizeHint and other storage.
… …
766 771
767 delete fontset[0]; 772 delete fontset[0];
768 fontset[0] = fs; 773 fontset[0] = fs;
769 774
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace; 776 prop.width += letterSpace;
773 777
774 fs->set_prop (prop, false); 778 fs->set_prop (prop, false);
775 779
776 fwidth = prop.width; 780 fwidth = prop.width;
777 fheight = prop.height; 781 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 782 fbase = prop.ascent;
779 783
780 for (int style = 1; style < 4; style++) 784 for (int style = 1; style < 4; style++)
781 { 785 {
782#if ENABLE_STYLES 786#if ENABLE_STYLES
… …
964 968
965 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
967 { 971 {
968 sprintf (bstr, "%d", i - Color_Black); 972 sprintf (bstr, "%d", i - Color_Black);
969#ifdef BG_IMAGE_FROM_FILE 973#if BG_IMAGE_FROM_FILE
970 xpmb = "default;"; 974 xpmb = "default;";
971#endif 975#endif
972 break; 976 break;
973 } 977 }
974 978
… …
1077 1081
1078 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1080 vt_width, vt_height); 1084 vt_width, vt_height);
1081 1085
1086 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1087
1082#ifdef HAVE_BG_PIXMAP 1088#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1089 if (bg_window_size_sensitive ())
1084 update_background (); 1090 update_background ();
1085#endif 1091#endif
1086 } 1092 }
1087 1093
1088 if (fix_screen || old_height == 0) 1094 if (fix_screen || old_height == 0)
1089 scr_reset (); 1095 scr_reset ();
1090 1096
1091#ifdef USE_XIM 1097#if USE_XIM
1092 im_set_position (); 1098 im_set_position ();
1093#endif 1099#endif
1094} 1100}
1095 1101
1096/* 1102/*
… …
1121} 1127}
1122 1128
1123/* -------------------------------------------------------------------- * 1129/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1130 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1131 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1132#if USE_XIM
1127 1133
1128void 1134void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1135rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1136{
1131 fg = pix_colors [Color_fg]; 1137 fg = pix_colors [Color_fg];
… …
1528 im_destroy (); 1534 im_destroy ();
1529 1535
1530 if (Input_Context) 1536 if (Input_Context)
1531 return; 1537 return;
1532 1538
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1539 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1540 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1541
1538 p = rs[Rs_inputMethod]; 1542 p = rs[Rs_inputMethod];
1539 if (p && *p) 1543 if (p && *p)
1540 { 1544 {
1541 bool found = false; 1545 bool found = false;
… …
1568 1572
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1573 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1574 if (im_get_ic ("@im=none"))
1571 goto done; 1575 goto done;
1572 1576
1573done: ; 1577done:
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1578 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1579 SET_LOCALE (locale);
1577#endif
1578} 1580}
1579 1581
1580void 1582void
1581rxvt_term::im_set_position () 1583rxvt_term::im_set_position ()
1582{ 1584{
… …
1627{ 1629{
1628 Window cr; 1630 Window cr;
1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630} 1632}
1631 1633
1632Pixmap
1633rxvt_term::get_pixmap_property (Atom property)
1634{
1635 Pixmap pixmap = None;
1636
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop;
1641 int result = XGetWindowProperty (dpy, display->root, property,
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1649 }
1650
1651 return pixmap;
1652}
1653
1654#ifdef HAVE_BG_PIXMAP 1634#ifdef HAVE_BG_PIXMAP
1655 1635
1656void 1636void
1657rxvt_term::update_background () 1637rxvt_term::update_background ()
1658{ 1638{

Diff Legend

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