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.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 2012 UTC

… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
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 <clocale> 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
… …
350 348
351 delete this; 349 delete this;
352} 350}
353 351
354void 352void
355rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356{ 354{
357 if (!opt) 355 if (!opt)
358 return; 356 return;
359 357
360 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
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);
394 sprintf(number, "%d", event->request_code); 396
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 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
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 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);
401 } 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
402 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 454 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 456 || event->error_code == BadColor
408 (event->error_code == BadGC) || 457 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 459 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
412 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 466 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 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 468
429int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 476{
432 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
434 else 479 else
… …
443 } 488 }
444 489
445 return 0; 490 return 0;
446} 491}
447 492
448int 493int ecb_cold
449rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
450{ 495{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 497 DisplayString (display));
453 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
576 621
577 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
578} 627}
579 628
580/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
581/* 630/*
582 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
766 815
767 delete fontset[0]; 816 delete fontset[0];
768 fontset[0] = fs; 817 fontset[0] = fs;
769 818
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace; 820 prop.width += letterSpace;
773 821
774 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
775 823
776 fwidth = prop.width; 824 fwidth = prop.width;
777 fheight = prop.height; 825 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 826 fbase = prop.ascent;
779 827
780 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
781 { 829 {
782#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
964 1012
965 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
967 { 1015 {
968 sprintf (bstr, "%d", i - Color_Black); 1016 sprintf (bstr, "%d", i - Color_Black);
969#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
970 xpmb = "default;"; 1018 xpmb = "default;";
971#endif 1019#endif
972 break; 1020 break;
973 } 1021 }
974 1022
… …
1077 1125
1078 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1080 vt_width, vt_height); 1128 vt_width, vt_height);
1081 1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1131
1082#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1084 update_background (); 1134 update_background ();
1085#endif 1135#endif
1086 } 1136 }
1087 1137
1088 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1089 scr_reset (); 1139 scr_reset ();
1090 1140
1091#ifdef USE_XIM 1141#if USE_XIM
1092 im_set_position (); 1142 im_set_position ();
1093#endif 1143#endif
1094} 1144}
1095 1145
1096/* 1146/*
… …
1121} 1171}
1122 1172
1123/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1176#if USE_XIM
1127 1177
1128void 1178void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1180{
1131 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1528 im_destroy (); 1578 im_destroy ();
1529 1579
1530 if (Input_Context) 1580 if (Input_Context)
1531 return; 1581 return;
1532 1582
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1585
1538 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1539 if (p && *p) 1587 if (p && *p)
1540 { 1588 {
1541 bool found = false; 1589 bool found = false;
… …
1568 1616
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1571 goto done; 1619 goto done;
1572 1620
1573done: ; 1621done:
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1577#endif
1578} 1624}
1579 1625
1580void 1626void
1581rxvt_term::im_set_position () 1627rxvt_term::im_set_position ()
1582{ 1628{
… …
1627{ 1673{
1628 Window cr; 1674 Window cr;
1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630} 1676}
1631 1677
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 1678#ifdef HAVE_BG_PIXMAP
1655 1679
1656void 1680void
1657rxvt_term::update_background () 1681rxvt_term::update_background ()
1658{ 1682{

Diff Legend

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