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.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.537 by sf-exg, Thu Mar 28 11:30:39 2013 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
… …
506#endif 510#endif
507 max_it (lnsppg, 1); 511 max_it (lnsppg, 1);
508 512
509 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
510 { 514 {
511 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
512 return; 516 return;
513 } 517 }
514 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
515 { 519 {
516 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
517 return; 521 return;
518 } 522 }
519 } 523 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
522 { 526 {
523 if (keysym == XK_Up) 527 if (keysym == XK_Up)
524 { 528 {
525 scr_page (UP, 1); 529 scr_page (1);
526 return; 530 return;
527 } 531 }
528 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
529 { 533 {
530 scr_page (DN, 1); 534 scr_page (-1);
531 return; 535 return;
532 } 536 }
533 } 537 }
534#endif 538#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
… …
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 ();
… …
1014 refresh_count = 0; 1019 refresh_count = 0;
1015 flush (); 1020 flush ();
1016} 1021}
1017 1022
1018#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
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
1019void 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;
… …
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 ();
… …
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;
… …
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
… …
1721 XFree (h); 1742 XFree (h);
1722 } 1743 }
1723} 1744}
1724#endif 1745#endif
1725 1746
1726void 1747void ecb_cold
1727rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1728{ 1749{
1729 if (!focus) 1750 if (!focus)
1730 { 1751 {
1731 focus = 1; 1752 focus = 1;
… …
1756 1777
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1779 }
1759} 1780}
1760 1781
1761void 1782void ecb_cold
1762rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1763{ 1784{
1764 if (focus) 1785 if (focus)
1765 { 1786 {
1766 focus = 0; 1787 focus = 0;
… …
1799 1820
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801 } 1822 }
1802} 1823}
1803 1824
1804void 1825void ecb_cold
1805rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1806{ 1827{
1807#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1809 { 1830 {
… …
1812 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);
1813 } 1834 }
1814#endif 1835#endif
1815} 1836}
1816 1837
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1818void 1839void ecb_hot
1819rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1820{ 1841{
1821 make_current (); 1842 make_current ();
1822 1843
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825 return; 1846 return;
1826 1847
1827# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1848 switch (ev.type)
1829 { 1849 {
1830 case PropertyNotify: 1850 case PropertyNotify:
1831 /* 1851 /*
1832 * 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,
1833 * 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.
1834 */ 1854 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1857 {
1838 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);
1839 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1840 } 1866 }
1841 1867
1842 break; 1868 break;
1843 } 1869 }
1844# endif
1845 1870
1846 refresh_check (); 1871 refresh_check ();
1847} 1872}
1848#endif 1873#endif
1849 1874
… …
2162 case Button3: 2187 case Button3:
2163 selection_make (ev.time); 2188 selection_make (ev.time);
2164 break; 2189 break;
2165 2190
2166 case Button2: 2191 case Button2:
2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169 break; 2194 break;
2170 2195
2171#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2172 case Button4: 2197 case Button4:
2173 case Button5: 2198 case Button5:
2174 { 2199 {
2175 int i; 2200 int lines;
2176 page_dirn v; 2201 page_dirn dirn;
2177 2202
2178 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2179 2204
2180 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2181 i = 1; 2206 lines = 1;
2182 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2183 i = nrow - 1; 2208 lines = nrow - 1;
2184 else 2209 else
2185 i = 5; 2210 lines = 5;
2186 2211
2187# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2188 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2189 { 2214 {
2190 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2191 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2192 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2193 2218
2194 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2195 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2196 } 2221 }
2197 else 2222 else
2198# endif 2223# endif
2199 { 2224 {
2200 scr_page (v, i); 2225 scr_page (dirn, lines);
2201 scrollBar.show (1); 2226 scrollBar.show (1);
2202 } 2227 }
2203 } 2228 }
2204 break; 2229 break;
2205#endif 2230#endif
… …
2207 } 2232 }
2208} 2233}
2209 2234
2210/*}}} */ 2235/*}}} */
2211 2236
2212void 2237void ecb_hot
2213rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2214{ 2239{
2215 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2216 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2217 2242
… …
2336 } 2361 }
2337 } 2362 }
2338} 2363}
2339 2364
2340// read the next character 2365// read the next character
2341wchar_t 2366wchar_t ecb_hot
2342rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2343{ 2368{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2370 {
2346 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
… …
2358 } 2383 }
2359 2384
2360 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2361 { 2386 {
2362 mbstate.reset (); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2363 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364 } 2391 }
2365 2392
2366 // assume wchar == unicode 2393 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
… …
2370 2397
2371 return NOCHAR; 2398 return NOCHAR;
2372} 2399}
2373 2400
2374// read the next octet 2401// read the next octet
2375uint32_t 2402uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2377{ 2404{
2378 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2407 : NOCHAR;
2381} 2408}
2382 2409
2383static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2384 2411
2385wchar_t 2412wchar_t ecb_hot
2386rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2387{ 2414{
2388 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2389 2416
2390 if (c == NOCHAR) 2417 if (c == NOCHAR)
2391 throw out_of_input; 2418 throw out_of_input;
2392 2419
2393 return c; 2420 return c;
2394} 2421}
2395 2422
2396uint32_t 2423uint32_t ecb_hot
2397rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2398{ 2425{
2399 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2400 2427
2401 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2405} 2432}
2406 2433
2407/*{{{ print pipe */ 2434/*{{{ print pipe */
2408/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2409#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2410FILE * 2437FILE * ecb_cold
2411rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2412{ 2439{
2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2414 2441
2415 if (stream == NULL) 2442 if (stream == NULL)
2416 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2417 2444
2418 return stream; 2445 return stream;
2419} 2446}
2420 2447
2421int 2448int ecb_cold
2422rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2423{ 2450{
2424 fflush (stream); 2451 fflush (stream);
2425 return pclose (stream); 2452 return pclose (stream);
2426} 2453}
2427 2454
2428/* 2455/*
2429 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2430 */ 2457 */
2431void 2458void ecb_cold
2432rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2433{ 2460{
2434 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2435 2462
2436 if (!fd) 2463 if (!fd)
… …
2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2493}; 2520};
2494 2521
2495/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2496void 2523void ecb_hot
2497rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2498{ 2525{
2499 switch (ch) 2526 switch (ch)
2500 { 2527 {
2501 case C0_ESC: 2528 case C0_ESC:
… …
2547} 2574}
2548/*}}} */ 2575/*}}} */
2549 2576
2550 2577
2551/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2552void 2579void ecb_cold
2553rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2554{ 2581{
2555 int row, col; 2582 int row, col;
2556 2583
2557 switch (ch) 2584 switch (ch)
… …
2607} 2634}
2608/*}}} */ 2635/*}}} */
2609 2636
2610 2637
2611/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2612void 2639void ecb_hot
2613rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2614{ 2641{
2615 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2616 2643
2617 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2772 }; 2799 };
2773 2800
2774void 2801void ecb_hot
2775rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2776{ 2803{
2777 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2778 unsigned int nargs, p; 2805 unsigned int nargs, p;
2779 int n, ndef; 2806 int n, ndef;
2780 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2781 2808
2782 nargs = 0; 2809 nargs = 0;
… …
2788 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2789 priv = ch; 2816 priv = ch;
2790 ch = cmd_getc (); 2817 ch = cmd_getc ();
2791 } 2818 }
2792 2819
2820 prev_ch = 0;
2793 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2794 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2795 { 2823 {
2796 if (isdigit (ch)) 2824 if (isdigit (ch))
2797 { 2825 {
… …
2807 n = -1; 2835 n = -1;
2808 } 2836 }
2809 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2810 process_nonprinting (ch); 2838 process_nonprinting (ch);
2811 2839
2840 prev_ch = ch;
2812 ch = cmd_getc (); 2841 ch = cmd_getc ();
2813 } 2842 }
2814 2843
2815 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2816 return; 2845 return;
… …
2886 } 2915 }
2887 break; 2916 break;
2888#endif 2917#endif
2889 2918
2890 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2891 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2892 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2893 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2894 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2895 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2896 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2897 break; 2926 break;
2898 2927
2899 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2900 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3050 scr_insert_mode (1); 3079 scr_insert_mode (1);
3051 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3052 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3053 break; 3082 break;
3054 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3055 /* 3089 /*
3056 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3057 */ 3091 */
3058 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3059 if (nargs == 1) 3093 if (nargs == 1)
… …
3133 break; 3167 break;
3134 3168
3135 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3136 default: 3170 default:
3137 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3138 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3139 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3140 break; 3174 break;
3141 3175
3142 /* 3176 /*
3143 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
… …
3422 break; 3456 break;
3423#endif 3457#endif
3424 case URxvt_Color_border: 3458 case URxvt_Color_border:
3425 process_color_seq (op, Color_border, str, resp); 3459 process_color_seq (op, Color_border, str, resp);
3426 break; 3460 break;
3427#if ENABLE_TRANSPARENCY 3461
3462#if BG_IMAGE_FROM_ROOT
3428 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3429 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3430 { 3465 {
3431 bool changed = false; 3466 bool changed = false;
3432 3467
3433 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435 3470
3436 if (changed) 3471 if (changed)
3437 update_background (); 3472 update_background ();
3438 } 3473 }
3439 3474
… …
3443#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3444 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3445 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3446 { 3481 {
3447 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3448 3487
3449 sprintf (str, "[%dx%d+%d+%d]", 3488 sprintf (str, "[%dx%d+%d+%d]",
3450 min (h_scale, 32767), min (v_scale, 32767), 3489 h_scale, v_scale,
3451 min (h_align, 32767), min (v_align, 32767)); 3490 h_align, v_align);
3452 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3453 } 3492 }
3454 else 3493 else
3455 { 3494 {
3456 bool changed = false; 3495 bool changed = false;
3457 3496
3458 if (*str != ';') 3497 if (*str != ';')
3459 { 3498 {
3460 if (bg_set_file (str)) /* change pixmap */ 3499 try
3500 {
3501 fimage.set_file_geometry (this, str);
3461 changed = true; 3502 changed = true;
3503 }
3504 catch (const class rxvt_failure_exception &e)
3505 {
3506 }
3462 } 3507 }
3463 else 3508 else
3464 { 3509 {
3465 str++; 3510 str++;
3466 if (bg_set_geometry (str, true)) 3511 if (fimage.set_geometry (str, true))
3467 changed = true; 3512 changed = true;
3468 } 3513 }
3469 3514
3470 if (changed) 3515 if (changed)
3471 { 3516 {
3472 if (bg_window_position_sensitive ()) 3517 if (bg_window_position_sensitive ())
3473 { 3518 {
3474 int x, y; 3519 int x, y;
3475 get_window_origin (x, y); 3520 get_window_origin (x, y);
3476 bg_set_position (x, y); 3521 parent_x = x;
3522 parent_y = y;
3477 } 3523 }
3478 update_background (); 3524 update_background ();
3479 } 3525 }
3480 } 3526 }
3481 break; 3527 break;
… …
3571 * 's' = save 3617 * 's' = save
3572 * 'r' = restore 3618 * 'r' = restore
3573 * 't' = toggle 3619 * 't' = toggle
3574 * so no need for fancy checking 3620 * so no need for fancy checking
3575 */ 3621 */
3576int 3622int ecb_cold
3577rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3578{ 3624{
3579 int state; 3625 int state;
3580 3626
3581 if (mode == 's') 3627 if (mode == 's')
3582 { 3628 {
3583 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3584 return -1; 3633 return -1;
3585 } 3634 }
3586 else 3635 else
3587 { 3636 {
3588 if (mode == 'r') 3637 if (mode == 'r')
… …
3798 } 3847 }
3799} 3848}
3800/*}}} */ 3849/*}}} */
3801 3850
3802/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3803void 3852void ecb_hot
3804rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3805{ 3854{
3806 unsigned int i; 3855 unsigned int i;
3807 short rendset; 3856 short rendset;
3808 int rendstyle; 3857 int rendstyle;
… …
3949 break; 3998 break;
3950#endif 3999#endif
3951 } 4000 }
3952 } 4001 }
3953} 4002}
4003
4004void
4005rxvt_term::set_cursor_style (int style)
4006{
4007 if (!IN_RANGE_INC (style, 0, 4))
4008 return;
4009
4010 set_option (Opt_cursorUnderline, style >= 3);
4011
4012#ifdef CURSOR_BLINK
4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
4018}
3954/*}}} */ 4019/*}}} */
3955 4020
3956/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3957 4022
3958/* 4023/*

Diff Legend

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