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.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 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);
… …
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 */
… …
947 942
948/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
949/* 944/*
950 * find if fg/bg matches any of the normal (low-intensity) colors 945 * find if fg/bg matches any of the normal (low-intensity) colors
951 */ 946 */
952void 947char *
953rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
954{ 949{
955 unsigned int i; 950 unsigned int i;
956 const char *xpmb = ""; 951 const char *xpmb = "";
957 char fstr[] = "default"; 952 char fstr[] = "default";
958 char bstr[] = "default"; 953 char bstr[] = "default";
954 char *env_colorfgbg;
959 955
960 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
961 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
962 { 958 {
963 sprintf (fstr, "%d", i - Color_Black); 959 sprintf (fstr, "%d", i - Color_Black);
… …
972 xpmb = "default;"; 968 xpmb = "default;";
973#endif 969#endif
974 break; 970 break;
975 } 971 }
976 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
975 return env_colorfgbg;
978} 976}
979 977
980/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
981 979
982bool 980bool
… …
1075 if (scrollBar.state) 1073 if (scrollBar.state)
1076 scrollBar.resize (); 1074 scrollBar.resize ();
1077 1075
1078 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1080 width, height); 1078 vt_width, vt_height);
1081 1079
1082#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1084 update_background (); 1082 update_background ();
1085#endif 1083#endif
… …
1110 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1109 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1113 } 1111 }
1114 1112
1115 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1116 { 1114 {
1117 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1120 } 1118 }
… …
1528 im_destroy (); 1526 im_destroy ();
1529 1527
1530 if (Input_Context) 1528 if (Input_Context)
1531 return; 1529 return;
1532 1530
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1533
1538 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1539 if (p && *p) 1535 if (p && *p)
1540 { 1536 {
1541 bool found = false; 1537 bool found = false;
… …
1568 1564
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1565 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1571 goto done; 1567 goto done;
1572 1568
1573done: 1569done: ;
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1577#endif
1578} 1572}
1579 1573
1580void 1574void
1581rxvt_term::im_set_position () 1575rxvt_term::im_set_position ()
1582{ 1576{
… …
1659 if (update_background_ev.is_active ()) 1653 if (update_background_ev.is_active ())
1660 return; 1654 return;
1661 1655
1662 bg_invalidate (); 1656 bg_invalidate ();
1663 1657
1658 if (!mapped)
1659 return;
1660
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1662
1666 if (to_wait <= 0.) 1663 if (to_wait <= 0.)
1667 bg_render (); 1664 bg_render ();
1668 else 1665 else

Diff Legend

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