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.475 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.527 by sf-exg, Sat Dec 29 14:23:35 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 }
1494 break; 1518 break;
1495 1519
1496 case PropertyNotify: 1520 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1522 break;
1503 1523
1504 case SelectionClear: 1524 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1526 break;
1512 1527
1513 case SelectionRequest: 1528 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1515 break; 1530 break;
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1592 ;
1578 1593
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1595 {
1581 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1597 scrollBar.show (0);
1583 } 1598 }
1584 } 1599 }
1585 break; 1600 break;
1586 1601
… …
1652 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1653 } 1668 }
1654 else 1669 else
1655 { 1670 {
1656 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1657 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1658 } 1673 }
1659 1674
1660 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1661 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1; 1677 + 1;
… …
1674#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1675 } 1690 }
1676#endif 1691#endif
1677 } 1692 }
1678 } 1693 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1695 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1683 ; 1698 ;
1684 1699
1685 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1704 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1706 scrollBar.size ());
1692 want_refresh = 1; 1707 want_refresh = 1;
1693 scrollBar.show (1); 1708 scrollBar.show (1);
1694 } 1709 }
1695 break; 1710 break;
1696 } 1711 }
1697 1712
1698#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1708 }
1709#endif 1716#endif
1710 1717
1711#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1720 {
… …
1724 1731
1725 refresh_check (); 1732 refresh_check ();
1726} 1733}
1727 1734
1728#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1729void 1736void ecb_cold
1730rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1731{ 1738{
1732 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1733 return; 1740 return;
1734 1741
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1743 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1745 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1740 } 1748 }
1741} 1749}
1742#endif 1750#endif
1743 1751
1744void 1752void ecb_cold
1745rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1746{ 1754{
1747 if (!focus) 1755 if (!focus)
1748 { 1756 {
1749 focus = 1; 1757 focus = 1;
1750 want_refresh = 1; 1758 want_refresh = 1;
1751 1759
1752#if USE_XIM 1760#if USE_XIM
1753 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1754 { 1762 {
1755 IMSetPosition (); 1763 im_set_position ();
1756 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1757 } 1765 }
1758#endif 1766#endif
1759#if CURSOR_BLINK 1767#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1774 1782
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1776 } 1784 }
1777} 1785}
1778 1786
1779void 1787void ecb_cold
1780rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1781{ 1789{
1782 if (focus) 1790 if (focus)
1783 { 1791 {
1784 focus = 0; 1792 focus = 0;
… …
1817 1825
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 } 1827 }
1820} 1828}
1821 1829
1822void 1830void ecb_cold
1823rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1824{ 1832{
1825#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1827 { 1835 {
… …
1830 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);
1831 } 1839 }
1832#endif 1840#endif
1833} 1841}
1834 1842
1835#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1836void 1844void ecb_hot
1837rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1838{ 1846{
1839 make_current (); 1847 make_current ();
1840 1848
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return; 1851 return;
1844 1852
1845# if ENABLE_TRANSPARENCY
1846 switch (ev.type) 1853 switch (ev.type)
1847 { 1854 {
1848 case PropertyNotify: 1855 case PropertyNotify:
1849 /* 1856 /*
1850 * 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,
1851 * 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.
1852 */ 1859 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1862 {
1863#if BG_IMAGE_FROM_ROOT
1856 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1857 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1858 } 1870 }
1859 1871
1860 break; 1872 break;
1861 } 1873 }
1862# endif
1863 1874
1864 refresh_check (); 1875 refresh_check ();
1865} 1876}
1866#endif 1877#endif
1867 1878
… …
1991 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 2003 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 2005 direction = DN; /* down */
1995 2006
1996 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1997 /* 2008 /*
1998 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 2010 * move up if mouse is above slider
2000 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
2001 * 2012 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2052#endif
2042 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2043 { 2054 {
2044 if (direction == UP) 2055 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2046 else 2057 else
2047 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2048 } 2059 }
2049 } 2060 }
2050 else 2061 else
2051 switch (ev.button) 2062 switch (ev.button)
2052 { 2063 {
2053 case Button2: 2064 case Button2:
2054 switch (scrollBar.align) 2065 switch (scrollBar.align)
2055 { 2066 {
2056 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2057 csrO = 0; 2068 csrO = 0;
2058 break; 2069 break;
2059 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2072 break;
2062 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2075 break;
2065 } 2076 }
2066 2077
2067 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2082
2072 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2073 break; 2084 break;
2074 2085
2075 case Button1: 2086 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2079 2090
2080 case Button3: 2091 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2093 {
2083 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2086# else 2097# else
2087 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2088# endif 2099# endif
2089 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2092# else 2103# else
2093 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2094# endif 2105# endif
2095 else 2106 else
2096 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2097 } 2108 }
2098 else 2109 else
2099 { 2110 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2112 (nrow
2102 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2114 / scrollBar.size ()));
2104 } 2115 }
2105 2116
2106 break; 2117 break;
2107 } 2118 }
… …
2118 2129
2119 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2131 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2133
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2135 {
2125 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2137 scrollBar.show (0);
2127 } 2138 }
2128 2139
2129#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2180 case Button3: 2191 case Button3:
2181 selection_make (ev.time); 2192 selection_make (ev.time);
2182 break; 2193 break;
2183 2194
2184 case Button2: 2195 case Button2:
2185 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?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2198 break;
2188 2199
2189#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2190 case Button4: 2201 case Button4:
… …
2225 } 2236 }
2226} 2237}
2227 2238
2228/*}}} */ 2239/*}}} */
2229 2240
2230void 2241void ecb_hot
2231rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2232{ 2243{
2233 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2235 2246
2236 for (;;) 2247 for (;;)
2237 { 2248 {
2238 if (expect_false (ch == NOCHAR)) 2249 if (ecb_unlikely (ch == NOCHAR))
2239 { 2250 {
2240 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2252 ch = next_char ();
2242 2253
2243 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2244 break; 2255 break;
2245 } 2256 }
2246 2257
2247 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))
2248 { 2259 {
2249 if (expect_false (!seen_input)) 2260 if (ecb_unlikely (!seen_input))
2250 { 2261 {
2251 seen_input = 1; 2262 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2278 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2280
2270 for (;;) 2281 for (;;)
2271 { 2282 {
2272 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)))
2273 break; 2284 break;
2274 2285
2275 *str++ = ch; 2286 *str++ = ch;
2276 2287
2277 if (expect_false (ch == C0_LF || str >= eol)) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2289 {
2279 if (ch == C0_LF) 2290 if (ch == C0_LF)
2280 nlines++; 2291 nlines++;
2281 2292
2282 refresh_count++; 2293 refresh_count++;
… …
2354 } 2365 }
2355 } 2366 }
2356} 2367}
2357 2368
2358// read the next character 2369// read the next character
2359wchar_t 2370wchar_t ecb_hot
2360rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2361{ 2372{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2374 {
2364 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2367 2378
2368 wchar_t wc; 2379 wchar_t wc;
2369 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);
2370 2381
… …
2376 } 2387 }
2377 2388
2378 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2379 { 2390 {
2380 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.
2381 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
2382 } 2395 }
2383 2396
2384 // assume wchar == unicode 2397 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2388 2401
2389 return NOCHAR; 2402 return NOCHAR;
2390} 2403}
2391 2404
2392// read the next octet 2405// read the next octet
2393uint32_t 2406uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2395{ 2408{
2396 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2411 : NOCHAR;
2399} 2412}
2400 2413
2401static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2402 2415
2403/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2418{
2411 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2412 2420
2413 if (c == NOCHAR) 2421 if (c == NOCHAR)
2414 throw out_of_input; 2422 throw out_of_input;
2415 2423
2416 return c; 2424 return c;
2417} 2425}
2418 2426
2419uint32_t 2427uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2429{
2422 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2423 2431
2424 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2428} 2436}
2429 2437
2430/*{{{ print pipe */ 2438/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2433FILE * 2441FILE * ecb_cold
2434rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2435{ 2443{
2436 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");
2437 2445
2438 if (stream == NULL) 2446 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2448
2441 return stream; 2449 return stream;
2442} 2450}
2443 2451
2444int 2452int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2446{ 2454{
2447 fflush (stream); 2455 fflush (stream);
2448 return pclose (stream); 2456 return pclose (stream);
2449} 2457}
2450 2458
2451/* 2459/*
2452 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2453 */ 2461 */
2454void 2462void ecb_cold
2455rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2456{ 2464{
2457 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2458 2466
2459 if (!fd) 2467 if (!fd)
… …
2505 pclose_printer (fd); 2513 pclose_printer (fd);
2506} 2514}
2507#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2508/*}}} */ 2516/*}}} */
2509 2517
2510/* *INDENT-OFF* */
2511enum { 2518enum {
2512 C1_40 = 0x40, 2519 C1_40 = 0x40,
2513 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,
2514 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,
2515 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,
2516 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,
2517}; 2524};
2518/* *INDENT-ON* */
2519 2525
2520/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2521void 2527void ecb_hot
2522rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2529{
2524 switch (ch) 2530 switch (ch)
2525 { 2531 {
2526 case C0_ESC: 2532 case C0_ESC:
… …
2572} 2578}
2573/*}}} */ 2579/*}}} */
2574 2580
2575 2581
2576/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2577void 2583void ecb_cold
2578rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2579{ 2585{
2580 int row, col; 2586 int row, col;
2581 2587
2582 switch (ch) 2588 switch (ch)
… …
2616 break; 2622 break;
2617 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2625 break;
2620 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2627 priv_modes &= ~PrivMode_vt52;
2622 break; 2628 break;
2623 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2625 /* unimplemented */ 2631 /* unimplemented */
2626 break; 2632 break;
… …
2632} 2638}
2633/*}}} */ 2639/*}}} */
2634 2640
2635 2641
2636/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2637void 2643void ecb_hot
2638rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2639{ 2645{
2640 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2641 2647
2642 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2645 return; 2651 return;
2646 } 2652 }
2647 2653
2648 switch (ch) 2654 switch (ch)
2649 { 2655 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2656 case '#':
2652 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2653 scr_E (); 2658 scr_E ();
2654 break; 2659 break;
2655 case '(': 2660 case '(':
… …
2678#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2679 case '9': 2684 case '9':
2680 scr_forwardindex (); 2685 scr_forwardindex ();
2681 break; 2686 break;
2682#endif 2687#endif
2688 // DECPAM/DECPNM
2683 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2684 case '>': 2692 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2693 priv_modes &= ~PrivMode_aplKP;
2686 break; 2694 break;
2687 2695
2688 case C1_40: 2696 case C1_40:
2689 cmd_getc (); 2697 cmd_getc ();
2690 break; 2698 break;
… …
2694 2702
2695 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2697 { 2705 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2708 }
2701 break; 2709 break;
2702 2710
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2705 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 */
2706 break; 2716 break;
2707 2717
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2715 scr_index (DN); 2725 scr_index (DN);
2716 break; 2726 break;
2717 2727
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2720 2730
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2723 2733
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2736 process_dcs_seq ();
2727 break; 2737 break;
… …
2760 } 2770 }
2761} 2771}
2762/*}}} */ 2772/*}}} */
2763 2773
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2775enum {
2767 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2768 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,
2769 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 ,
2770 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,
… …
2790 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, */
2791 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, */
2792 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, */
2793 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, {, |, }, ~, */
2794 }; 2803 };
2795/* *INDENT-ON* */
2796 2804
2797void 2805void ecb_hot
2798rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2799{ 2807{
2800 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2801 unsigned int nargs, p; 2809 unsigned int nargs, p;
2802 int n, ndef; 2810 int n, ndef;
… …
2880 scr_soft_reset (); 2888 scr_soft_reset ();
2881 2889
2882 static const int pm_h[] = { 7, 25 }; 2890 static const int pm_h[] = { 7, 25 };
2883 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 };
2884 2892
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2895 }
2888 break; 2896 break;
2889 } 2897 }
2890 2898
2891 return; 2899 return;
… …
2909 } 2917 }
2910 break; 2918 break;
2911#endif 2919#endif
2912 2920
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2928 break;
2921 2929
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3110 } 3118 }
3111} 3119}
3112/*}}} */ 3120/*}}} */
3113 3121
3114#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3123void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3125{
3119 int x, y; 3126 int x, y;
3120 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3129 { 3136 {
3130 /* 3137 /*
3131 * commands 3138 * commands
3132 */ 3139 */
3133 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3135 break; 3142 break;
3136 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3145 break;
3139 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3148 break;
3142 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3151 break;
3145 case 5: /* raise window */ 3152 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3147 break; 3154 break;
3148 case 6: /* lower window */ 3155 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3150 break; 3157 break;
3151 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3152 scr_touch (true); 3159 scr_touch (true);
3153 break; 3160 break;
3154 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3157 break; 3164 break;
3158 3165
3159 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3160 default: 3167 default:
3161 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3162 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3163 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3164 break; 3171 break;
3165 3172
3166 /* 3173 /*
3167 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3168 */ 3175 */
3169 case 11: /* report window state */ 3176 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3179 break;
3173 case 13: /* report window position */ 3180 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3186 break;
3180 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3190 break;
3184 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3193 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3196 break;
3190 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3191 { 3198 {
3192 char *s; 3199 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3194 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 */
3195 XFree (s); 3202 XFree (s);
3196 } 3203 }
3197 break; 3204 break;
3198 case 21: /* report window title */ 3205 case 21: /* report window title */
3199 { 3206 {
3200 char *s; 3207 char *s;
3201 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3202 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 */
3203 XFree (s); 3210 XFree (s);
3204 } 3211 }
3205 break; 3212 break;
3206 } 3213 }
… …
3360 unsigned long bytes_after; 3367 unsigned long bytes_after;
3361 unsigned char *value = 0; 3368 unsigned char *value = 0;
3362 const char *str = ""; 3369 const char *str = "";
3363 3370
3364 if (prop 3371 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3376 && actual_type != None
3370 && actual_format == 8) 3377 && actual_format == 8)
… …
3382 { 3389 {
3383 *eq = 0; 3390 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3385 } 3392 }
3386 else 3393 else
3387 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3395 display->atom (str));
3389 } 3396 }
3390 break; 3397 break;
3391 3398
3392 case XTerm_Color: 3399 case XTerm_Color:
… …
3446 break; 3453 break;
3447#endif 3454#endif
3448 case URxvt_Color_border: 3455 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp); 3456 process_color_seq (op, Color_border, str, resp);
3450 break; 3457 break;
3451#if ENABLE_TRANSPARENCY 3458
3459#if BG_IMAGE_FROM_ROOT
3452 case URxvt_Color_tint: 3460 case URxvt_Color_tint:
3453 process_color_seq (op, Color_tint, str, resp); 3461 process_color_seq (op, Color_tint, str, resp);
3454 { 3462 {
3455 bool changed = false; 3463 bool changed = false;
3456 3464
3457 if (ISSET_PIXCOLOR (Color_tint)) 3465 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3466 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3459 3467
3460 if (changed) 3468 if (changed)
3461 update_background (); 3469 update_background ();
3462 } 3470 }
3463 3471
… …
3467#if BG_IMAGE_FROM_FILE 3475#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap: 3476 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?")) 3477 if (!strcmp (str, "?"))
3470 { 3478 {
3471 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;
3472 3484
3473 sprintf (str, "[%dx%d+%d+%d]", 3485 sprintf (str, "[%dx%d+%d+%d]",
3474 min (h_scale, 32767), min (v_scale, 32767), 3486 h_scale, v_scale,
3475 min (h_align, 32767), min (v_align, 32767)); 3487 h_align, v_align);
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3488 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3489 }
3478 else 3490 else
3479 { 3491 {
3480 int changed = 0; 3492 bool changed = false;
3481 3493
3482 if (*str != ';') 3494 if (*str != ';')
3483 { 3495 {
3484 if (bg_set_file (str)) /* change pixmap */ 3496 try
3485 { 3497 {
3498 fimage.set_file_geometry (this, str);
3486 changed++; 3499 changed = true;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else 3500 }
3491 bg_set_geometry (str+1); 3501 catch (const class rxvt_failure_exception &e)
3502 {
3492 } 3503 }
3493 } 3504 }
3494 else 3505 else
3495 { 3506 {
3496 str++; 3507 str++;
3497 if (bg_set_geometry (str, true)) 3508 if (fimage.set_geometry (str, true))
3498 changed++; 3509 changed = true;
3499 } 3510 }
3500 3511
3501 if (changed) 3512 if (changed)
3502 { 3513 {
3503 if (bg_window_position_sensitive ()) 3514 if (bg_window_position_sensitive ())
3504 { 3515 {
3505 int x, y; 3516 int x, y;
3506 get_window_origin (x, y); 3517 get_window_origin (x, y);
3507 bg_set_position (x, y); 3518 parent_x = x;
3519 parent_y = y;
3508 } 3520 }
3509 update_background (); 3521 update_background ();
3510 } 3522 }
3511 } 3523 }
3512 break; 3524 break;
… …
3602 * 's' = save 3614 * 's' = save
3603 * 'r' = restore 3615 * 'r' = restore
3604 * 't' = toggle 3616 * 't' = toggle
3605 * so no need for fancy checking 3617 * so no need for fancy checking
3606 */ 3618 */
3607int 3619int ecb_cold
3608rxvt_term::privcases (int mode, unsigned long bit) 3620rxvt_term::privcases (int mode, unsigned long bit)
3609{ 3621{
3610 int state; 3622 int state;
3611 3623
3612 if (mode == 's') 3624 if (mode == 's')
3613 { 3625 {
3614 SavedModes |= (priv_modes & bit); 3626 if (priv_modes & bit)
3627 SavedModes |= bit;
3628 else
3629 SavedModes &= ~bit;
3615 return -1; 3630 return -1;
3616 } 3631 }
3617 else 3632 else
3618 { 3633 {
3619 if (mode == 'r') 3634 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3635 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3636 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3637 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3638
3624 set_privmode (bit, state); 3639 if (state)
3640 priv_modes |= bit;
3641 else
3642 priv_modes &= ~bit;
3625 } 3643 }
3626 3644
3627 return state; 3645 return state;
3628} 3646}
3629 3647
3630/* we're not using priv _yet_ */ 3648/* we're not using priv _yet_ */
3631void 3649void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3650rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3651{
3634 unsigned int i, j; 3652 unsigned int i, j;
3635 int state; 3653 int state;
3636 3654
3637 static const struct 3655 static const struct
3638 { 3656 {
3639 const int argval; 3657 const int argval;
3640 const unsigned long bit; 3658 const unsigned long bit;
3641 } argtopriv[] = { 3659 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3660 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3661 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3662 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3663 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3664 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3665 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3666 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3667 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3668 { 9, PrivMode_MouseX10 },
3651 // 18 end FF to printer after print screen 3669 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3670 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3671 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3672#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3673 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3674#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3675 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3676 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3677 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3678 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3679 // 45 margin bell NYI
3662 // 46 start logging 3680 // 46 start logging
3663 { 47, PrivMode_Screen }, 3681 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3682 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3683#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3684 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3685#endif
3668 { 1000, PrivMode_MouseX11 }, 3686 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3687 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3716 for (i = 0; i < nargs; i++)
3699 { 3717 {
3700 state = -1; 3718 state = -1;
3701 3719
3702 /* basic handling */ 3720 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3721 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3722 if (argtopriv[j].argval == arg[i])
3705 { 3723 {
3706 state = privcases (mode, argtopriv[j].bit); 3724 state = privcases (mode, argtopriv[j].bit);
3707 break; 3725 break;
3708 } 3726 }
… …
3734 case 2: /* VT52 mode */ 3752 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3753 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3754 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3755 * within VT52 mode
3738 */ 3756 */
3739 set_privmode (PrivMode_vt52, 1); 3757 priv_modes |= PrivMode_vt52;
3740 break; 3758 break;
3741 case 3: /* 80/132 */ 3759 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3760 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3761 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3762 break;
… …
3759 if (state) /* orthogonal */ 3777 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3778 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3779 break;
3762#ifdef scrollBar_esc 3780#ifdef scrollBar_esc
3763 case scrollBar_esc: 3781 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3782 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3783 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3784 scr_touch (true);
3768 }
3769 break; 3785 break;
3770#endif 3786#endif
3771 case 25: /* visible/invisible cursor */ 3787 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3788 scr_cursor_visible (state);
3773 break; 3789 break;
… …
3828 } 3844 }
3829} 3845}
3830/*}}} */ 3846/*}}} */
3831 3847
3832/*{{{ process sgr sequences */ 3848/*{{{ process sgr sequences */
3833void 3849void ecb_hot
3834rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3850rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3835{ 3851{
3836 unsigned int i; 3852 unsigned int i;
3837 short rendset; 3853 short rendset;
3838 int rendstyle; 3854 int rendstyle;
… …
3981 } 3997 }
3982 } 3998 }
3983} 3999}
3984/*}}} */ 4000/*}}} */
3985 4001
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 4002/* ------------------------------------------------------------------------- */
4006 4003
4007/* 4004/*
4008 * Send printf () formatted output to the command. 4005 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 4006 * Only use for small amounts of data.
… …
4037 4034
4038 if (v_buflen == 0) 4035 if (v_buflen == 0)
4039 { 4036 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4037 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4038
4039 max_it (written, 0);
4040
4042 if ((unsigned int)written == len) 4041 if (written == len)
4043 return; 4042 return;
4044 4043
4045 data += written; 4044 data += written;
4046 len -= written; 4045 len -= written;
4047 } 4046 }

Diff Legend

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