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.375 by sf-exg, Sun Jun 3 17:48:28 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
… …
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);
… …
376 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++)
377 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
378} 376}
379 377
380#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
381static void 379static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
383{ 381{
384 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
386 char number[32]; 384 char number[32];
… …
424 mesg, BUFSIZ); 422 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426} 424}
427#endif 425#endif
428 426
429int 427int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 429{
432 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
434 else 432 else
… …
443 } 441 }
444 442
445 return 0; 443 return 0;
446} 444}
447 445
448int 446int ecb_cold
449rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
450{ 448{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 450 DisplayString (display));
453 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
576 574
577 XrmInitialize (); 575 XrmInitialize ();
576
577#ifdef HAVE_PIXBUF
578 g_type_init ();
579#endif
578} 580}
579 581
580/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
581/* 583/*
582 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
710 // size, i.e., when the wm does not honour our size hints, there are 712 // 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 713 // 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 714 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the 715 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps. 716 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth; 717 vt_width = ncol * fwidth;
716 height = nrow * fheight; 718 vt_height = nrow * fheight;
717} 719}
718 720
719/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
720/* 722/*
721 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
729 731
730 struct winsize ws; 732 struct winsize ws;
731 733
732 ws.ws_col = ncol; 734 ws.ws_col = ncol;
733 ws.ws_row = nrow; 735 ws.ws_row = nrow;
734 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
735 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
736 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
737 739
738#if 0 740#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
… …
766 768
767 delete fontset[0]; 769 delete fontset[0];
768 fontset[0] = fs; 770 fontset[0] = fs;
769 771
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace; 773 prop.width += letterSpace;
773 774
774 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
775 776
776 fwidth = prop.width; 777 fwidth = prop.width;
777 fheight = prop.height; 778 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 779 fbase = prop.ascent;
779 780
780 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
781 { 782 {
782#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
944 945
945/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
946/* 947/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 949 */
949void 950char *
950rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
951{ 952{
952 unsigned int i; 953 unsigned int i;
953 const char *xpmb = ""; 954 const char *xpmb = "";
954 char fstr[] = "default"; 955 char fstr[] = "default";
955 char bstr[] = "default"; 956 char bstr[] = "default";
957 char *env_colorfgbg;
956 958
957 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
959 { 961 {
960 sprintf (fstr, "%d", i - Color_Black); 962 sprintf (fstr, "%d", i - Color_Black);
… …
969 xpmb = "default;"; 971 xpmb = "default;";
970#endif 972#endif
971 break; 973 break;
972 } 974 }
973 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
975} 979}
976 980
977/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
978 982
979bool 983bool
… …
1072 if (scrollBar.state) 1076 if (scrollBar.state)
1073 scrollBar.resize (); 1077 scrollBar.resize ();
1074 1078
1075 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1077 width, height); 1081 vt_width, vt_height);
1078 1082
1079#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1081 update_background (); 1085 update_background ();
1082#endif 1086#endif
… …
1107 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1112 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1110 } 1114 }
1111 1115
1112 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1113 { 1117 {
1114 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1117 } 1121 }
… …
1525 im_destroy (); 1529 im_destroy ();
1526 1530
1527 if (Input_Context) 1531 if (Input_Context)
1528 return; 1532 return;
1529 1533
1530#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1531 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1532 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1533#endif
1534 1536
1535 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1536 if (p && *p) 1538 if (p && *p)
1537 { 1539 {
1538 bool found = false; 1540 bool found = false;
… …
1566 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1567 if (im_get_ic ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1568 goto done; 1570 goto done;
1569 1571
1570done: 1572done:
1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1572 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1573 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1574#endif
1575} 1575}
1576 1576
1577void 1577void
1578rxvt_term::im_set_position () 1578rxvt_term::im_set_position ()
1579{ 1579{
… …
1624{ 1624{
1625 Window cr; 1625 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627} 1627}
1628 1628
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 1629#ifdef HAVE_BG_PIXMAP
1652 1630
1653void 1631void
1654rxvt_term::update_background () 1632rxvt_term::update_background ()
1655{ 1633{

Diff Legend

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