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.368 by root, Wed Jan 18 12:26:59 2012 UTC vs.
Revision 1.390 by root, Thu May 22 18:54:33 2014 UTC

… …
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
242 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
243 247
244 delete drawable; 248 delete drawable;
249
245 // destroy all windows 250 // destroy all windows
246 if (parent) 251 if (parent)
247 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
248 253
249 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
… …
313 { 318 {
314#if USE_XIM 319#if USE_XIM
315 im_ev.stop (display); 320 im_ev.stop (display);
316#endif 321#endif
317 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
319 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
320#endif 325#endif
321 termwin_ev.stop (display); 326 termwin_ev.stop (display);
322 vt_ev.stop (display); 327 vt_ev.stop (display);
323 } 328 }
… …
364} 369}
365 370
366/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
367/* 372/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * 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 */ 374 */
371static XErrorHandler old_xerror_handler; 375static XErrorHandler old_xerror_handler;
372 376
373static void 377static void
374rxvt_emergency_cleanup () 378rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
378} 382}
379 383
380#if !ENABLE_MINIMAL 384#if !ENABLE_MINIMAL
381static void 385static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
383{ 387{
384 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
386 char number[32]; 390 char number[32];
387 const char mtype[] = "XlibMessage"; 391
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"); 392 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
393
394 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
396
397 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
398 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 399 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394 sprintf(number, "%d", event->request_code); 403
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 if (event->request_code >= 128) { 404 if (event->request_code >= 128)
405 {
406#if 0
407 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
408 int nexts;
409 char **exts = XListExtensions (dpy, &nexts);
410
411 while (nexts)
412 {
413 char *extname = exts [nexts - 1];
414 int major, first_event, first_error;
415
416 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
417 {
418 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
419 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
420
421 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
422 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
423 rxvt_warn ("+ (which is %s)\n", buffer);
424
425 break;
426 }
427
428 printf ("nextss %d %s\n", nexts, extname);//D
429 --nexts;
430 ++exts;
431 }
432#else
433 int nexts = 0;
434 char **exts = 0;
435#endif
436
437 if (!nexts)
438 {
439 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
440
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 443
444#if 0
445 sprintf (number, "RENDER.%d", event->minor_code);
446 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
447 rxvt_warn ("+ (which is %s)\n", buffer);
448#endif
449 }
450
451 XFreeExtensionList (exts);
401 } 452 }
453 else
454 {
455 sprintf (number, "%d", event->request_code);
456 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
457 rxvt_warn ("+ (which is %s)\n", buffer);
458 }
459
402 if ((event->error_code == BadWindow) || 460 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 461 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 462 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 463 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 464 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 465 || event->error_code == BadColor
408 (event->error_code == BadGC) || 466 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 467 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 468 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 469 || event->error_code == BadAtom)
470 {
412 if (event->error_code == BadValue) 471 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 473 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 475 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 476 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 477
429int 478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 }
480}
481#endif
482
483int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 484rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 485{
432 if (GET_R->allowedxerror == -1) 486 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 487 GET_R->allowedxerror = event->error_code;
434 else 488 else
… …
443 } 497 }
444 498
445 return 0; 499 return 0;
446} 500}
447 501
448int 502int ecb_cold
449rxvt_xioerror_handler (Display *display) 503rxvt_xioerror_handler (Display *display)
450{ 504{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 505 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 506 DisplayString (display));
453 rxvt_emergency_cleanup (); 507 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
576 630
577 XrmInitialize (); 631 XrmInitialize ();
632
633#if HAVE_PIXBUF
634 g_type_init ();
635#endif
578} 636}
579 637
580/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
581/* 639/*
582 * window size/position calculations for XSizeHint and other storage. 640 * window size/position calculations for XSizeHint and other storage.
… …
766 824
767 delete fontset[0]; 825 delete fontset[0];
768 fontset[0] = fs; 826 fontset[0] = fs;
769 827
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 828 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 829 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 830
774 fs->set_prop (prop, false); 831 fs->set_prop (prop, false);
775 832
776 fwidth = prop.width; 833 fwidth = prop.width;
777 fheight = prop.height; 834 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 835 fbase = prop.ascent;
779 836
780 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
781 { 838 {
782#if ENABLE_STYLES 839#if ENABLE_STYLES
… …
964 1021
965 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
967 { 1024 {
968 sprintf (bstr, "%d", i - Color_Black); 1025 sprintf (bstr, "%d", i - Color_Black);
969#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
970 xpmb = "default;"; 1027 xpmb = "default;";
971#endif 1028#endif
972 break; 1029 break;
973 } 1030 }
974 1031
… …
1077 1134
1078 XMoveResizeWindow (dpy, vt, 1135 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1136 window_vt_x, window_vt_y,
1080 vt_width, vt_height); 1137 vt_width, vt_height);
1081 1138
1139 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1140
1082#ifdef HAVE_BG_PIXMAP 1141#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1142 if (bg_window_size_sensitive ())
1084 update_background (); 1143 update_background ();
1085#endif 1144#endif
1086 } 1145 }
1087 1146
1088 if (fix_screen || old_height == 0) 1147 if (fix_screen || old_height == 0)
1089 scr_reset (); 1148 scr_reset ();
1090 1149
1091#ifdef USE_XIM 1150#if USE_XIM
1092 im_set_position (); 1151 im_set_position ();
1093#endif 1152#endif
1094} 1153}
1095 1154
1096/* 1155/*
… …
1121} 1180}
1122 1181
1123/* -------------------------------------------------------------------- * 1182/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1183 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1184 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1185#if USE_XIM
1127 1186
1128void 1187void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1188rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1189{
1131 fg = pix_colors [Color_fg]; 1190 fg = pix_colors [Color_fg];
… …
1313 char **s; 1372 char **s;
1314 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1315 1374
1316 set_environ (envv); 1375 set_environ (envv);
1317 1376
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1377 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1378 return false;
1320 1379
1321 input_method = display->get_xim (locale, modifiers); 1380 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1381 if (input_method == NULL)
1323 return false; 1382 return false;
… …
1528 im_destroy (); 1587 im_destroy ();
1529 1588
1530 if (Input_Context) 1589 if (Input_Context)
1531 return; 1590 return;
1532 1591
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1592 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1593 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1594
1538 p = rs[Rs_inputMethod]; 1595 p = rs[Rs_inputMethod];
1539 if (p && *p) 1596 if (p && *p)
1540 { 1597 {
1541 bool found = false; 1598 bool found = false;
… …
1568 1625
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1626 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1627 if (im_get_ic ("@im=none"))
1571 goto done; 1628 goto done;
1572 1629
1573done: ; 1630done:
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1631 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1632 SET_LOCALE (locale);
1577#endif
1578} 1633}
1579 1634
1580void 1635void
1581rxvt_term::im_set_position () 1636rxvt_term::im_set_position ()
1582{ 1637{
… …
1627{ 1682{
1628 Window cr; 1683 Window cr;
1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1684 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630} 1685}
1631 1686
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 1687#ifdef HAVE_BG_PIXMAP
1655 1688
1656void 1689void
1657rxvt_term::update_background () 1690rxvt_term::update_background ()
1658{ 1691{
1659 if (update_background_ev.is_active ()) 1692 if (update_background_ev.is_active ())
1660 return;
1661
1662 bg_invalidate ();
1663
1664 if (!mapped)
1665 return; 1693 return;
1666 1694
1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1695 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668 1696
1669 if (to_wait <= 0.) 1697 if (to_wait <= 0.)

Diff Legend

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