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.365 by sf-exg, Mon Jan 9 15:45:45 2012 UTC vs.
Revision 1.371 by sf-exg, Thu Jan 19 15:44:49 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);
… …
710 // 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
711 // 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
712 // 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
713 // refresh the background. We take the simpler route and shrink the 711 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps. 712 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth; 713 vt_width = ncol * fwidth;
716 height = nrow * fheight; 714 vt_height = nrow * fheight;
717} 715}
718 716
719/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
720/* 718/*
721 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
729 727
730 struct winsize ws; 728 struct winsize ws;
731 729
732 ws.ws_col = ncol; 730 ws.ws_col = ncol;
733 ws.ws_row = nrow; 731 ws.ws_row = nrow;
734 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
735 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
736 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
737 735
738#if 0 736#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
… …
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;
… …
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{

Diff Legend

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