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.361 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.373 by root, Mon May 28 16:40:03 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
… …
267 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 266 free (allocated [i]);
269 267
270 free (selection.text); 268 free (selection.text);
271 free (selection.clip_text); 269 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 270 free (locale);
276 free (v_buffer); 271 free (v_buffer);
277 272
278 delete selection_req; 273 delete selection_req;
279 274
… …
353 348
354 delete this; 349 delete this;
355} 350}
356 351
357void 352void
358rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 354{
360 if (!opt) 355 if (!opt)
361 return; 356 return;
362 357
363 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
379 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++)
380 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
381} 376}
382 377
383#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
384static void 379static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
386{ 381{
387 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
389 char number[32]; 384 char number[32];
… …
427 mesg, BUFSIZ); 422 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429} 424}
430#endif 425#endif
431 426
432int 427int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 429{
435 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
437 else 432 else
… …
446 } 441 }
447 442
448 return 0; 443 return 0;
449} 444}
450 445
451int 446int ecb_cold
452rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
453{ 448{
454 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",
455 DisplayString (display)); 450 DisplayString (display));
456 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
713 // size, i.e., when the wm does not honour our size hints, there are 708 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a 709 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly 710 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the 711 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps. 712 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth; 713 vt_width = ncol * fwidth;
719 height = nrow * fheight; 714 vt_height = nrow * fheight;
720} 715}
721 716
722/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
723/* 718/*
724 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
732 727
733 struct winsize ws; 728 struct winsize ws;
734 729
735 ws.ws_col = ncol; 730 ws.ws_col = ncol;
736 ws.ws_row = nrow; 731 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 735
741#if 0 736#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
… …
769 764
770 delete fontset[0]; 765 delete fontset[0];
771 fontset[0] = fs; 766 fontset[0] = fs;
772 767
773 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
774 prop.height += lineSpace;
775 prop.width += letterSpace; 769 prop.width += letterSpace;
776 770
777 fs->set_prop (prop, false); 771 fs->set_prop (prop, false);
778 772
779 fwidth = prop.width; 773 fwidth = prop.width;
780 fheight = prop.height; 774 fheight = prop.height + lineSpace;
781 fbase = prop.ascent; 775 fbase = prop.ascent;
782 776
783 for (int style = 1; style < 4; style++) 777 for (int style = 1; style < 4; style++)
784 { 778 {
785#if ENABLE_STYLES 779#if ENABLE_STYLES
… …
947 941
948/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
949/* 943/*
950 * find if fg/bg matches any of the normal (low-intensity) colors 944 * find if fg/bg matches any of the normal (low-intensity) colors
951 */ 945 */
952void 946char *
953rxvt_term::set_colorfgbg () 947rxvt_term::get_colorfgbg ()
954{ 948{
955 unsigned int i; 949 unsigned int i;
956 const char *xpmb = ""; 950 const char *xpmb = "";
957 char fstr[] = "default"; 951 char fstr[] = "default";
958 char bstr[] = "default"; 952 char bstr[] = "default";
953 char *env_colorfgbg;
959 954
960 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
961 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
962 { 957 {
963 sprintf (fstr, "%d", i - Color_Black); 958 sprintf (fstr, "%d", i - Color_Black);
… …
972 xpmb = "default;"; 967 xpmb = "default;";
973#endif 968#endif
974 break; 969 break;
975 } 970 }
976 971
972 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 973 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
974 return env_colorfgbg;
978} 975}
979 976
980/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
981 978
982bool 979bool
… …
1075 if (scrollBar.state) 1072 if (scrollBar.state)
1076 scrollBar.resize (); 1073 scrollBar.resize ();
1077 1074
1078 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1080 width, height); 1077 vt_width, vt_height);
1081 1078
1082#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1084 update_background (); 1081 update_background ();
1085#endif 1082#endif
… …
1110 newwidth = wattr.width - szHint.base_width; 1107 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1108 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1109 newheight = wattr.height - szHint.base_height;
1113 } 1110 }
1114 1111
1115 if (newwidth != width || newheight != height) 1112 if (newwidth != vt_width || newheight != vt_height)
1116 { 1113 {
1117 newwidth += szHint.base_width; 1114 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1115 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1116 resize_all_windows (newwidth, newheight, 0);
1120 } 1117 }
… …
1528 im_destroy (); 1525 im_destroy ();
1529 1526
1530 if (Input_Context) 1527 if (Input_Context)
1531 return; 1528 return;
1532 1529
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1530 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1531 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1532
1538 p = rs[Rs_inputMethod]; 1533 p = rs[Rs_inputMethod];
1539 if (p && *p) 1534 if (p && *p)
1540 { 1535 {
1541 bool found = false; 1536 bool found = false;
… …
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1564 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1565 if (im_get_ic ("@im=none"))
1571 goto done; 1566 goto done;
1572 1567
1573done: 1568done:
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1577#endif
1578} 1571}
1579 1572
1580void 1573void
1581rxvt_term::im_set_position () 1574rxvt_term::im_set_position ()
1582{ 1575{

Diff Legend

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