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.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 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
… …
170 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);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 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);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || 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
… …
313 { 311 {
314#if USE_XIM 312#if USE_XIM
315 im_ev.stop (display); 313 im_ev.stop (display);
316#endif 314#endif
317 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
319 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
320#endif 318#endif
321 termwin_ev.stop (display); 319 termwin_ev.stop (display);
322 vt_ev.stop (display); 320 vt_ev.stop (display);
323 } 321 }
… …
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#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);
401 } 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
402 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 456 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 458 || event->error_code == BadColor
408 (event->error_code == BadGC) || 459 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 461 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
412 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 468 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 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 470
429int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 478{
432 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
434 else 481 else
… …
443 } 490 }
444 491
445 return 0; 492 return 0;
446} 493}
447 494
448int 495int ecb_cold
449rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
450{ 497{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 498 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 499 DisplayString (display));
453 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
576 623
577 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
578} 629}
579 630
580/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
581/* 632/*
582 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
710 // size, i.e., when the wm does not honour our size hints, there are 761 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a 762 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly 763 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the 764 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps. 765 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth; 766 vt_width = ncol * fwidth;
716 height = nrow * fheight; 767 vt_height = nrow * fheight;
717} 768}
718 769
719/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
720/* 771/*
721 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
729 780
730 struct winsize ws; 781 struct winsize ws;
731 782
732 ws.ws_col = ncol; 783 ws.ws_col = ncol;
733 ws.ws_row = nrow; 784 ws.ws_row = nrow;
734 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
735 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
736 ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
737 788
738#if 0 789#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
… …
766 817
767 delete fontset[0]; 818 delete fontset[0];
768 fontset[0] = fs; 819 fontset[0] = fs;
769 820
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 823
774 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
775 825
776 fwidth = prop.width; 826 fwidth = prop.width;
777 fheight = prop.height; 827 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 828 fbase = prop.ascent;
779 829
780 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
781 { 831 {
782#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
944 994
945/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
946/* 996/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 997 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 998 */
949void 999char *
950rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
951{ 1001{
952 unsigned int i; 1002 unsigned int i;
953 const char *xpmb = ""; 1003 const char *xpmb = "";
954 char fstr[] = "default"; 1004 char fstr[] = "default";
955 char bstr[] = "default"; 1005 char bstr[] = "default";
1006 char *env_colorfgbg;
956 1007
957 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1010 {
960 sprintf (fstr, "%d", i - Color_Black); 1011 sprintf (fstr, "%d", i - Color_Black);
… …
963 1014
964 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1017 {
967 sprintf (bstr, "%d", i - Color_Black); 1018 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1020 xpmb = "default;";
970#endif 1021#endif
971 break; 1022 break;
972 } 1023 }
973 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1026 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1027 return env_colorfgbg;
975} 1028}
976 1029
977/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
978 1031
979bool 1032bool
… …
1072 if (scrollBar.state) 1125 if (scrollBar.state)
1073 scrollBar.resize (); 1126 scrollBar.resize ();
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 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 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/*
… …
1107 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1163 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1110 } 1165 }
1111 1166
1112 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1113 { 1168 {
1114 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1117 } 1172 }
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];
… …
1525 im_destroy (); 1580 im_destroy ();
1526 1581
1527 if (Input_Context) 1582 if (Input_Context)
1528 return; 1583 return;
1529 1584
1530#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1531 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1532 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1533#endif
1534 1587
1535 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1536 if (p && *p) 1589 if (p && *p)
1537 { 1590 {
1538 bool found = false; 1591 bool found = false;
… …
1566 /* try with no modifiers base IF the user didn't specify an IM */ 1619 /* try with no modifiers base IF the user didn't specify an IM */
1567 if (im_get_ic ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1568 goto done; 1621 goto done;
1569 1622
1570done: 1623done:
1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1572 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1573 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1574#endif
1575} 1626}
1576 1627
1577void 1628void
1578rxvt_term::im_set_position () 1629rxvt_term::im_set_position ()
1579{ 1630{
… …
1624{ 1675{
1625 Window cr; 1676 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1677 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627} 1678}
1628 1679
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 1680#ifdef HAVE_BG_PIXMAP
1652 1681
1653void 1682void
1654rxvt_term::update_background () 1683rxvt_term::update_background ()
1655{ 1684{

Diff Legend

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