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.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.526 by root, Fri Nov 30 07:19:09 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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
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[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
406{ 407{
407 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
408 KeySym keysym; 409 KeySym keysym;
409 int valid_keysym; 410 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
426 427
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
569 selection_request (ev.time); 570 selection_request (ev.time);
570 return; 571 return;
571#if TODO 572#if TODO
572 /* rxvt extras */ 573 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 575 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 577 return;
579#endif 578#endif
580 } 579 }
581 } 580 }
582 } 581 }
… …
781 } 780 }
782 781
783 if (newlen) 782 if (newlen)
784 len = strlen (kbuf); 783 len = strlen (kbuf);
785 784
785 if (len > 0)
786 {
786 /* 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 /*
787 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
788 */ 801 */
789#ifdef META8_OPTION 802#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
792#endif 805#endif
806 }
793 807
794 } 808 }
795 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
796 { 810 {
797 len = 1; 811 len = 1;
… …
831 { 845 {
832 view_start = 0; 846 view_start = 0;
833 want_refresh = 1; 847 want_refresh = 1;
834 } 848 }
835 849
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 850 /* escape prefix */
851 if (meta 851 if (meta
852#ifdef META8_OPTION 852#ifdef META8_OPTION
853 && meta_char == C0_ESC 853 && meta_char == C0_ESC
854#endif 854#endif
… …
859 } 859 }
860 860
861 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
862} 862}
863 863
864void 864void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
866{ 866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 868 KeySym keysym;
869 869
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
… …
1024 while (row < end_row); 991 while (row < end_row);
1025 } 992 }
1026 993
1027 scr_refresh (); 994 scr_refresh ();
1028 scrollBar.show (1); 995 scrollBar.show (1);
1029#ifdef USE_XIM 996#if USE_XIM
1030 IMSendSpot (); 997 im_send_spot ();
1031#endif 998#endif
1032 } 999 }
1033 1000
1034 display->flush (); 1001 display->flush ();
1035} 1002}
… …
1053 flush (); 1020 flush ();
1054} 1021}
1055 1022
1056#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1057void 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
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1041{
1060 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1043 want_refresh = 1;
1062 refresh_check (); 1044 refresh_check ();
… …
1080 1062
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1064void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1066{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1069 {
1088 want_refresh = 1; 1070 want_refresh = 1;
1089 refresh_check (); 1071 refresh_check ();
1090 } 1072 }
1091 else 1073 else
… …
1152 { 1134 {
1153 } 1135 }
1154} event_handler; 1136} event_handler;
1155#endif 1137#endif
1156 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1157bool 1172bool
1158rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1159{ 1174{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1161 1176
1162 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1178
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1165 n = 0;
1166 } 1180 {
1167 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1171 1186
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1188
1174 if (r > 0) 1189 if (r > 0)
1175 { 1190 {
1176 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1177 return true; 1192 return true;
… …
1208 pty_write (); 1223 pty_write ();
1209 1224
1210 refresh_check (); 1225 refresh_check ();
1211} 1226}
1212 1227
1213void 1228void ecb_cold
1214rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1215{ 1230{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1232 recolour_cursor ();
1218 1233
… …
1223 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1224#endif 1239#endif
1225} 1240}
1226 1241
1227#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1228void 1243void ecb_cold
1229rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1230{ 1245{
1231 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1232 return; 1247 return;
1233 1248
… …
1235 XFlush (dpy); 1250 XFlush (dpy);
1236 1251
1237 hidden_pointer = 1; 1252 hidden_pointer = 1;
1238} 1253}
1239 1254
1240void 1255void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1257{
1243 make_current (); 1258 make_current ();
1244 1259
1245 pointer_blank (); 1260 pointer_blank ();
… …
1337 32 + x, 1352 32 + x,
1338 32 + y); 1353 32 + y);
1339} 1354}
1340 1355
1341/*{{{ process an X event */ 1356/*{{{ process an X event */
1342void 1357void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1344{ 1359{
1345 make_current (); 1360 make_current ();
1346 1361
1347 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1461 focus_out ();
1447 break; 1462 break;
1448 1463
1449 case ConfigureNotify: 1464 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1451 { 1466 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1468 ;
1454 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1458 { 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 {
1459 int x, y; 1484 int x, y;
1485
1460 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1461 { 1487 {
1462 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1464 } 1490 }
1465 else 1491 else
1466 get_window_origin (x, y); 1492 get_window_origin (x, y);
1467 1493
1468 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1469 || !(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));
1470 moved = true; 1499 moved = true;
1500 }
1471 } 1501 }
1472#endif
1473 1502
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1504 {
1476 seen_resize = 1; 1505 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1507 }
1479 else 1508 else
1480 { 1509 {
1481#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1511 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1512 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1513#endif
1490 } 1514 }
1491 1515
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1517 }
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1592 ;
1569 1593
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1595 {
1572 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1597 scrollBar.show (0);
1574 } 1598 }
1575 } 1599 }
1576 break; 1600 break;
1577 1601
… …
1643 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1644 } 1668 }
1645 else 1669 else
1646 { 1670 {
1647 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1673 }
1650 1674
1651 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1677 + 1;
… …
1665#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1666 } 1690 }
1667#endif 1691#endif
1668 } 1692 }
1669 } 1693 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1695 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1674 ; 1698 ;
1675 1699
1676 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1704 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1706 scrollBar.size ());
1683 want_refresh = 1; 1707 want_refresh = 1;
1684 scrollBar.show (1); 1708 scrollBar.show (1);
1685 } 1709 }
1686 break; 1710 break;
1687 } 1711 }
1688 1712
1689#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1699 }
1700#endif 1716#endif
1701 1717
1702#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1720 {
… …
1715 1731
1716 refresh_check (); 1732 refresh_check ();
1717} 1733}
1718 1734
1719#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1720void 1736void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1722{ 1738{
1723 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1724 return; 1740 return;
1725 1741
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1743 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1745 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1731 } 1748 }
1732} 1749}
1733#endif 1750#endif
1734 1751
1735void 1752void ecb_cold
1736rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1737{ 1754{
1738 if (!focus) 1755 if (!focus)
1739 { 1756 {
1740 focus = 1; 1757 focus = 1;
1741 want_refresh = 1; 1758 want_refresh = 1;
1742 1759
1743#if USE_XIM 1760#if USE_XIM
1744 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1745 { 1762 {
1746 IMSetPosition (); 1763 im_set_position ();
1747 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1748 } 1765 }
1749#endif 1766#endif
1750#if CURSOR_BLINK 1767#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1765 1782
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1784 }
1768} 1785}
1769 1786
1770void 1787void ecb_cold
1771rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1772{ 1789{
1773 if (focus) 1790 if (focus)
1774 { 1791 {
1775 focus = 0; 1792 focus = 0;
… …
1808 1825
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1827 }
1811} 1828}
1812 1829
1813void 1830void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1815{ 1832{
1816#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1818 { 1835 {
… …
1822 } 1839 }
1823#endif 1840#endif
1824} 1841}
1825 1842
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1827void 1844void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1846{
1830 make_current (); 1847 make_current ();
1831 1848
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1851 return;
1835 1852
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1853 switch (ev.type)
1838 { 1854 {
1839 case PropertyNotify: 1855 case PropertyNotify:
1840 /* 1856 /*
1841 * 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,
1842 * 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.
1843 */ 1859 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1862 {
1863# if ENABLE_TRANSPARENCY
1847 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1848 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1849 } 1870 }
1850 1871
1851 break; 1872 break;
1852 } 1873 }
1853# endif
1854 1874
1855 refresh_check (); 1875 refresh_check ();
1856} 1876}
1857#endif 1877#endif
1858 1878
… …
1982 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 2003 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 2005 direction = DN; /* down */
1986 2006
1987 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1988 /* 2008 /*
1989 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 2010 * move up if mouse is above slider
1991 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1992 * 2012 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2052#endif
2033 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2034 { 2054 {
2035 if (direction == UP) 2055 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2037 else 2057 else
2038 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2039 } 2059 }
2040 } 2060 }
2041 else 2061 else
2042 switch (ev.button) 2062 switch (ev.button)
2043 { 2063 {
2044 case Button2: 2064 case Button2:
2045 switch (scrollBar.align) 2065 switch (scrollBar.align)
2046 { 2066 {
2047 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2048 csrO = 0; 2068 csrO = 0;
2049 break; 2069 break;
2050 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2072 break;
2053 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2075 break;
2056 } 2076 }
2057 2077
2058 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2082
2063 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2064 break; 2084 break;
2065 2085
2066 case Button1: 2086 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2070 2090
2071 case Button3: 2091 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2093 {
2074 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2077# else 2097# else
2078 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2079# endif 2099# endif
2080 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2083# else 2103# else
2084 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2085# endif 2105# endif
2086 else 2106 else
2087 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2088 } 2108 }
2089 else 2109 else
2090 { 2110 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2112 (nrow
2093 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2114 / scrollBar.size ()));
2095 } 2115 }
2096 2116
2097 break; 2117 break;
2098 } 2118 }
… …
2109 2129
2110 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2131 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2133
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2135 {
2116 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2137 scrollBar.show (0);
2118 } 2138 }
2119 2139
2120#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2171 case Button3: 2191 case Button3:
2172 selection_make (ev.time); 2192 selection_make (ev.time);
2173 break; 2193 break;
2174 2194
2175 case Button2: 2195 case Button2:
2176 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?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2198 break;
2179 2199
2180#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2181 case Button4: 2201 case Button4:
… …
2216 } 2236 }
2217} 2237}
2218 2238
2219/*}}} */ 2239/*}}} */
2220 2240
2221void 2241void ecb_hot
2222rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2223{ 2243{
2224 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2226 2246
2227 for (;;) 2247 for (;;)
2228 { 2248 {
2229 if (expect_false (ch == NOCHAR)) 2249 if (ecb_unlikely (ch == NOCHAR))
2230 { 2250 {
2231 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2252 ch = next_char ();
2233 2253
2234 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2235 break; 2255 break;
2236 } 2256 }
2237 2257
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2259 {
2240 if (expect_false (!seen_input)) 2260 if (ecb_unlikely (!seen_input))
2241 { 2261 {
2242 seen_input = 1; 2262 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2278 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2280
2261 for (;;) 2281 for (;;)
2262 { 2282 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2284 break;
2265 2285
2266 *str++ = ch; 2286 *str++ = ch;
2267 2287
2268 if (expect_false (ch == C0_LF || str >= eol)) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2289 {
2270 if (ch == C0_LF) 2290 if (ch == C0_LF)
2271 nlines++; 2291 nlines++;
2272 2292
2273 refresh_count++; 2293 refresh_count++;
… …
2345 } 2365 }
2346 } 2366 }
2347} 2367}
2348 2368
2349// read the next character 2369// read the next character
2350wchar_t 2370wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2352{ 2372{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2374 {
2355 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2358 2378
2359 wchar_t wc; 2379 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2381
… …
2367 } 2387 }
2368 2388
2369 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2370 { 2390 {
2371 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.
2372 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
2373 } 2395 }
2374 2396
2375 // assume wchar == unicode 2397 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2379 2401
2380 return NOCHAR; 2402 return NOCHAR;
2381} 2403}
2382 2404
2383// read the next octet 2405// read the next octet
2384uint32_t 2406uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2386{ 2408{
2387 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2411 : NOCHAR;
2390} 2412}
2391 2413
2392static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2393 2415
2394/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2418{
2402 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2403 2420
2404 if (c == NOCHAR) 2421 if (c == NOCHAR)
2405 throw out_of_input; 2422 throw out_of_input;
2406 2423
2407 return c; 2424 return c;
2408} 2425}
2409 2426
2410uint32_t 2427uint32_t ecb_hot
2411rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412{ 2429{
2413 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2414 2431
2415 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2419} 2436}
2420 2437
2421/*{{{ print pipe */ 2438/*{{{ print pipe */
2422/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2423#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2424FILE * 2441FILE * ecb_cold
2425rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2426{ 2443{
2427 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");
2428 2445
2429 if (stream == NULL) 2446 if (stream == NULL)
2430 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2431 2448
2432 return stream; 2449 return stream;
2433} 2450}
2434 2451
2435int 2452int ecb_cold
2436rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2437{ 2454{
2438 fflush (stream); 2455 fflush (stream);
2439 return pclose (stream); 2456 return pclose (stream);
2440} 2457}
2441 2458
2442/* 2459/*
2443 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2444 */ 2461 */
2445void 2462void ecb_cold
2446rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2447{ 2464{
2448 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2449 2466
2450 if (!fd) 2467 if (!fd)
… …
2496 pclose_printer (fd); 2513 pclose_printer (fd);
2497} 2514}
2498#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2499/*}}} */ 2516/*}}} */
2500 2517
2501/* *INDENT-OFF* */
2502enum { 2518enum {
2503 C1_40 = 0x40, 2519 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 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,
2507 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,
2508}; 2524};
2509/* *INDENT-ON* */
2510 2525
2511/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2512void 2527void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2529{
2515 switch (ch) 2530 switch (ch)
2516 { 2531 {
2517 case C0_ESC: 2532 case C0_ESC:
… …
2563} 2578}
2564/*}}} */ 2579/*}}} */
2565 2580
2566 2581
2567/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2568void 2583void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2585{
2571 int row, col; 2586 int row, col;
2572 2587
2573 switch (ch) 2588 switch (ch)
… …
2607 break; 2622 break;
2608 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2625 break;
2611 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2627 priv_modes &= ~PrivMode_vt52;
2613 break; 2628 break;
2614 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2616 /* unimplemented */ 2631 /* unimplemented */
2617 break; 2632 break;
… …
2623} 2638}
2624/*}}} */ 2639/*}}} */
2625 2640
2626 2641
2627/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2628void 2643void ecb_hot
2629rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2630{ 2645{
2631 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2632 2647
2633 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2636 return; 2651 return;
2637 } 2652 }
2638 2653
2639 switch (ch) 2654 switch (ch)
2640 { 2655 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2656 case '#':
2643 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2644 scr_E (); 2658 scr_E ();
2645 break; 2659 break;
2646 case '(': 2660 case '(':
… …
2669#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2670 case '9': 2684 case '9':
2671 scr_forwardindex (); 2685 scr_forwardindex ();
2672 break; 2686 break;
2673#endif 2687#endif
2688 // DECPAM/DECPNM
2674 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2675 case '>': 2692 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2693 priv_modes &= ~PrivMode_aplKP;
2677 break; 2694 break;
2678 2695
2679 case C1_40: 2696 case C1_40:
2680 cmd_getc (); 2697 cmd_getc ();
2681 break; 2698 break;
… …
2685 2702
2686 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2688 { 2705 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2708 }
2692 break; 2709 break;
2693 2710
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2696 process_graphics (); 2713 // used by original rxvt for rob nations own graphics mode
2714 if (cmd_getc () == 'Q')
2715 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2716 break;
2698 2717
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2706 scr_index (DN); 2725 scr_index (DN);
2707 break; 2726 break;
2708 2727
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2711 2730
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2714 2733
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2736 process_dcs_seq ();
2718 break; 2737 break;
… …
2751 } 2770 }
2752} 2771}
2753/*}}} */ 2772/*}}} */
2754 2773
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2775enum {
2758 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782 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, */
2783 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, */
2784 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, {, |, }, ~, */
2785 }; 2803 };
2786/* *INDENT-ON* */
2787 2804
2788void 2805void ecb_hot
2789rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2790{ 2807{
2791 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2792 unsigned int nargs, p; 2809 unsigned int nargs, p;
2793 int n, ndef; 2810 int n, ndef;
… …
2871 scr_soft_reset (); 2888 scr_soft_reset ();
2872 2889
2873 static const int pm_h[] = { 7, 25 }; 2890 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2891 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875 2892
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878 } 2895 }
2879 break; 2896 break;
2880 } 2897 }
2881 2898
2882 return; 2899 return;
… …
2900 } 2917 }
2901 break; 2918 break;
2902#endif 2919#endif
2903 2920
2904 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2905 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2906 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2907 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2908 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2909 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2910 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2911 break; 2928 break;
2912 2929
2913 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2914 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3101 } 3118 }
3102} 3119}
3103/*}}} */ 3120/*}}} */
3104 3121
3105#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3106/* ARGSUSED */
3107void 3123void
3108rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109{ 3125{
3110 int x, y; 3126 int x, y;
3111 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3120 { 3136 {
3121 /* 3137 /*
3122 * commands 3138 * commands
3123 */ 3139 */
3124 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3125 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3126 break; 3142 break;
3127 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3128 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3129 break; 3145 break;
3130 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3131 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3132 break; 3148 break;
3133 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135 break; 3151 break;
3136 case 5: /* raise window */ 3152 case 5: /* raise window */
3137 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3138 break; 3154 break;
3139 case 6: /* lower window */ 3155 case 6: /* lower window */
3140 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3141 break; 3157 break;
3142 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3143 scr_touch (true); 3159 scr_touch (true);
3144 break; 3160 break;
3145 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3148 break; 3164 break;
3149 3165
3150 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3151 default: 3167 default:
3152 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3153 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3154 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3155 break; 3171 break;
3156 3172
3157 /* 3173 /*
3158 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3159 */ 3175 */
3160 case 11: /* report window state */ 3176 case 11: /* report window state */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163 break; 3179 break;
3164 case 13: /* report window position */ 3180 case 13: /* report window position */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3166 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3167 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3168 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3169 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3170 break; 3186 break;
3171 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174 break; 3190 break;
3175 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3176 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177 break; 3193 break;
… …
3179 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180 break; 3196 break;
3181 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3182 { 3198 {
3183 char *s; 3199 char *s;
3184 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3201 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3186 XFree (s); 3202 XFree (s);
3187 } 3203 }
3188 break; 3204 break;
3189 case 21: /* report window title */ 3205 case 21: /* report window title */
3190 { 3206 {
3191 char *s; 3207 char *s;
3192 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3209 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3194 XFree (s); 3210 XFree (s);
3195 } 3211 }
3196 break; 3212 break;
3197 } 3213 }
… …
3351 unsigned long bytes_after; 3367 unsigned long bytes_after;
3352 unsigned char *value = 0; 3368 unsigned char *value = 0;
3353 const char *str = ""; 3369 const char *str = "";
3354 3370
3355 if (prop 3371 if (prop
3356 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3357 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3358 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3359 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3360 && actual_type != None 3376 && actual_type != None
3361 && actual_format == 8) 3377 && actual_format == 8)
… …
3373 { 3389 {
3374 *eq = 0; 3390 *eq = 0;
3375 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3376 } 3392 }
3377 else 3393 else
3378 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3379 display->atom (str)); 3395 display->atom (str));
3380 } 3396 }
3381 break; 3397 break;
3382 3398
3383 case XTerm_Color: 3399 case XTerm_Color:
… …
3444 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3445 { 3461 {
3446 bool changed = false; 3462 bool changed = false;
3447 3463
3448 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3450 3466
3451 if (changed) 3467 if (changed)
3452 update_background (); 3468 update_background ();
3453 } 3469 }
3454 3470
… …
3458#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3459 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3460 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3461 { 3477 {
3462 char str[256]; 3478 char str[256];
3479 int h_scale = fimage.h_scale;
3480 int v_scale = fimage.v_scale;
3481 int h_align = fimage.h_align;
3482 int v_align = fimage.v_align;
3463 3483
3464 sprintf (str, "[%dx%d+%d+%d]", 3484 sprintf (str, "[%dx%d+%d+%d]",
3465 min (h_scale, 32767), min (v_scale, 32767), 3485 h_scale, v_scale,
3466 min (h_align, 32767), min (v_align, 32767)); 3486 h_align, v_align);
3467 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3468 } 3488 }
3469 else 3489 else
3470 { 3490 {
3471 int changed = 0; 3491 bool changed = false;
3472 3492
3473 if (*str != ';') 3493 if (*str != ';')
3474 { 3494 {
3475 if (bg_set_file (str)) /* change pixmap */ 3495 try
3476 { 3496 {
3497 fimage.set_file_geometry (this, str);
3477 changed++; 3498 changed = true;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else 3499 }
3482 bg_set_geometry (str+1); 3500 catch (const class rxvt_failure_exception &e)
3501 {
3483 } 3502 }
3484 } 3503 }
3485 else 3504 else
3486 { 3505 {
3487 str++; 3506 str++;
3488 if (bg_set_geometry (str, true)) 3507 if (fimage.set_geometry (str, true))
3489 changed++; 3508 changed = true;
3490 } 3509 }
3491 3510
3492 if (changed) 3511 if (changed)
3493 { 3512 {
3494 if (bg_window_position_sensitive ()) 3513 if (bg_window_position_sensitive ())
3495 { 3514 {
3496 int x, y; 3515 int x, y;
3497 get_window_origin (x, y); 3516 get_window_origin (x, y);
3498 bg_set_position (x, y); 3517 parent_x = x;
3518 parent_y = y;
3499 } 3519 }
3500 update_background (); 3520 update_background ();
3501 } 3521 }
3502 } 3522 }
3503 break; 3523 break;
… …
3593 * 's' = save 3613 * 's' = save
3594 * 'r' = restore 3614 * 'r' = restore
3595 * 't' = toggle 3615 * 't' = toggle
3596 * so no need for fancy checking 3616 * so no need for fancy checking
3597 */ 3617 */
3598int 3618int ecb_cold
3599rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3600{ 3620{
3601 int state; 3621 int state;
3602 3622
3603 if (mode == 's') 3623 if (mode == 's')
3604 { 3624 {
3605 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3606 return -1; 3629 return -1;
3607 } 3630 }
3608 else 3631 else
3609 { 3632 {
3610 if (mode == 'r') 3633 if (mode == 'r')
3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3612 else 3635 else
3613 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614 3637
3615 set_privmode (bit, state); 3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3616 } 3642 }
3617 3643
3618 return state; 3644 return state;
3619} 3645}
3620 3646
3621/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3622void 3648void
3623rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3624{ 3650{
3625 unsigned int i, j; 3651 unsigned int i, j;
3626 int state; 3652 int state;
3627 3653
3628 static const struct 3654 static const struct
3629 { 3655 {
3630 const int argval; 3656 const int argval;
3631 const unsigned long bit; 3657 const unsigned long bit;
3632 } argtopriv[] = { 3658 } argtopriv[] = {
3633 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3634 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3635 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3636 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3637 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3638 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3639 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3640 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3641 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3642 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region 3669 // 19 Print screen prints full screen/scroll region
3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3646 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3647#endif 3673#endif
3648 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3650 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3651 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3652 // 45 margin bell NYI 3678 // 45 margin bell NYI
3653 // 46 start logging 3679 // 46 start logging
3654 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3656#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3657 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3658#endif 3684#endif
3659 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3660 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
… …
3689 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3690 { 3716 {
3691 state = -1; 3717 state = -1;
3692 3718
3693 /* basic handling */ 3719 /* basic handling */
3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3695 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3696 { 3722 {
3697 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3698 break; 3724 break;
3699 } 3725 }
… …
3725 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3726 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3727 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3728 * within VT52 mode 3754 * within VT52 mode
3729 */ 3755 */
3730 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3731 break; 3757 break;
3732 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3733 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3735 break; 3761 break;
… …
3750 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3752 break; 3778 break;
3753#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3754 case scrollBar_esc: 3780 case scrollBar_esc:
3755 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3756 {
3757 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3758 scr_touch (true); 3783 scr_touch (true);
3759 }
3760 break; 3784 break;
3761#endif 3785#endif
3762 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3763 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3764 break; 3788 break;
… …
3819 } 3843 }
3820} 3844}
3821/*}}} */ 3845/*}}} */
3822 3846
3823/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3824void 3848void ecb_hot
3825rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3826{ 3850{
3827 unsigned int i; 3851 unsigned int i;
3828 short rendset; 3852 short rendset;
3829 int rendstyle; 3853 int rendstyle;
… …
3972 } 3996 }
3973 } 3997 }
3974} 3998}
3975/*}}} */ 3999/*}}} */
3976 4000
3977/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3978void
3979rxvt_term::process_graphics ()
3980{
3981 unicode_t ch, cmd = cmd_getc ();
3982
3983 if (cmd == 'Q')
3984 {
3985 /* query graphics */
3986 tt_printf ("\033G0\012"); /* no graphics */
3987 return;
3988 }
3989 /* swallow other graphics sequences until terminating ':' */
3990 do
3991 ch = cmd_getc ();
3992 while (ch != ':');
3993}
3994/*}}} */
3995
3996/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3997 4002
3998/* 4003/*
3999 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4000 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4028 4033
4029 if (v_buflen == 0) 4034 if (v_buflen == 0)
4030 { 4035 {
4031 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4032 4037
4038 max_it (written, 0);
4039
4033 if ((unsigned int)written == len) 4040 if (written == len)
4034 return; 4041 return;
4035 4042
4036 data += written; 4043 data += written;
4037 len -= written; 4044 len -= written;
4038 } 4045 }

Diff Legend

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