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.371 by sf-exg, Thu Jan 19 15:44:49 2012 UTC vs.
Revision 1.389 by root, Sun Feb 17 00:52:04 2013 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
… …
226 226
227#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
228 bg_destroy (); 228 bg_destroy ();
229#endif 229#endif
230 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
231 if (display) 235 if (display)
232 { 236 {
233 selection_clear (); 237 selection_clear ();
234 selection_clear (true); 238 selection_clear (true);
235 239
236#ifdef USE_XIM 240#if USE_XIM
237 im_destroy (); 241 im_destroy ();
238#endif 242#endif
239 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
240 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
241 247
242 delete drawable; 248 delete drawable;
249
243 // destroy all windows 250 // destroy all windows
244 if (parent) 251 if (parent)
245 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
246 253
247 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
… …
311 { 318 {
312#if USE_XIM 319#if USE_XIM
313 im_ev.stop (display); 320 im_ev.stop (display);
314#endif 321#endif
315 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
318#endif 325#endif
319 termwin_ev.stop (display); 326 termwin_ev.stop (display);
320 vt_ev.stop (display); 327 vt_ev.stop (display);
321 } 328 }
… …
362} 369}
363 370
364/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
365/* 372/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * 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 */ 374 */
369static XErrorHandler old_xerror_handler; 375static XErrorHandler old_xerror_handler;
370 376
371static void 377static void
372rxvt_emergency_cleanup () 378rxvt_emergency_cleanup ()
… …
374 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++)
375 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
376} 382}
377 383
378#if !ENABLE_MINIMAL 384#if !ENABLE_MINIMAL
379static void 385static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
381{ 387{
382 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
384 char number[32]; 390 char number[32];
385 const char mtype[] = "XlibMessage"; 391
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"); 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);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 399 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
392 sprintf(number, "%d", event->request_code); 403
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer);
395 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
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ); 442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398 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);
399 } 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
400 if ((event->error_code == BadWindow) || 460 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 461 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 462 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 463 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 464 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 465 || event->error_code == BadColor
406 (event->error_code == BadGC) || 466 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 467 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 468 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 469 || event->error_code == BadAtom)
470 {
410 if (event->error_code == BadValue) 471 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 473 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 475 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 476 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424}
425#endif
426 477
427int 478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 }
480}
481#endif
482
483int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 484rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 485{
430 if (GET_R->allowedxerror == -1) 486 if (GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 487 GET_R->allowedxerror = event->error_code;
432 else 488 else
… …
441 } 497 }
442 498
443 return 0; 499 return 0;
444} 500}
445 501
446int 502int ecb_cold
447rxvt_xioerror_handler (Display *display) 503rxvt_xioerror_handler (Display *display)
448{ 504{
449 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",
450 DisplayString (display)); 506 DisplayString (display));
451 rxvt_emergency_cleanup (); 507 rxvt_emergency_cleanup ();
… …
571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
572 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
574 630
575 XrmInitialize (); 631 XrmInitialize ();
632
633#if HAVE_PIXBUF
634 g_type_init ();
635#endif
576} 636}
577 637
578/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
579/* 639/*
580 * window size/position calculations for XSizeHint and other storage. 640 * window size/position calculations for XSizeHint and other storage.
… …
764 824
765 delete fontset[0]; 825 delete fontset[0];
766 fontset[0] = fs; 826 fontset[0] = fs;
767 827
768 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 828 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
769 prop.height += lineSpace; 829 prop.width = max (prop.width + letterSpace, 1);
770 prop.width += letterSpace;
771 830
772 fs->set_prop (prop, false); 831 fs->set_prop (prop, false);
773 832
774 fwidth = prop.width; 833 fwidth = prop.width;
775 fheight = prop.height; 834 fheight = prop.height + lineSpace;
776 fbase = prop.ascent; 835 fbase = prop.ascent;
777 836
778 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
779 { 838 {
780#if ENABLE_STYLES 839#if ENABLE_STYLES
… …
962 1021
963 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
964 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
965 { 1024 {
966 sprintf (bstr, "%d", i - Color_Black); 1025 sprintf (bstr, "%d", i - Color_Black);
967#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
968 xpmb = "default;"; 1027 xpmb = "default;";
969#endif 1028#endif
970 break; 1029 break;
971 } 1030 }
972 1031
… …
1075 1134
1076 XMoveResizeWindow (dpy, vt, 1135 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1136 window_vt_x, window_vt_y,
1078 vt_width, vt_height); 1137 vt_width, vt_height);
1079 1138
1139 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1140
1080#ifdef HAVE_BG_PIXMAP 1141#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1142 if (bg_window_size_sensitive ())
1082 update_background (); 1143 update_background ();
1083#endif 1144#endif
1084 } 1145 }
1085 1146
1086 if (fix_screen || old_height == 0) 1147 if (fix_screen || old_height == 0)
1087 scr_reset (); 1148 scr_reset ();
1088 1149
1089#ifdef USE_XIM 1150#if USE_XIM
1090 im_set_position (); 1151 im_set_position ();
1091#endif 1152#endif
1092} 1153}
1093 1154
1094/* 1155/*
… …
1119} 1180}
1120 1181
1121/* -------------------------------------------------------------------- * 1182/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1183 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1184 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1185#if USE_XIM
1125 1186
1126void 1187void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1188rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1189{
1129 fg = pix_colors [Color_fg]; 1190 fg = pix_colors [Color_fg];
… …
1311 char **s; 1372 char **s;
1312 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1313 1374
1314 set_environ (envv); 1375 set_environ (envv);
1315 1376
1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1377 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1317 return false; 1378 return false;
1318 1379
1319 input_method = display->get_xim (locale, modifiers); 1380 input_method = display->get_xim (locale, modifiers);
1320 if (input_method == NULL) 1381 if (input_method == NULL)
1321 return false; 1382 return false;
… …
1621{ 1682{
1622 Window cr; 1683 Window cr;
1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1684 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1624} 1685}
1625 1686
1626Pixmap
1627rxvt_term::get_pixmap_property (Atom property)
1628{
1629 Pixmap pixmap = None;
1630
1631 int aformat;
1632 unsigned long nitems, bytes_after;
1633 Atom atype;
1634 unsigned char *prop;
1635 int result = XGetWindowProperty (dpy, display->root, property,
1636 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1637 &nitems, &bytes_after, &prop);
1638 if (result == Success)
1639 {
1640 if (atype == XA_PIXMAP)
1641 pixmap = *(Pixmap *)prop;
1642 XFree (prop);
1643 }
1644
1645 return pixmap;
1646}
1647
1648#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1649 1688
1650void 1689void
1651rxvt_term::update_background () 1690rxvt_term::update_background ()
1652{ 1691{
1653 if (update_background_ev.is_active ()) 1692 if (update_background_ev.is_active ())
1654 return;
1655
1656 bg_invalidate ();
1657
1658 if (!mapped)
1659 return; 1693 return;
1660 1694
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1695 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662 1696
1663 if (to_wait <= 0.) 1697 if (to_wait <= 0.)

Diff Legend

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