ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.493 by sf-exg, Sun Aug 21 20:17:40 2011 UTC vs.
Revision 1.532 by sf-exg, Mon Dec 31 12:05:34 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 405void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
403{ 407{
404 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
405 KeySym keysym; 409 KeySym keysym;
406 int valid_keysym; 410 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
423 427
424 kbuf[0] = 0; 428 kbuf[0] = 0;
425 429
426#ifdef USE_XIM 430#if USE_XIM
427 if (Input_Context) 431 if (Input_Context)
428 { 432 {
429 Status status_return; 433 Status status_return;
430 434
431#if 0 435#if 0
… …
776 } 780 }
777 781
778 if (newlen) 782 if (newlen)
779 len = strlen (kbuf); 783 len = strlen (kbuf);
780 784
785 if (len > 0)
786 {
781 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
782 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
783 */ 801 */
784#ifdef META8_OPTION 802#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
787#endif 805#endif
806 }
788 807
789 } 808 }
790 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
791 { 810 {
792 len = 1; 811 len = 1;
… …
826 { 845 {
827 view_start = 0; 846 view_start = 0;
828 want_refresh = 1; 847 want_refresh = 1;
829 } 848 }
830 849
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */ 850 /* escape prefix */
846 if (meta 851 if (meta
847#ifdef META8_OPTION 852#ifdef META8_OPTION
848 && meta_char == C0_ESC 853 && meta_char == C0_ESC
849#endif 854#endif
… …
854 } 859 }
855 860
856 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
857} 862}
858 863
859void 864void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
861{ 866{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 868 KeySym keysym;
864 869
… …
936void 941void
937rxvt_term::flush () 942rxvt_term::flush ()
938{ 943{
939 flush_ev.stop (); 944 flush_ev.stop ();
940 945
941#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
943 { 948 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 950 scr_touch (false);
946 } 951 }
… …
986 while (row < end_row); 991 while (row < end_row);
987 } 992 }
988 993
989 scr_refresh (); 994 scr_refresh ();
990 scrollBar.show (1); 995 scrollBar.show (1);
991#ifdef USE_XIM 996#if USE_XIM
992 im_send_spot (); 997 im_send_spot ();
993#endif 998#endif
994 } 999 }
995 1000
996 display->flush (); 1001 display->flush ();
… …
1015 flush (); 1020 flush ();
1016} 1021}
1017 1022
1018#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1019void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1041{
1022 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1043 want_refresh = 1;
1024 refresh_check (); 1044 refresh_check ();
… …
1042 1062
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1064void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1066{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1069 {
1050 want_refresh = 1; 1070 want_refresh = 1;
1051 refresh_check (); 1071 refresh_check ();
1052 } 1072 }
1053 else 1073 else
… …
1203 pty_write (); 1223 pty_write ();
1204 1224
1205 refresh_check (); 1225 refresh_check ();
1206} 1226}
1207 1227
1208void 1228void ecb_cold
1209rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1210{ 1230{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1232 recolour_cursor ();
1213 1233
… …
1218 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1219#endif 1239#endif
1220} 1240}
1221 1241
1222#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1223void 1243void ecb_cold
1224rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1225{ 1245{
1226 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1227 return; 1247 return;
1228 1248
… …
1230 XFlush (dpy); 1250 XFlush (dpy);
1231 1251
1232 hidden_pointer = 1; 1252 hidden_pointer = 1;
1233} 1253}
1234 1254
1235void 1255void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1257{
1238 make_current (); 1258 make_current ();
1239 1259
1240 pointer_blank (); 1260 pointer_blank ();
… …
1332 32 + x, 1352 32 + x,
1333 32 + y); 1353 32 + y);
1334} 1354}
1335 1355
1336/*{{{ process an X event */ 1356/*{{{ process an X event */
1337void 1357void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1339{ 1359{
1340 make_current (); 1360 make_current ();
1341 1361
1342 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1446 { 1466 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1468 ;
1449 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1453 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1454 int x, y; 1484 int x, y;
1485
1455 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1456 { 1487 {
1457 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1459 } 1490 }
1460 else 1491 else
1461 get_window_origin (x, y); 1492 get_window_origin (x, y);
1462 1493
1463 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1499 moved = true;
1500 }
1466 } 1501 }
1467#endif
1468 1502
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1504 {
1471 seen_resize = 1; 1505 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1495 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1496 break; 1530 break;
1497 1531
1498 case MapNotify: 1532 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1538 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1514#endif 1543#endif
1515 mapped = 1; 1544 mapped = 1;
1516#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1587 ;
1559 1588
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1590 {
1562 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1592 scrollBar.show (0);
1564 } 1593 }
1565 } 1594 }
1566 break; 1595 break;
1567 1596
… …
1633 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1634 } 1663 }
1635 else 1664 else
1636 { 1665 {
1637 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1668 }
1640 1669
1641 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1672 + 1;
… …
1655#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1656 } 1685 }
1657#endif 1686#endif
1658 } 1687 }
1659 } 1688 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1690 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1664 ; 1693 ;
1665 1694
1666 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1667 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1699 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672 scrollBar.size ()); 1701 scrollBar.size ());
1673 want_refresh = 1; 1702 want_refresh = 1;
1674 scrollBar.show (1); 1703 scrollBar.show (1);
1675 } 1704 }
1676 break; 1705 break;
1677 } 1706 }
1678 1707
1679#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1689 }
1690#endif 1711#endif
1691 1712
1692#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1715 {
… …
1705 1726
1706 refresh_check (); 1727 refresh_check ();
1707} 1728}
1708 1729
1709#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1710void 1731void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1712{ 1733{
1713 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1714 return; 1735 return;
1715 1736
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1738 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1740 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1721 } 1743 }
1722} 1744}
1723#endif 1745#endif
1724 1746
1725void 1747void ecb_cold
1726rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1727{ 1749{
1728 if (!focus) 1750 if (!focus)
1729 { 1751 {
1730 focus = 1; 1752 focus = 1;
… …
1755 1777
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1779 }
1758} 1780}
1759 1781
1760void 1782void ecb_cold
1761rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1762{ 1784{
1763 if (focus) 1785 if (focus)
1764 { 1786 {
1765 focus = 0; 1787 focus = 0;
… …
1798 1820
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1822 }
1801} 1823}
1802 1824
1803void 1825void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1805{ 1827{
1806#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1808 { 1830 {
… …
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1834 }
1813#endif 1835#endif
1814} 1836}
1815 1837
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1839void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1841{
1820 make_current (); 1842 make_current ();
1821 1843
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1846 return;
1825 1847
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1848 switch (ev.type)
1828 { 1849 {
1829 case PropertyNotify: 1850 case PropertyNotify:
1830 /* 1851 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1833 */ 1854 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1857 {
1837 bg_set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1838 update_background (); 1862 update_background ();
1863 }
1864#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1839 } 1868 }
1840 1869
1841 break; 1870 break;
1842 } 1871 }
1843# endif
1844 1872
1845 refresh_check (); 1873 refresh_check ();
1846} 1874}
1847#endif 1875#endif
1848 1876
… …
1972 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2001 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2003 direction = DN; /* down */
1976 2004
1977 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1978 /* 2006 /*
1979 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2008 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1982 * 2010 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2050#endif
2023 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
2024 { 2052 {
2025 if (direction == UP) 2053 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
2027 else 2055 else
2028 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
2029 } 2057 }
2030 } 2058 }
2031 else 2059 else
2032 switch (ev.button) 2060 switch (ev.button)
2033 { 2061 {
2034 case Button2: 2062 case Button2:
2035 switch (scrollBar.align) 2063 switch (scrollBar.align)
2036 { 2064 {
2037 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2038 csrO = 0; 2066 csrO = 0;
2039 break; 2067 break;
2040 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2070 break;
2043 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2073 break;
2046 } 2074 }
2047 2075
2048 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2050 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2080
2053 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2054 break; 2082 break;
2055 2083
2056 case Button1: 2084 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2060 2088
2061 case Button3: 2089 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2091 {
2064 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2067# else 2095# else
2068 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2069# endif 2097# endif
2070 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2071# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2072 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2073# else 2101# else
2074 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2075# endif 2103# endif
2076 else 2104 else
2077 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2078 } 2106 }
2079 else 2107 else
2080 { 2108 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2110 (nrow
2083 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2084 / scrollBar.size ())); 2112 / scrollBar.size ()));
2085 } 2113 }
2086 2114
2087 break; 2115 break;
2088 } 2116 }
… …
2099 2127
2100 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2129 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2131
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2133 {
2106 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2135 scrollBar.show (0);
2108 } 2136 }
2109 2137
2110#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
… …
2161 case Button3: 2189 case Button3:
2162 selection_make (ev.time); 2190 selection_make (ev.time);
2163 break; 2191 break;
2164 2192
2165 case Button2: 2193 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2196 break;
2169 2197
2170#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2171 case Button4: 2199 case Button4:
… …
2206 } 2234 }
2207} 2235}
2208 2236
2209/*}}} */ 2237/*}}} */
2210 2238
2211void 2239void ecb_hot
2212rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2213{ 2241{
2214 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2216 2244
… …
2335 } 2363 }
2336 } 2364 }
2337} 2365}
2338 2366
2339// read the next character 2367// read the next character
2340wchar_t 2368wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () NOTHROW
2342{ 2370{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2372 {
2345 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS
… …
2357 } 2385 }
2358 2386
2359 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2360 { 2388 {
2361 mbstate.reset (); // reset now undefined conversion state 2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2393 }
2364 2394
2365 // assume wchar == unicode 2395 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
… …
2369 2399
2370 return NOCHAR; 2400 return NOCHAR;
2371} 2401}
2372 2402
2373// read the next octet 2403// read the next octet
2374uint32_t 2404uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () NOTHROW
2376{ 2406{
2377 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2409 : NOCHAR;
2380} 2410}
2381 2411
2382static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2383 2413
2384wchar_t 2414wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2416{
2387 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2388 2418
2389 if (c == NOCHAR) 2419 if (c == NOCHAR)
2390 throw out_of_input; 2420 throw out_of_input;
2391 2421
2392 return c; 2422 return c;
2393} 2423}
2394 2424
2395uint32_t 2425uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2427{
2398 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2399 2429
2400 if (c == NOCHAR) 2430 if (c == NOCHAR)
… …
2404} 2434}
2405 2435
2406/*{{{ print pipe */ 2436/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2409FILE * 2439FILE * ecb_cold
2410rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2411{ 2441{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2443
2414 if (stream == NULL) 2444 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2446
2417 return stream; 2447 return stream;
2418} 2448}
2419 2449
2420int 2450int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2422{ 2452{
2423 fflush (stream); 2453 fflush (stream);
2424 return pclose (stream); 2454 return pclose (stream);
2425} 2455}
2426 2456
2427/* 2457/*
2428 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2429 */ 2459 */
2430void 2460void ecb_cold
2431rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2432{ 2462{
2433 FILE *fd = popen_printer (); 2463 FILE *fd = popen_printer ();
2434 2464
2435 if (!fd) 2465 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2522};
2493 2523
2494/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2495void 2525void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2527{
2498 switch (ch) 2528 switch (ch)
2499 { 2529 {
2500 case C0_ESC: 2530 case C0_ESC:
… …
2546} 2576}
2547/*}}} */ 2577/*}}} */
2548 2578
2549 2579
2550/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2551void 2581void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2583{
2554 int row, col; 2584 int row, col;
2555 2585
2556 switch (ch) 2586 switch (ch)
… …
2590 break; 2620 break;
2591 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2593 break; 2623 break;
2594 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2595 set_privmode (PrivMode_vt52, 0); 2625 priv_modes &= ~PrivMode_vt52;
2596 break; 2626 break;
2597 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2598 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2599 /* unimplemented */ 2629 /* unimplemented */
2600 break; 2630 break;
… …
2606} 2636}
2607/*}}} */ 2637/*}}} */
2608 2638
2609 2639
2610/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2611void 2641void ecb_hot
2612rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2613{ 2643{
2614 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2615 2645
2616 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2653 scr_forwardindex (); 2683 scr_forwardindex ();
2654 break; 2684 break;
2655#endif 2685#endif
2656 // DECPAM/DECPNM 2686 // DECPAM/DECPNM
2657 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2658 case '>': 2690 case '>':
2659 set_privmode (PrivMode_aplKP, ch == '='); 2691 priv_modes &= ~PrivMode_aplKP;
2660 break; 2692 break;
2661 2693
2662 case C1_40: 2694 case C1_40:
2663 cmd_getc (); 2695 cmd_getc ();
2664 break; 2696 break;
… …
2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2769 }; 2801 };
2770 2802
2771void 2803void ecb_hot
2772rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2773{ 2805{
2774 unicode_t ch, priv, i; 2806 unicode_t ch, priv, i;
2775 unsigned int nargs, p; 2807 unsigned int nargs, p;
2776 int n, ndef; 2808 int n, ndef;
… …
2883 } 2915 }
2884 break; 2916 break;
2885#endif 2917#endif
2886 2918
2887 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2888 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2889 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2890 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2891 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2893 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2894 break; 2926 break;
2895 2927
2896 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2897 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3130 break; 3162 break;
3131 3163
3132 //case 9: NYI, TODO, restore maximized window or maximize window 3164 //case 9: NYI, TODO, restore maximized window or maximize window
3133 default: 3165 default:
3134 if (args[0] >= 24) /* set height (chars) */ 3166 if (args[0] >= 24) /* set height (chars) */
3135 set_widthheight ((unsigned int)width, 3167 set_widthheight ((unsigned int)vt_width,
3136 (unsigned int) (args[1] * fheight)); 3168 (unsigned int) (args[1] * fheight));
3137 break; 3169 break;
3138 3170
3139 /* 3171 /*
3140 * reports - some output format copied from XTerm 3172 * reports - some output format copied from XTerm
… …
3419 break; 3451 break;
3420#endif 3452#endif
3421 case URxvt_Color_border: 3453 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp); 3454 process_color_seq (op, Color_border, str, resp);
3423 break; 3455 break;
3424#if ENABLE_TRANSPARENCY 3456
3457#if BG_IMAGE_FROM_ROOT
3425 case URxvt_Color_tint: 3458 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3459 process_color_seq (op, Color_tint, str, resp);
3427 { 3460 {
3428 bool changed = false; 3461 bool changed = false;
3429 3462
3430 if (ISSET_PIXCOLOR (Color_tint)) 3463 if (ISSET_PIXCOLOR (Color_tint))
3431 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3464 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3432 3465
3433 if (changed) 3466 if (changed)
3434 update_background (); 3467 update_background ();
3435 } 3468 }
3436 3469
… …
3440#if BG_IMAGE_FROM_FILE 3473#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3474 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3475 if (!strcmp (str, "?"))
3443 { 3476 {
3444 char str[256]; 3477 char str[256];
3478 int h_scale = fimage.h_scale;
3479 int v_scale = fimage.v_scale;
3480 int h_align = fimage.h_align;
3481 int v_align = fimage.v_align;
3445 3482
3446 sprintf (str, "[%dx%d+%d+%d]", 3483 sprintf (str, "[%dx%d+%d+%d]",
3447 min (h_scale, 32767), min (v_scale, 32767), 3484 h_scale, v_scale,
3448 min (h_align, 32767), min (v_align, 32767)); 3485 h_align, v_align);
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3487 }
3451 else 3488 else
3452 { 3489 {
3453 bool changed = false; 3490 bool changed = false;
3454 3491
3455 if (*str != ';') 3492 if (*str != ';')
3456 { 3493 {
3457 if (bg_set_file (str)) /* change pixmap */ 3494 try
3495 {
3496 fimage.set_file_geometry (this, str);
3458 changed = true; 3497 changed = true;
3498 }
3499 catch (const class rxvt_failure_exception &e)
3500 {
3501 }
3459 } 3502 }
3460 else 3503 else
3461 { 3504 {
3462 str++; 3505 str++;
3463 if (bg_set_geometry (str, true)) 3506 if (fimage.set_geometry (str, true))
3464 changed = true; 3507 changed = true;
3465 } 3508 }
3466 3509
3467 if (changed) 3510 if (changed)
3468 { 3511 {
3469 if (bg_window_position_sensitive ()) 3512 if (bg_window_position_sensitive ())
3470 { 3513 {
3471 int x, y; 3514 int x, y;
3472 get_window_origin (x, y); 3515 get_window_origin (x, y);
3473 bg_set_position (x, y); 3516 parent_x = x;
3517 parent_y = y;
3474 } 3518 }
3475 update_background (); 3519 update_background ();
3476 } 3520 }
3477 } 3521 }
3478 break; 3522 break;
… …
3568 * 's' = save 3612 * 's' = save
3569 * 'r' = restore 3613 * 'r' = restore
3570 * 't' = toggle 3614 * 't' = toggle
3571 * so no need for fancy checking 3615 * so no need for fancy checking
3572 */ 3616 */
3573int 3617int ecb_cold
3574rxvt_term::privcases (int mode, unsigned long bit) 3618rxvt_term::privcases (int mode, unsigned long bit)
3575{ 3619{
3576 int state; 3620 int state;
3577 3621
3578 if (mode == 's') 3622 if (mode == 's')
3579 { 3623 {
3580 SavedModes |= (priv_modes & bit); 3624 if (priv_modes & bit)
3625 SavedModes |= bit;
3626 else
3627 SavedModes &= ~bit;
3581 return -1; 3628 return -1;
3582 } 3629 }
3583 else 3630 else
3584 { 3631 {
3585 if (mode == 'r') 3632 if (mode == 'r')
3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3633 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3587 else 3634 else
3588 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3635 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3589 3636
3590 set_privmode (bit, state); 3637 if (state)
3638 priv_modes |= bit;
3639 else
3640 priv_modes &= ~bit;
3591 } 3641 }
3592 3642
3593 return state; 3643 return state;
3594} 3644}
3595 3645
… …
3700 case 2: /* VT52 mode */ 3750 case 2: /* VT52 mode */
3701 /* oddball mode. should be set regardless of set/reset 3751 /* oddball mode. should be set regardless of set/reset
3702 * parameter. Return from VT52 mode with an ESC < from 3752 * parameter. Return from VT52 mode with an ESC < from
3703 * within VT52 mode 3753 * within VT52 mode
3704 */ 3754 */
3705 set_privmode (PrivMode_vt52, 1); 3755 priv_modes |= PrivMode_vt52;
3706 break; 3756 break;
3707 case 3: /* 80/132 */ 3757 case 3: /* 80/132 */
3708 if (priv_modes & PrivMode_132OK) 3758 if (priv_modes & PrivMode_132OK)
3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3759 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3710 break; 3760 break;
… …
3725 if (state) /* orthogonal */ 3775 if (state) /* orthogonal */
3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3776 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3727 break; 3777 break;
3728#ifdef scrollBar_esc 3778#ifdef scrollBar_esc
3729 case scrollBar_esc: 3779 case scrollBar_esc:
3730 if (scrollBar.map (state)) 3780 scrollBar.map (state);
3731 {
3732 resize_all_windows (0, 0, 0); 3781 resize_all_windows (0, 0, 0);
3733 scr_touch (true); 3782 scr_touch (true);
3734 }
3735 break; 3783 break;
3736#endif 3784#endif
3737 case 25: /* visible/invisible cursor */ 3785 case 25: /* visible/invisible cursor */
3738 scr_cursor_visible (state); 3786 scr_cursor_visible (state);
3739 break; 3787 break;
… …
3794 } 3842 }
3795} 3843}
3796/*}}} */ 3844/*}}} */
3797 3845
3798/*{{{ process sgr sequences */ 3846/*{{{ process sgr sequences */
3799void 3847void ecb_hot
3800rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3848rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3801{ 3849{
3802 unsigned int i; 3850 unsigned int i;
3803 short rendset; 3851 short rendset;
3804 int rendstyle; 3852 int rendstyle;

Diff Legend

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