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.378 by root, Tue Jun 5 11:10:50 2012 UTC

… …
172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || 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
… …
231 if (display) 231 if (display)
232 { 232 {
233 selection_clear (); 233 selection_clear ();
234 selection_clear (true); 234 selection_clear (true);
235 235
236#ifdef USE_XIM 236#if USE_XIM
237 im_destroy (); 237 im_destroy ();
238#endif 238#endif
239 scrollBar.destroy (); 239 scrollBar.destroy ();
240 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
241 241
… …
374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
376} 376}
377 377
378#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
379static void 379static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
381{ 381{
382 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
384 char number[32]; 384 char number[32];
385 const char mtype[] = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
395 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 } 401 }
402
400 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 406 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 408 || event->error_code == BadColor
406 (event->error_code == BadGC) || 409 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 411 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
410 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 418 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 420
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 } 422 }
423
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 426}
425#endif 427#endif
426 428
427int 429int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 431{
430 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
432 else 434 else
… …
441 } 443 }
442 444
443 return 0; 445 return 0;
444} 446}
445 447
446int 448int ecb_cold
447rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
448{ 450{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display)); 452 DisplayString (display));
451 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
572 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
574 576
575 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
576} 582}
577 583
578/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
579/* 585/*
580 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
764 770
765 delete fontset[0]; 771 delete fontset[0];
766 fontset[0] = fs; 772 fontset[0] = fs;
767 773
768 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
769 prop.height += lineSpace;
770 prop.width += letterSpace; 775 prop.width += letterSpace;
771 776
772 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
773 778
774 fwidth = prop.width; 779 fwidth = prop.width;
775 fheight = prop.height; 780 fheight = prop.height + lineSpace;
776 fbase = prop.ascent; 781 fbase = prop.ascent;
777 782
778 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
779 { 784 {
780#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
962 967
963 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
964 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
965 { 970 {
966 sprintf (bstr, "%d", i - Color_Black); 971 sprintf (bstr, "%d", i - Color_Black);
967#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
968 xpmb = "default;"; 973 xpmb = "default;";
969#endif 974#endif
970 break; 975 break;
971 } 976 }
972 977
… …
1075 1080
1076 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
1078 vt_width, vt_height); 1083 vt_width, vt_height);
1079 1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1086
1080#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
1082 update_background (); 1089 update_background ();
1083#endif 1090#endif
1084 } 1091 }
1085 1092
1086 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1087 scr_reset (); 1094 scr_reset ();
1088 1095
1089#ifdef USE_XIM 1096#if USE_XIM
1090 im_set_position (); 1097 im_set_position ();
1091#endif 1098#endif
1092} 1099}
1093 1100
1094/* 1101/*
… …
1119} 1126}
1120 1127
1121/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1131#if USE_XIM
1125 1132
1126void 1133void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1135{
1129 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1621{ 1628{
1622 Window cr; 1629 Window cr;
1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1624} 1631}
1625 1632
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 1633#ifdef HAVE_BG_PIXMAP
1649 1634
1650void 1635void
1651rxvt_term::update_background () 1636rxvt_term::update_background ()
1652{ 1637{

Diff Legend

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