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.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.528 by sf-exg, Sat Dec 29 15:59:51 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_flags & BG_IS_VALID))
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);
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1592 ;
1559 1593
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1595 {
1562 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1597 scrollBar.show (0);
1564 } 1598 }
1565 } 1599 }
1566 break; 1600 break;
1567 1601
… …
1633 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1634 } 1668 }
1635 else 1669 else
1636 { 1670 {
1637 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1673 }
1640 1674
1641 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1677 + 1;
… …
1655#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1656 } 1690 }
1657#endif 1691#endif
1658 } 1692 }
1659 } 1693 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1695 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1664 ; 1698 ;
1665 1699
… …
1675 } 1709 }
1676 break; 1710 break;
1677 } 1711 }
1678 1712
1679#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 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 (); 1715 cursor_blink_reset ();
1689 }
1690#endif 1716#endif
1691 1717
1692#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1720 {
… …
1705 1731
1706 refresh_check (); 1732 refresh_check ();
1707} 1733}
1708 1734
1709#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1710void 1736void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1712{ 1738{
1713 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1714 return; 1740 return;
1715 1741
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1743 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1745 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1721 } 1748 }
1722} 1749}
1723#endif 1750#endif
1724 1751
1725void 1752void ecb_cold
1726rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1727{ 1754{
1728 if (!focus) 1755 if (!focus)
1729 { 1756 {
1730 focus = 1; 1757 focus = 1;
… …
1755 1782
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1784 }
1758} 1785}
1759 1786
1760void 1787void ecb_cold
1761rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1762{ 1789{
1763 if (focus) 1790 if (focus)
1764 { 1791 {
1765 focus = 0; 1792 focus = 0;
… …
1798 1825
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1827 }
1801} 1828}
1802 1829
1803void 1830void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1805{ 1832{
1806#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1808 { 1835 {
… …
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1838 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1839 }
1813#endif 1840#endif
1814} 1841}
1815 1842
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1844void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1846{
1820 make_current (); 1847 make_current ();
1821 1848
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1851 return;
1825 1852
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1853 switch (ev.type)
1828 { 1854 {
1829 case PropertyNotify: 1855 case PropertyNotify:
1830 /* 1856 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1857 * 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. 1858 * use the property to determine the pixmap. We use it later on.
1833 */ 1859 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1862 {
1863#if BG_IMAGE_FROM_ROOT
1837 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1838 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1839 } 1870 }
1840 1871
1841 break; 1872 break;
1842 } 1873 }
1843# endif
1844 1874
1845 refresh_check (); 1875 refresh_check ();
1846} 1876}
1847#endif 1877#endif
1848 1878
… …
1972 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2003 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2005 direction = DN; /* down */
1976 2006
1977 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1978 /* 2008 /*
1979 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2010 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1982 * 2012 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2052#endif
2023 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2024 { 2054 {
2025 if (direction == UP) 2055 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2027 else 2057 else
2028 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2029 } 2059 }
2030 } 2060 }
2031 else 2061 else
2032 switch (ev.button) 2062 switch (ev.button)
2033 { 2063 {
2034 case Button2: 2064 case Button2:
2035 switch (scrollBar.align) 2065 switch (scrollBar.align)
2036 { 2066 {
2037 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2038 csrO = 0; 2068 csrO = 0;
2039 break; 2069 break;
2040 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2072 break;
2043 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2075 break;
2046 } 2076 }
2047 2077
2048 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2082
2053 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2054 break; 2084 break;
2055 2085
2056 case Button1: 2086 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2060 2090
2061 case Button3: 2091 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2093 {
2064 if (scrollBar.above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2067# else 2097# else
… …
2072 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2073# else 2103# else
2074 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2075# endif 2105# endif
2076 else 2106 else
2077 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2078 } 2108 }
2079 else 2109 else
2080 { 2110 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2112 (nrow
… …
2099 2129
2100 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2131 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2133
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2135 {
2106 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2137 scrollBar.show (0);
2108 } 2138 }
2109 2139
2110#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2161 case Button3: 2191 case Button3:
2162 selection_make (ev.time); 2192 selection_make (ev.time);
2163 break; 2193 break;
2164 2194
2165 case Button2: 2195 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 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); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2198 break;
2169 2199
2170#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2171 case Button4: 2201 case Button4:
… …
2206 } 2236 }
2207} 2237}
2208 2238
2209/*}}} */ 2239/*}}} */
2210 2240
2211void 2241void ecb_hot
2212rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2213{ 2243{
2214 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2216 2246
… …
2335 } 2365 }
2336 } 2366 }
2337} 2367}
2338 2368
2339// read the next character 2369// read the next character
2340wchar_t 2370wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2342{ 2372{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2374 {
2345 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
… …
2357 } 2387 }
2358 2388
2359 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2360 { 2390 {
2361 mbstate.reset (); // reset now undefined conversion state 2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // 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 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2395 }
2364 2396
2365 // assume wchar == unicode 2397 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2369 2401
2370 return NOCHAR; 2402 return NOCHAR;
2371} 2403}
2372 2404
2373// read the next octet 2405// read the next octet
2374uint32_t 2406uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2376{ 2408{
2377 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2411 : NOCHAR;
2380} 2412}
2381 2413
2382static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2383 2415
2384wchar_t 2416wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2418{
2387 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2388 2420
2389 if (c == NOCHAR) 2421 if (c == NOCHAR)
2390 throw out_of_input; 2422 throw out_of_input;
2391 2423
2392 return c; 2424 return c;
2393} 2425}
2394 2426
2395uint32_t 2427uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2429{
2398 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2399 2431
2400 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2404} 2436}
2405 2437
2406/*{{{ print pipe */ 2438/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2409FILE * 2441FILE * ecb_cold
2410rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2411{ 2443{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2444 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2445
2414 if (stream == NULL) 2446 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2448
2417 return stream; 2449 return stream;
2418} 2450}
2419 2451
2420int 2452int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2422{ 2454{
2423 fflush (stream); 2455 fflush (stream);
2424 return pclose (stream); 2456 return pclose (stream);
2425} 2457}
2426 2458
2427/* 2459/*
2428 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2429 */ 2461 */
2430void 2462void ecb_cold
2431rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2432{ 2464{
2433 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2434 2466
2435 if (!fd) 2467 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 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, 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2524};
2493 2525
2494/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2495void 2527void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2529{
2498 switch (ch) 2530 switch (ch)
2499 { 2531 {
2500 case C0_ESC: 2532 case C0_ESC:
… …
2546} 2578}
2547/*}}} */ 2579/*}}} */
2548 2580
2549 2581
2550/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2551void 2583void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2585{
2554 int row, col; 2586 int row, col;
2555 2587
2556 switch (ch) 2588 switch (ch)
… …
2606} 2638}
2607/*}}} */ 2639/*}}} */
2608 2640
2609 2641
2610/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2611void 2643void ecb_hot
2612rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2613{ 2645{
2614 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2615 2647
2616 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2803 };
2772 2804
2773void 2805void ecb_hot
2774rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2775{ 2807{
2776 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2777 unsigned int nargs, p; 2809 unsigned int nargs, p;
2778 int n, ndef; 2810 int n, ndef;
… …
2885 } 2917 }
2886 break; 2918 break;
2887#endif 2919#endif
2888 2920
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2928 break;
2897 2929
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3132 break; 3164 break;
3133 3165
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3167 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3139 break; 3171 break;
3140 3172
3141 /* 3173 /*
3142 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
… …
3421 break; 3453 break;
3422#endif 3454#endif
3423 case URxvt_Color_border: 3455 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3456 process_color_seq (op, Color_border, str, resp);
3425 break; 3457 break;
3426#if ENABLE_TRANSPARENCY 3458
3459#if BG_IMAGE_FROM_ROOT
3427 case URxvt_Color_tint: 3460 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp); 3461 process_color_seq (op, Color_tint, str, resp);
3429 { 3462 {
3430 bool changed = false; 3463 bool changed = false;
3431 3464
3432 if (ISSET_PIXCOLOR (Color_tint)) 3465 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3466 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434 3467
3435 if (changed) 3468 if (changed)
3436 update_background (); 3469 update_background ();
3437 } 3470 }
3438 3471
… …
3442#if BG_IMAGE_FROM_FILE 3475#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap: 3476 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?")) 3477 if (!strcmp (str, "?"))
3445 { 3478 {
3446 char str[256]; 3479 char str[256];
3480 int h_scale = fimage.h_scale;
3481 int v_scale = fimage.v_scale;
3482 int h_align = fimage.h_align;
3483 int v_align = fimage.v_align;
3447 3484
3448 sprintf (str, "[%dx%d+%d+%d]", 3485 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767), 3486 h_scale, v_scale,
3450 min (h_align, 32767), min (v_align, 32767)); 3487 h_align, v_align);
3451 process_xterm_seq (XTerm_title, str, CHAR_ST); 3488 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 } 3489 }
3453 else 3490 else
3454 { 3491 {
3455 bool changed = false; 3492 bool changed = false;
3456 3493
3457 if (*str != ';') 3494 if (*str != ';')
3458 { 3495 {
3459 if (bg_set_file (str)) /* change pixmap */ 3496 try
3497 {
3498 fimage.set_file_geometry (this, str);
3460 changed = true; 3499 changed = true;
3500 }
3501 catch (const class rxvt_failure_exception &e)
3502 {
3503 }
3461 } 3504 }
3462 else 3505 else
3463 { 3506 {
3464 str++; 3507 str++;
3465 if (bg_set_geometry (str, true)) 3508 if (fimage.set_geometry (str, true))
3466 changed = true; 3509 changed = true;
3467 } 3510 }
3468 3511
3469 if (changed) 3512 if (changed)
3470 { 3513 {
3471 if (bg_window_position_sensitive ()) 3514 if (bg_window_position_sensitive ())
3472 { 3515 {
3473 int x, y; 3516 int x, y;
3474 get_window_origin (x, y); 3517 get_window_origin (x, y);
3475 bg_set_position (x, y); 3518 parent_x = x;
3519 parent_y = y;
3476 } 3520 }
3477 update_background (); 3521 update_background ();
3478 } 3522 }
3479 } 3523 }
3480 break; 3524 break;
… …
3570 * 's' = save 3614 * 's' = save
3571 * 'r' = restore 3615 * 'r' = restore
3572 * 't' = toggle 3616 * 't' = toggle
3573 * so no need for fancy checking 3617 * so no need for fancy checking
3574 */ 3618 */
3575int 3619int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3620rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3621{
3578 int state; 3622 int state;
3579 3623
3580 if (mode == 's') 3624 if (mode == 's')
3581 { 3625 {
3582 SavedModes |= (priv_modes & bit); 3626 if (priv_modes & bit)
3627 SavedModes |= bit;
3628 else
3629 SavedModes &= ~bit;
3583 return -1; 3630 return -1;
3584 } 3631 }
3585 else 3632 else
3586 { 3633 {
3587 if (mode == 'r') 3634 if (mode == 'r')
… …
3797 } 3844 }
3798} 3845}
3799/*}}} */ 3846/*}}} */
3800 3847
3801/*{{{ process sgr sequences */ 3848/*{{{ process sgr sequences */
3802void 3849void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3850rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3851{
3805 unsigned int i; 3852 unsigned int i;
3806 short rendset; 3853 short rendset;
3807 int rendstyle; 3854 int rendstyle;

Diff Legend

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