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.466 by sf-exg, Sat Dec 18 18:17:38 2010 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
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 949 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 950 scr_touch (false);
985 } 951 }
986#endif 952#endif
987 953
988 if (want_refresh) 954 if (want_refresh)
… …
1025 while (row < end_row); 991 while (row < end_row);
1026 } 992 }
1027 993
1028 scr_refresh (); 994 scr_refresh ();
1029 scrollBar.show (1); 995 scrollBar.show (1);
1030#ifdef USE_XIM 996#if USE_XIM
1031 IMSendSpot (); 997 im_send_spot ();
1032#endif 998#endif
1033 } 999 }
1034 1000
1035 display->flush (); 1001 display->flush ();
1036} 1002}
… …
1054 flush (); 1020 flush ();
1055} 1021}
1056 1022
1057#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1058void 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
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1041{
1061 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1043 want_refresh = 1;
1063 refresh_check (); 1044 refresh_check ();
… …
1081 1062
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1064void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1066{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1069 {
1089 want_refresh = 1; 1070 want_refresh = 1;
1090 refresh_check (); 1071 refresh_check ();
1091 } 1072 }
1092 else 1073 else
… …
1153 { 1134 {
1154 } 1135 }
1155} event_handler; 1136} event_handler;
1156#endif 1137#endif
1157 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
1158bool 1172bool
1159rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1160{ 1174{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1162 1176
1163 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1178
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1166 n = 0;
1167 } 1180 {
1168 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1172 1186
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1188
1175 if (r > 0) 1189 if (r > 0)
1176 { 1190 {
1177 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1178 return true; 1192 return true;
… …
1209 pty_write (); 1223 pty_write ();
1210 1224
1211 refresh_check (); 1225 refresh_check ();
1212} 1226}
1213 1227
1214void 1228void ecb_cold
1215rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1216{ 1230{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1232 recolour_cursor ();
1219 1233
… …
1224 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1225#endif 1239#endif
1226} 1240}
1227 1241
1228#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1229void 1243void ecb_cold
1230rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1231{ 1245{
1232 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1233 return; 1247 return;
1234 1248
… …
1236 XFlush (dpy); 1250 XFlush (dpy);
1237 1251
1238 hidden_pointer = 1; 1252 hidden_pointer = 1;
1239} 1253}
1240 1254
1241void 1255void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1257{
1244 make_current (); 1258 make_current ();
1245 1259
1246 pointer_blank (); 1260 pointer_blank ();
… …
1338 32 + x, 1352 32 + x,
1339 32 + y); 1353 32 + y);
1340} 1354}
1341 1355
1342/*{{{ process an X event */ 1356/*{{{ process an X event */
1343void 1357void ecb_hot
1344rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1345{ 1359{
1346 make_current (); 1360 make_current ();
1347 1361
1348 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1446 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1461 focus_out ();
1448 break; 1462 break;
1449 1463
1450 case ConfigureNotify: 1464 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1452 { 1466 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1468 ;
1455 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1456#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
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)
1459 { 1483 {
1460 int x, y; 1484 int x, y;
1485
1461 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1462 { 1487 {
1463 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1465 } 1490 }
1466 else 1491 else
1467 get_window_origin (x, y); 1492 get_window_origin (x, y);
1468 1493
1469 if (bgPixmap.set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1471 moved = true; 1499 moved = true;
1500 }
1472 } 1501 }
1473#endif
1474 1502
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1476 { 1504 {
1477 seen_resize = 1; 1505 seen_resize = 1;
1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1479 } 1507 }
1480 else 1508 else
1481 { 1509 {
1482#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1483 if (moved) 1511 if (moved)
1484 {
1485 if (mapped)
1486 update_background (); 1512 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif 1513#endif
1491 } 1514 }
1492 1515
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1517 }
1495 break; 1518 break;
1496 1519
1497 case PropertyNotify: 1520 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1522 break;
1504 1523
1505 case SelectionClear: 1524 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break;
1508
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break; 1526 break;
1513 1527
1514 case SelectionRequest: 1528 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1516 break; 1530 break;
… …
1527 * by scheduling background redraw as soon as we can, but giving a short 1541 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive. 1542 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all 1543 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results. 1544 * of ConfigureNotifys for the best results.
1531 */ 1545 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1546 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1547 update_background_ev.start (0.025);
1534#endif 1548#endif
1535 mapped = 1; 1549 mapped = 1;
1536#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1551 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1553 { 1567 {
1554 do 1568 do
1555 { 1569 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1572 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1574
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1576
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1578 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1581 }
1568 1582
1569 want_refresh = 1; 1583 want_refresh = 1;
1570 } 1584 }
1571 else 1585 else
… …
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1592 ;
1579 1593
1580 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1595 {
1582 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1583 scrollBar.show (0); 1597 scrollBar.show (0);
1584 } 1598 }
1585 } 1599 }
1586 break; 1600 break;
1587 1601
… …
1653 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1654 } 1668 }
1655 else 1669 else
1656 { 1670 {
1657 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1658 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1659 } 1673 }
1660 1674
1661 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1662 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1663 + 1; 1677 + 1;
… …
1675#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1676 } 1690 }
1677#endif 1691#endif
1678 } 1692 }
1679 } 1693 }
1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1681 { 1695 {
1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1684 ; 1698 ;
1685 1699
1686 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1687 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1688 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1689 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1690 &unused_mask); 1704 &unused_mask);
1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692 scrollBar.size ()); 1706 scrollBar.size ());
1693 want_refresh = 1; 1707 want_refresh = 1;
1694 scrollBar.show (1); 1708 scrollBar.show (1);
1695 } 1709 }
1696 break; 1710 break;
1697 } 1711 }
1698 1712
1699#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1709 }
1710#endif 1716#endif
1711 1717
1712#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 { 1720 {
… …
1725 1731
1726 refresh_check (); 1732 refresh_check ();
1727} 1733}
1728 1734
1729#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1730void 1736void ecb_cold
1731rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1732{ 1738{
1733 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1734 return; 1740 return;
1735 1741
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1743 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1745 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1741 } 1748 }
1742} 1749}
1743#endif 1750#endif
1744 1751
1745void 1752void ecb_cold
1746rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1747{ 1754{
1748 if (!focus) 1755 if (!focus)
1749 { 1756 {
1750 focus = 1; 1757 focus = 1;
1751 want_refresh = 1; 1758 want_refresh = 1;
1752 1759
1753#if USE_XIM 1760#if USE_XIM
1754 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1755 { 1762 {
1756 IMSetPosition (); 1763 im_set_position ();
1757 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1758 } 1765 }
1759#endif 1766#endif
1760#if CURSOR_BLINK 1767#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1775 1782
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1777 } 1784 }
1778} 1785}
1779 1786
1780void 1787void ecb_cold
1781rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1782{ 1789{
1783 if (focus) 1790 if (focus)
1784 { 1791 {
1785 focus = 0; 1792 focus = 0;
… …
1818 1825
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 } 1827 }
1821} 1828}
1822 1829
1823void 1830void ecb_cold
1824rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1825{ 1832{
1826#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1828 { 1835 {
… …
1832 } 1839 }
1833#endif 1840#endif
1834} 1841}
1835 1842
1836#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1837void 1844void ecb_hot
1838rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1839{ 1846{
1840 make_current (); 1847 make_current ();
1841 1848
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return; 1851 return;
1845 1852
1846# if ENABLE_TRANSPARENCY
1847 switch (ev.type) 1853 switch (ev.type)
1848 { 1854 {
1849 case PropertyNotify: 1855 case PropertyNotify:
1850 /* 1856 /*
1851 * 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,
1852 * 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.
1853 */ 1859 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1862 {
1863# if ENABLE_TRANSPARENCY
1857 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1858 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1859 } 1870 }
1860 1871
1861 break; 1872 break;
1862 } 1873 }
1863# endif
1864 1874
1865 refresh_check (); 1875 refresh_check ();
1866} 1876}
1867#endif 1877#endif
1868 1878
… …
1992 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */ 2003 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */ 2005 direction = DN; /* down */
1996 2006
1997 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1998 /* 2008 /*
1999 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
2000 * move up if mouse is above slider 2010 * move up if mouse is above slider
2001 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
2002 * 2012 *
… …
2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042#endif 2052#endif
2043 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2044 { 2054 {
2045 if (direction == UP) 2055 if (direction == UP)
2046 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2047 else 2057 else
2048 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2049 } 2059 }
2050 } 2060 }
2051 else 2061 else
2052 switch (ev.button) 2062 switch (ev.button)
2053 { 2063 {
2054 case Button2: 2064 case Button2:
2055 switch (scrollBar.align) 2065 switch (scrollBar.align)
2056 { 2066 {
2057 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2058 csrO = 0; 2068 csrO = 0;
2059 break; 2069 break;
2060 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2061 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2062 break; 2072 break;
2063 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2064 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2065 break; 2075 break;
2066 } 2076 }
2067 2077
2068 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2069 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2070 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072 2082
2073 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2074 break; 2084 break;
2075 2085
2076 case Button1: 2086 case Button1:
2077 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2078 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2079 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2080 2090
2081 case Button3: 2091 case Button3:
2082 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2083 { 2093 {
2084 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2085# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2086 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2087# else 2097# else
2088 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2089# endif 2099# endif
2090 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2091# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2092 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2093# else 2103# else
2094 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2095# endif 2105# endif
2096 else 2106 else
2097 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2098 } 2108 }
2099 else 2109 else
2100 { 2110 {
2101 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2102 (nrow 2112 (nrow
2103 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2104 / scrollBar.size ())); 2114 / scrollBar.size ()));
2105 } 2115 }
2106 2116
2107 break; 2117 break;
2108 } 2118 }
… …
2119 2129
2120 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2131 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2133
2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2125 { 2135 {
2126 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2127 scrollBar.show (0); 2137 scrollBar.show (0);
2128 } 2138 }
2129 2139
2130#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2131 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2181 case Button3: 2191 case Button3:
2182 selection_make (ev.time); 2192 selection_make (ev.time);
2183 break; 2193 break;
2184 2194
2185 case Button2: 2195 case Button2:
2186 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?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2198 break;
2189 2199
2190#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2191 case Button4: 2201 case Button4:
… …
2226 } 2236 }
2227} 2237}
2228 2238
2229/*}}} */ 2239/*}}} */
2230 2240
2231void 2241void ecb_hot
2232rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2233{ 2243{
2234 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2236 2246
2237 for (;;) 2247 for (;;)
2238 { 2248 {
2239 if (expect_false (ch == NOCHAR)) 2249 if (ecb_unlikely (ch == NOCHAR))
2240 { 2250 {
2241 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2252 ch = next_char ();
2243 2253
2244 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2245 break; 2255 break;
2246 } 2256 }
2247 2257
2248 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))
2249 { 2259 {
2250 if (expect_false (!seen_input)) 2260 if (ecb_unlikely (!seen_input))
2251 { 2261 {
2252 seen_input = 1; 2262 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2278 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2280
2271 for (;;) 2281 for (;;)
2272 { 2282 {
2273 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)))
2274 break; 2284 break;
2275 2285
2276 *str++ = ch; 2286 *str++ = ch;
2277 2287
2278 if (expect_false (ch == C0_LF || str >= eol)) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2289 {
2280 if (ch == C0_LF) 2290 if (ch == C0_LF)
2281 nlines++; 2291 nlines++;
2282 2292
2283 refresh_count++; 2293 refresh_count++;
… …
2355 } 2365 }
2356 } 2366 }
2357} 2367}
2358 2368
2359// read the next character 2369// read the next character
2360wchar_t 2370wchar_t ecb_hot
2361rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2362{ 2372{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2374 {
2365 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2367 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2368 2378
2369 wchar_t wc; 2379 wchar_t wc;
2370 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);
2371 2381
… …
2377 } 2387 }
2378 2388
2379 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2380 { 2390 {
2381 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.
2382 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
2383 } 2395 }
2384 2396
2385 // assume wchar == unicode 2397 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2389 2401
2390 return NOCHAR; 2402 return NOCHAR;
2391} 2403}
2392 2404
2393// read the next octet 2405// read the next octet
2394uint32_t 2406uint32_t ecb_hot
2395rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2396{ 2408{
2397 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR; 2411 : NOCHAR;
2400} 2412}
2401 2413
2402static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2403 2415
2404/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2418{
2412 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2413 2420
2414 if (c == NOCHAR) 2421 if (c == NOCHAR)
2415 throw out_of_input; 2422 throw out_of_input;
2416 2423
2417 return c; 2424 return c;
2418} 2425}
2419 2426
2420uint32_t 2427uint32_t ecb_hot
2421rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2422{ 2429{
2423 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2424 2431
2425 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2429} 2436}
2430 2437
2431/*{{{ print pipe */ 2438/*{{{ print pipe */
2432/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2434FILE * 2441FILE * ecb_cold
2435rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2436{ 2443{
2437 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");
2438 2445
2439 if (stream == NULL) 2446 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2448
2442 return stream; 2449 return stream;
2443} 2450}
2444 2451
2445int 2452int ecb_cold
2446rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2447{ 2454{
2448 fflush (stream); 2455 fflush (stream);
2449 return pclose (stream); 2456 return pclose (stream);
2450} 2457}
2451 2458
2452/* 2459/*
2453 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2454 */ 2461 */
2455void 2462void ecb_cold
2456rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2457{ 2464{
2458 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2459 2466
2460 if (!fd) 2467 if (!fd)
… …
2506 pclose_printer (fd); 2513 pclose_printer (fd);
2507} 2514}
2508#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2509/*}}} */ 2516/*}}} */
2510 2517
2511/* *INDENT-OFF* */
2512enum { 2518enum {
2513 C1_40 = 0x40, 2519 C1_40 = 0x40,
2514 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,
2515 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,
2516 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,
2517 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,
2518}; 2524};
2519/* *INDENT-ON* */
2520 2525
2521/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2522void 2527void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2529{
2525 switch (ch) 2530 switch (ch)
2526 { 2531 {
2527 case C0_ESC: 2532 case C0_ESC:
… …
2573} 2578}
2574/*}}} */ 2579/*}}} */
2575 2580
2576 2581
2577/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2578void 2583void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2585{
2581 int row, col; 2586 int row, col;
2582 2587
2583 switch (ch) 2588 switch (ch)
… …
2617 break; 2622 break;
2618 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2625 break;
2621 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2622 set_privmode (PrivMode_vt52, 0); 2627 priv_modes &= ~PrivMode_vt52;
2623 break; 2628 break;
2624 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2626 /* unimplemented */ 2631 /* unimplemented */
2627 break; 2632 break;
… …
2633} 2638}
2634/*}}} */ 2639/*}}} */
2635 2640
2636 2641
2637/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2638void 2643void ecb_hot
2639rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2640{ 2645{
2641 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2642 2647
2643 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2651 return;
2647 } 2652 }
2648 2653
2649 switch (ch) 2654 switch (ch)
2650 { 2655 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2656 case '#':
2653 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2654 scr_E (); 2658 scr_E ();
2655 break; 2659 break;
2656 case '(': 2660 case '(':
… …
2679#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2680 case '9': 2684 case '9':
2681 scr_forwardindex (); 2685 scr_forwardindex ();
2682 break; 2686 break;
2683#endif 2687#endif
2688 // DECPAM/DECPNM
2684 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2685 case '>': 2692 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2693 priv_modes &= ~PrivMode_aplKP;
2687 break; 2694 break;
2688 2695
2689 case C1_40: 2696 case C1_40:
2690 cmd_getc (); 2697 cmd_getc ();
2691 break; 2698 break;
… …
2695 2702
2696 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2698 { 2705 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2708 }
2702 break; 2709 break;
2703 2710
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2706 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 */
2707 break; 2716 break;
2708 2717
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2716 scr_index (DN); 2725 scr_index (DN);
2717 break; 2726 break;
2718 2727
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2721 2730
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2724 2733
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2736 process_dcs_seq ();
2728 break; 2737 break;
… …
2761 } 2770 }
2762} 2771}
2763/*}}} */ 2772/*}}} */
2764 2773
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2775enum {
2768 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2769 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,
2770 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 ,
2771 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,
… …
2791 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, */
2792 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, */
2793 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, */
2794 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, {, |, }, ~, */
2795 }; 2803 };
2796/* *INDENT-ON* */
2797 2804
2798void 2805void ecb_hot
2799rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2800{ 2807{
2801 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2809 unsigned int nargs, p;
2803 int n, ndef; 2810 int n, ndef;
… …
2881 scr_soft_reset (); 2888 scr_soft_reset ();
2882 2889
2883 static const int pm_h[] = { 7, 25 }; 2890 static const int pm_h[] = { 7, 25 };
2884 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 };
2885 2892
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2895 }
2889 break; 2896 break;
2890 } 2897 }
2891 2898
2892 return; 2899 return;
… …
2910 } 2917 }
2911 break; 2918 break;
2912#endif 2919#endif
2913 2920
2914 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2915 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2916 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2917 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2918 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2920 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2921 break; 2928 break;
2922 2929
2923 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2924 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3111 } 3118 }
3112} 3119}
3113/*}}} */ 3120/*}}} */
3114 3121
3115#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3123void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3125{
3120 int x, y; 3126 int x, y;
3121 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3130 { 3136 {
3131 /* 3137 /*
3132 * commands 3138 * commands
3133 */ 3139 */
3134 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3136 break; 3142 break;
3137 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3145 break;
3140 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3148 break;
3143 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3151 break;
3146 case 5: /* raise window */ 3152 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3148 break; 3154 break;
3149 case 6: /* lower window */ 3155 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3151 break; 3157 break;
3152 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3153 scr_touch (true); 3159 scr_touch (true);
3154 break; 3160 break;
3155 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3158 break; 3164 break;
3159 3165
3160 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3161 default: 3167 default:
3162 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3163 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3164 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3165 break; 3171 break;
3166 3172
3167 /* 3173 /*
3168 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3169 */ 3175 */
3170 case 11: /* report window state */ 3176 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3179 break;
3174 case 13: /* report window position */ 3180 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3186 break;
3181 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3190 break;
3185 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3193 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3196 break;
3191 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3192 { 3198 {
3193 char *s; 3199 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3195 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 */
3196 XFree (s); 3202 XFree (s);
3197 } 3203 }
3198 break; 3204 break;
3199 case 21: /* report window title */ 3205 case 21: /* report window title */
3200 { 3206 {
3201 char *s; 3207 char *s;
3202 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3203 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 */
3204 XFree (s); 3210 XFree (s);
3205 } 3211 }
3206 break; 3212 break;
3207 } 3213 }
… …
3361 unsigned long bytes_after; 3367 unsigned long bytes_after;
3362 unsigned char *value = 0; 3368 unsigned char *value = 0;
3363 const char *str = ""; 3369 const char *str = "";
3364 3370
3365 if (prop 3371 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3376 && actual_type != None
3371 && actual_format == 8) 3377 && actual_format == 8)
… …
3383 { 3389 {
3384 *eq = 0; 3390 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3386 } 3392 }
3387 else 3393 else
3388 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3395 display->atom (str));
3390 } 3396 }
3391 break; 3397 break;
3392 3398
3393 case XTerm_Color: 3399 case XTerm_Color:
… …
3454 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3455 { 3461 {
3456 bool changed = false; 3462 bool changed = false;
3457 3463
3458 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3466
3463 if (changed) 3467 if (changed)
3464 update_background (); 3468 update_background ();
3465 } 3469 }
3466 3470
… …
3470#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3471 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3473 { 3477 {
3474 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;
3475 3483
3476 sprintf (str, "[%dx%d+%d+%d]", 3484 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3485 h_scale, v_scale,
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3486 h_align, v_align);
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3488 }
3481 else 3489 else
3482 { 3490 {
3483 int changed = 0; 3491 bool changed = false;
3484 3492
3485 if (*str != ';') 3493 if (*str != ';')
3486 { 3494 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3495 try
3488 { 3496 {
3497 fimage.set_file_geometry (this, str);
3489 changed++; 3498 changed = true;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else 3499 }
3494 bgPixmap.set_geometry (str+1); 3500 catch (const class rxvt_failure_exception &e)
3501 {
3495 } 3502 }
3496 } 3503 }
3497 else 3504 else
3498 { 3505 {
3499 str++; 3506 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3507 if (fimage.set_geometry (str, true))
3501 changed++; 3508 changed = true;
3502 } 3509 }
3503 3510
3504 if (changed) 3511 if (changed)
3505 { 3512 {
3506 if (bgPixmap.window_position_sensitive ()) 3513 if (bg_window_position_sensitive ())
3507 { 3514 {
3508 int x, y; 3515 int x, y;
3509 get_window_origin (x, y); 3516 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3517 parent_x = x;
3518 parent_y = y;
3511 } 3519 }
3512 update_background (); 3520 update_background ();
3513 } 3521 }
3514 } 3522 }
3515 break; 3523 break;
… …
3605 * 's' = save 3613 * 's' = save
3606 * 'r' = restore 3614 * 'r' = restore
3607 * 't' = toggle 3615 * 't' = toggle
3608 * so no need for fancy checking 3616 * so no need for fancy checking
3609 */ 3617 */
3610int 3618int ecb_cold
3611rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3612{ 3620{
3613 int state; 3621 int state;
3614 3622
3615 if (mode == 's') 3623 if (mode == 's')
3616 { 3624 {
3617 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3618 return -1; 3629 return -1;
3619 } 3630 }
3620 else 3631 else
3621 { 3632 {
3622 if (mode == 'r') 3633 if (mode == 'r')
3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3624 else 3635 else
3625 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626 3637
3627 set_privmode (bit, state); 3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3628 } 3642 }
3629 3643
3630 return state; 3644 return state;
3631} 3645}
3632 3646
3633/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3634void 3648void
3635rxvt_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)
3636{ 3650{
3637 unsigned int i, j; 3651 unsigned int i, j;
3638 int state; 3652 int state;
3639 3653
3640 static const struct 3654 static const struct
3641 { 3655 {
3642 const int argval; 3656 const int argval;
3643 const unsigned long bit; 3657 const unsigned long bit;
3644 } argtopriv[] = { 3658 } argtopriv[] = {
3645 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3646 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3647 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3648 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3649 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3650 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3651 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3652 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3653 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3654 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region 3669 // 19 Print screen prints full screen/scroll region
3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3658 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3659#endif 3673#endif
3660 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3662 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3663 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3664 // 45 margin bell NYI 3678 // 45 margin bell NYI
3665 // 46 start logging 3679 // 46 start logging
3666 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3668#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3669 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3670#endif 3684#endif
3671 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3672 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
… …
3701 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3702 { 3716 {
3703 state = -1; 3717 state = -1;
3704 3718
3705 /* basic handling */ 3719 /* basic handling */
3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3708 { 3722 {
3709 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3710 break; 3724 break;
3711 } 3725 }
… …
3737 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3738 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3739 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3740 * within VT52 mode 3754 * within VT52 mode
3741 */ 3755 */
3742 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3743 break; 3757 break;
3744 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3745 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3747 break; 3761 break;
… …
3762 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3778 break;
3765#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3766 case scrollBar_esc: 3780 case scrollBar_esc:
3767 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3768 {
3769 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3770 scr_touch (true); 3783 scr_touch (true);
3771 }
3772 break; 3784 break;
3773#endif 3785#endif
3774 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3775 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3776 break; 3788 break;
… …
3831 } 3843 }
3832} 3844}
3833/*}}} */ 3845/*}}} */
3834 3846
3835/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3836void 3848void ecb_hot
3837rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3838{ 3850{
3839 unsigned int i; 3851 unsigned int i;
3840 short rendset; 3852 short rendset;
3841 int rendstyle; 3853 int rendstyle;
… …
3984 } 3996 }
3985 } 3997 }
3986} 3998}
3987/*}}} */ 3999/*}}} */
3988 4000
3989/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3990void
3991rxvt_term::process_graphics ()
3992{
3993 unicode_t ch, cmd = cmd_getc ();
3994
3995 if (cmd == 'Q')
3996 {
3997 /* query graphics */
3998 tt_printf ("\033G0\012"); /* no graphics */
3999 return;
4000 }
4001 /* swallow other graphics sequences until terminating ':' */
4002 do
4003 ch = cmd_getc ();
4004 while (ch != ':');
4005}
4006/*}}} */
4007
4008/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4009 4002
4010/* 4003/*
4011 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4012 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4040 4033
4041 if (v_buflen == 0) 4034 if (v_buflen == 0)
4042 { 4035 {
4043 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));
4044 4037
4038 max_it (written, 0);
4039
4045 if ((unsigned int)written == len) 4040 if (written == len)
4046 return; 4041 return;
4047 4042
4048 data += written; 4043 data += written;
4049 len -= written; 4044 len -= written;
4050 } 4045 }
4051 4046
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 4048
4054 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4050 v_buflen += len;
4056 4051
4057 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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