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.434 by sf-exg, Wed Jan 6 10:29:14 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 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 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",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 400 break;
394 } 401 }
395 return param; 402 return param;
396} 403}
397 404
398void 405void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
400{ 407{
401 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
402 KeySym keysym; 409 KeySym keysym;
403 int valid_keysym; 410 int valid_keysym;
… …
416 */ 423 */
417 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
420 427
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
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
… …
505#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 508#else
508 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
509#endif 510#endif
511 max_it (lnsppg, 1);
512
510 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
511 { 514 {
512 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
513 return; 516 return;
514 } 517 }
… …
567 selection_request (ev.time); 570 selection_request (ev.time);
568 return; 571 return;
569#if TODO 572#if TODO
570 /* rxvt extras */ 573 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 575 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 577 return;
577#endif 578#endif
578 } 579 }
579 } 580 }
580 } 581 }
… …
619 scr_overlay_off (); 620 scr_overlay_off ();
620# endif 621# endif
621 iso14755buf = 0; 622 iso14755buf = 0;
622 } 623 }
623 } 624 }
625 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
627 { 629 {
628 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 631# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 647 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 649 unsigned int newlen = 1;
648 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
649 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
650 { 657 {
651#ifndef NO_BACKSPACE_KEY 658#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 659 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 660 if (priv_modes & PrivMode_HaveBackSpace)
654 { 661 {
… …
773 } 780 }
774 781
775 if (newlen) 782 if (newlen)
776 len = strlen (kbuf); 783 len = strlen (kbuf);
777 784
785 if (len > 0)
786 {
778 /* 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 /*
779 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
780 */ 801 */
781#ifdef META8_OPTION 802#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
784#endif 805#endif
806 }
785 807
786 } 808 }
787 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
788 { 810 {
789 len = 1; 811 len = 1;
… …
823 { 845 {
824 view_start = 0; 846 view_start = 0;
825 want_refresh = 1; 847 want_refresh = 1;
826 } 848 }
827 849
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */ 850 /* escape prefix */
843 if (meta 851 if (meta
844#ifdef META8_OPTION 852#ifdef META8_OPTION
845 && meta_char == C0_ESC 853 && meta_char == C0_ESC
846#endif 854#endif
… …
851 } 859 }
852 860
853 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
854} 862}
855 863
856void 864void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
858{ 866{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 868 KeySym keysym;
861 869
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
930#endif 938#endif
931} 939}
932 940
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 941void
967rxvt_term::flush () 942rxvt_term::flush ()
968{ 943{
969 flush_ev.stop (); 944 flush_ev.stop ();
970 945
971#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
973 { 948 {
974// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 950 scr_touch (false);
976 } 951 }
977#endif 952#endif
978 953
979 if (want_refresh) 954 if (want_refresh)
… …
1016 while (row < end_row); 991 while (row < end_row);
1017 } 992 }
1018 993
1019 scr_refresh (); 994 scr_refresh ();
1020 scrollBar.show (1); 995 scrollBar.show (1);
1021#ifdef USE_XIM 996#if USE_XIM
1022 IMSendSpot (); 997 im_send_spot ();
1023#endif 998#endif
1024 } 999 }
1025 1000
1026 display->flush (); 1001 display->flush ();
1027} 1002}
1028 1003
1029/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1030void 1005void
1031rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1032{ 1007{
1033 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1019 refresh_count = 0;
1045 flush (); 1020 flush ();
1046} 1021}
1047 1022
1048#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1049void 1039void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1041{
1052 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1043 want_refresh = 1;
… …
1072 1062
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1064void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1066{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1069 {
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 refresh_check (); 1071 refresh_check ();
1082 } 1072 }
1083 else 1073 else
… …
1128 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1122 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1123 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1124 // we just nanosleep a bit and hope for the best.
1135 1125
1136 struct timespec ts = { 0, 1000 }; 1126 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1138 1128
… …
1144 { 1134 {
1145 } 1135 }
1146} event_handler; 1136} event_handler;
1147#endif 1137#endif
1148 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
1149bool 1172bool
1150rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1151{ 1174{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1153 1176
1154 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1178
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1157 n = 0;
1158 } 1180 {
1159 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1163 1186
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1188
1166 if (r > 0) 1189 if (r > 0)
1167 { 1190 {
1168 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1169 return true; 1192 return true;
… …
1200 pty_write (); 1223 pty_write ();
1201 1224
1202 refresh_check (); 1225 refresh_check ();
1203} 1226}
1204 1227
1205void 1228void ecb_cold
1206rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1207{ 1230{
1208 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor (); 1232 recolour_cursor ();
1210 1233
… …
1215 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1216#endif 1239#endif
1217} 1240}
1218 1241
1219#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1220void 1243void ecb_cold
1221rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1222{ 1245{
1223 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1224 return; 1247 return;
1225 1248
… …
1227 XFlush (dpy); 1250 XFlush (dpy);
1228 1251
1229 hidden_pointer = 1; 1252 hidden_pointer = 1;
1230} 1253}
1231 1254
1232void 1255void ecb_cold
1233rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1234{ 1257{
1235 make_current (); 1258 make_current ();
1236 1259
1237 pointer_blank (); 1260 pointer_blank ();
… …
1243{ 1266{
1244 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1245 int x, y; 1268 int x, y;
1246 int code = 32; 1269 int code = 32;
1247 1270
1248 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1250 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1251 { 1275 {
1252 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1253 return; 1277 return;
1278
1254 mouse_row = x; 1279 mouse_row = x;
1255 mouse_col = y; 1280 mouse_col = y;
1256 code += 32; 1281 code += 32;
1257 } 1282 }
1258 1283
… …
1261 else 1286 else
1262 { 1287 {
1263 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1290 if (button_number >= 3)
1266 button_number += (64 - 3); 1291 button_number += 64 - 3;
1267 } 1292 }
1268 1293
1269 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1270 { 1295 {
1271 /* 1296 /*
… …
1303 fputc ('A', stderr); 1328 fputc ('A', stderr);
1304 if (key_state & 32) 1329 if (key_state & 32)
1305 fputc ('2', stderr); 1330 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1332 button_number,
1308 x + 1, 1333 x,
1309 y + 1); 1334 y);
1310#endif 1335#endif
1311 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1312 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1351 code + button_number + key_state,
1314 (32 + x + 1), 1352 32 + x,
1315 (32 + y + 1)); 1353 32 + y);
1316} 1354}
1317 1355
1318/*{{{ process an X event */ 1356/*{{{ process an X event */
1319void 1357void ecb_hot
1320rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1321{ 1359{
1322 make_current (); 1360 make_current ();
1323 1361
1324 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1422 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1461 focus_out ();
1424 break; 1462 break;
1425 1463
1426 case ConfigureNotify: 1464 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1431 { 1466 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
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)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1434 1502
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1504 {
1437 seen_resize = 1; 1505 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1507 }
1440 else 1508 else
1441 { 1509 {
1442#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1511 if (moved)
1446 update_background (); 1512 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1513#endif
1451 } 1514 }
1452 1515
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1517 }
1455 break; 1518 break;
1456 1519
1457 case PropertyNotify: 1520 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1522 break;
1464 1523
1465 case SelectionClear: 1524 case SelectionClear:
1466 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1526 break;
1473 1527
1474 case SelectionRequest: 1528 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1476 break; 1530 break;
1477 1531
1478 case MapNotify: 1532 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1534 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1535 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1538 * reparenting.
1485 * We should not render background immidiately, as there could be several 1539 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * 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
1488 * bit of time for ConfigureNotifies to arrive. 1542 * bit of time for ConfigureNotifies to arrive.
1489 * 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
1490 * of ConfigureNotifys for the best results. 1544 * of ConfigureNotifys for the best results.
1491 */ 1545 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1546 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1547 update_background_ev.start (0.025);
1494#endif 1548#endif
1495 mapped = 1; 1549 mapped = 1;
1496#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1551 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1513 { 1567 {
1514 do 1568 do
1515 { 1569 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1572 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1574
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1576
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1578 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1581 }
1528 1582
1529 want_refresh = 1; 1583 want_refresh = 1;
1530 } 1584 }
1531 else 1585 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1592 ;
1539 1593
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1595 {
1542 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1597 scrollBar.show (0);
1544 } 1598 }
1545 } 1599 }
1546 break; 1600 break;
1547 1601
… …
1613 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1614 } 1668 }
1615 else 1669 else
1616 { 1670 {
1617 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1673 }
1620 1674
1621 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1677 + 1;
… …
1635#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1636 } 1690 }
1637#endif 1691#endif
1638 } 1692 }
1639 } 1693 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1695 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1644 ; 1698 ;
1645 1699
1646 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1704 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1706 scrollBar.size ());
1653 want_refresh = 1; 1707 want_refresh = 1;
1654 scrollBar.show (1); 1708 scrollBar.show (1);
1655 } 1709 }
1656 break; 1710 break;
1657 } 1711 }
1658 1712
1659#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1669 }
1670#endif 1716#endif
1671 1717
1672#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1720 {
… …
1685 1731
1686 refresh_check (); 1732 refresh_check ();
1687} 1733}
1688 1734
1689#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1690void 1736void ecb_cold
1691rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1692{ 1738{
1693 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1694 return; 1740 return;
1695 1741
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1743 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1745 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1701 } 1748 }
1702} 1749}
1703#endif 1750#endif
1704 1751
1705void 1752void ecb_cold
1706rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1707{ 1754{
1708 if (!focus) 1755 if (!focus)
1709 { 1756 {
1710 focus = 1; 1757 focus = 1;
1711 want_refresh = 1; 1758 want_refresh = 1;
1712 1759
1713#if USE_XIM 1760#if USE_XIM
1714 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1715 { 1762 {
1716 IMSetPosition (); 1763 im_set_position ();
1717 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1718 } 1765 }
1719#endif 1766#endif
1720#if CURSOR_BLINK 1767#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1735 1782
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1737 } 1784 }
1738} 1785}
1739 1786
1740void 1787void ecb_cold
1741rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1742{ 1789{
1743 if (focus) 1790 if (focus)
1744 { 1791 {
1745 focus = 0; 1792 focus = 0;
… …
1778 1825
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780 } 1827 }
1781} 1828}
1782 1829
1783void 1830void ecb_cold
1784rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1785{ 1832{
1786#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1787 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1788 { 1835 {
… …
1792 } 1839 }
1793#endif 1840#endif
1794} 1841}
1795 1842
1796#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1797void 1844void ecb_hot
1798rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1799{ 1846{
1800 make_current (); 1847 make_current ();
1801 1848
1802 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1803 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1804 return; 1851 return;
1805 1852
1806# if ENABLE_TRANSPARENCY
1807 switch (ev.type) 1853 switch (ev.type)
1808 { 1854 {
1809 case PropertyNotify: 1855 case PropertyNotify:
1810 /* 1856 /*
1811 * 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,
1812 * 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.
1813 */ 1859 */
1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816 { 1862 {
1863# if ENABLE_TRANSPARENCY
1817 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1818 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1819 } 1870 }
1820 1871
1821 break; 1872 break;
1822 } 1873 }
1823# endif
1824 1874
1825 refresh_check (); 1875 refresh_check ();
1826} 1876}
1827#endif 1877#endif
1828 1878
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1865 { 1915 {
1866 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1867 MEvent.clicks++; 1917 MEvent.clicks++;
1868 1918
1869 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1870 { 1920 {
1871 /* only report double clicks */ 1921 /* only report double clicks */
… …
1952 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */ 2003 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */ 2005 direction = DN; /* down */
1956 2006
1957 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1958 /* 2008 /*
1959 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 2010 * move up if mouse is above slider
1961 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1962 * 2012 *
… …
2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2002#endif 2052#endif
2003 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2004 { 2054 {
2005 if (direction == UP) 2055 if (direction == UP)
2006 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2007 else 2057 else
2008 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2009 } 2059 }
2010 } 2060 }
2011 else 2061 else
2012 switch (ev.button) 2062 switch (ev.button)
2013 { 2063 {
2014 case Button2: 2064 case Button2:
2015 switch (scrollBar.align) 2065 switch (scrollBar.align)
2016 { 2066 {
2017 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2018 csrO = 0; 2068 csrO = 0;
2019 break; 2069 break;
2020 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2021 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2022 break; 2072 break;
2023 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2024 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2025 break; 2075 break;
2026 } 2076 }
2027 2077
2028 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2029 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2030 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2032 2082
2033 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2034 break; 2084 break;
2035 2085
2036 case Button1: 2086 case Button1:
2037 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2038 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2039 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2040 2090
2041 case Button3: 2091 case Button3:
2042 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2043 { 2093 {
2044 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2045# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2046 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2047# else 2097# else
2048 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2049# endif 2099# endif
2050 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2052 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2053# else 2103# else
2054 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2055# endif 2105# endif
2056 else 2106 else
2057 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2058 } 2108 }
2059 else 2109 else
2060 { 2110 {
2061 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2062 (nrow 2112 (nrow
2063 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2064 / scrollBar.size ())); 2114 / scrollBar.size ()));
2065 } 2115 }
2066 2116
2067 break; 2117 break;
2068 } 2118 }
… …
2079 2129
2080 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2081 if (!bypass_keystate) 2131 if (!bypass_keystate)
2082 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2083 2133
2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2085 { 2135 {
2086 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2087 scrollBar.show (0); 2137 scrollBar.show (0);
2088 } 2138 }
2089 2139
2090#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2091 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2141 case Button3: 2191 case Button3:
2142 selection_make (ev.time); 2192 selection_make (ev.time);
2143 break; 2193 break;
2144 2194
2145 case Button2: 2195 case Button2:
2146 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?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2198 break;
2149 2199
2150#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2151 case Button4: 2201 case Button4:
2152 case Button5: 2202 case Button5:
… …
2186 } 2236 }
2187} 2237}
2188 2238
2189/*}}} */ 2239/*}}} */
2190 2240
2191void 2241void ecb_hot
2192rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2193{ 2243{
2194 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2196 2246
2197 for (;;) 2247 for (;;)
2198 { 2248 {
2199 if (expect_false (ch == NOCHAR)) 2249 if (ecb_unlikely (ch == NOCHAR))
2200 { 2250 {
2201 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2252 ch = next_char ();
2203 2253
2204 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2205 break; 2255 break;
2206 } 2256 }
2207 2257
2208 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))
2209 { 2259 {
2210 if (expect_false (!seen_input)) 2260 if (ecb_unlikely (!seen_input))
2211 { 2261 {
2212 seen_input = 1; 2262 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2278 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2280
2231 for (;;) 2281 for (;;)
2232 { 2282 {
2233 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)))
2234 break; 2284 break;
2235 2285
2236 *str++ = ch; 2286 *str++ = ch;
2237 2287
2238 if (expect_false (ch == C0_LF || str >= eol)) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2289 {
2240 if (ch == C0_LF) 2290 if (ch == C0_LF)
2241 nlines++; 2291 nlines++;
2242 2292
2243 refresh_count++; 2293 refresh_count++;
… …
2315 } 2365 }
2316 } 2366 }
2317} 2367}
2318 2368
2319// read the next character 2369// read the next character
2320wchar_t 2370wchar_t ecb_hot
2321rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2322{ 2372{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2374 {
2325 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2328 2378
2329 wchar_t wc; 2379 wchar_t wc;
2330 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);
2331 2381
… …
2337 } 2387 }
2338 2388
2339 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2340 { 2390 {
2341 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.
2342 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
2343 } 2395 }
2344 2396
2345 // assume wchar == unicode 2397 // assume wchar == unicode
2346 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2349 2401
2350 return NOCHAR; 2402 return NOCHAR;
2351} 2403}
2352 2404
2353// read the next octet 2405// read the next octet
2354uint32_t 2406uint32_t ecb_hot
2355rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2356{ 2408{
2357 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2358 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2359 : NOCHAR; 2411 : NOCHAR;
2360} 2412}
2361 2413
2362static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2363 2415
2364/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2365/*
2366 * Return the next input character after first passing any keyboard input
2367 * to the command.
2368 */
2369wchar_t
2370rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2371{ 2418{
2372 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2373 2420
2374 if (c == NOCHAR) 2421 if (c == NOCHAR)
2375 throw out_of_input; 2422 throw out_of_input;
2376 2423
2377 return c; 2424 return c;
2378} 2425}
2379 2426
2380uint32_t 2427uint32_t ecb_hot
2381rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2382{ 2429{
2383 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2384 2431
2385 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2389} 2436}
2390 2437
2391/*{{{ print pipe */ 2438/*{{{ print pipe */
2392/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2393#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2394FILE * 2441FILE * ecb_cold
2395rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2396{ 2443{
2397 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");
2398 2445
2399 if (stream == NULL) 2446 if (stream == NULL)
2400 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2401 2448
2402 return stream; 2449 return stream;
2403} 2450}
2404 2451
2405int 2452int ecb_cold
2406rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2407{ 2454{
2408 fflush (stream); 2455 fflush (stream);
2409 return pclose (stream); 2456 return pclose (stream);
2410} 2457}
2411 2458
2412/* 2459/*
2413 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2414 */ 2461 */
2415void 2462void ecb_cold
2416rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2417{ 2464{
2418 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2419 2466
2420 if (!fd) 2467 if (!fd)
… …
2466 pclose_printer (fd); 2513 pclose_printer (fd);
2467} 2514}
2468#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2469/*}}} */ 2516/*}}} */
2470 2517
2471/* *INDENT-OFF* */
2472enum { 2518enum {
2473 C1_40 = 0x40, 2519 C1_40 = 0x40,
2474 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,
2475 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,
2476 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,
2477 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,
2478}; 2524};
2479/* *INDENT-ON* */
2480 2525
2481/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2482void 2527void ecb_hot
2483rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2529{
2485 switch (ch) 2530 switch (ch)
2486 { 2531 {
2487 case C0_ESC: 2532 case C0_ESC:
… …
2533} 2578}
2534/*}}} */ 2579/*}}} */
2535 2580
2536 2581
2537/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2538void 2583void ecb_cold
2539rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2540{ 2585{
2541 int row, col; 2586 int row, col;
2542 2587
2543 switch (ch) 2588 switch (ch)
… …
2577 break; 2622 break;
2578 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2625 break;
2581 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2582 set_privmode (PrivMode_vt52, 0); 2627 priv_modes &= ~PrivMode_vt52;
2583 break; 2628 break;
2584 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2586 /* unimplemented */ 2631 /* unimplemented */
2587 break; 2632 break;
… …
2593} 2638}
2594/*}}} */ 2639/*}}} */
2595 2640
2596 2641
2597/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2598void 2643void ecb_hot
2599rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2600{ 2645{
2601 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2602 2647
2603 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2606 return; 2651 return;
2607 } 2652 }
2608 2653
2609 switch (ch) 2654 switch (ch)
2610 { 2655 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2656 case '#':
2613 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2614 scr_E (); 2658 scr_E ();
2615 break; 2659 break;
2616 case '(': 2660 case '(':
… …
2639#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2640 case '9': 2684 case '9':
2641 scr_forwardindex (); 2685 scr_forwardindex ();
2642 break; 2686 break;
2643#endif 2687#endif
2688 // DECPAM/DECPNM
2644 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2645 case '>': 2692 case '>':
2646 set_privmode (PrivMode_aplKP, ch == '='); 2693 priv_modes &= ~PrivMode_aplKP;
2647 break; 2694 break;
2648 2695
2649 case C1_40: 2696 case C1_40:
2650 cmd_getc (); 2697 cmd_getc ();
2651 break; 2698 break;
… …
2655 2702
2656 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2658 { 2705 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2708 }
2662 break; 2709 break;
2663 2710
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2666 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 */
2667 break; 2716 break;
2668 2717
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2675 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2676 scr_index (DN); 2725 scr_index (DN);
2677 break; 2726 break;
2678 2727
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2681 2730
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2684 2733
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2736 process_dcs_seq ();
2688 break; 2737 break;
… …
2721 } 2770 }
2722} 2771}
2723/*}}} */ 2772/*}}} */
2724 2773
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2775enum {
2728 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2729 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,
2730 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 ,
2731 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,
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2785};
2738 2786
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2792
2745const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2746 { 2794 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751 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, */
2752 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, */
2753 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, */
2754 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, {, |, }, ~, */
2755 }; 2803 };
2756/* *INDENT-ON* */
2757 2804
2758void 2805void ecb_hot
2759rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2760{ 2807{
2761 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2762 unsigned int nargs, p; 2809 unsigned int nargs, p;
2763 int n, ndef; 2810 int n, ndef;
… …
2839 { 2886 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2887 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset (); 2888 scr_soft_reset ();
2842 2889
2843 static const int pm_h[] = { 7, 25 }; 2890 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2891 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845 2892
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2848 } 2895 }
2849 break; 2896 break;
2850 } 2897 }
2851 2898
2852 return; 2899 return;
… …
2870 } 2917 }
2871 break; 2918 break;
2872#endif 2919#endif
2873 2920
2874 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2875 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2876 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2878 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2879 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2880 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2881 break; 2928 break;
2882 2929
2883 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2884 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3071 } 3118 }
3072} 3119}
3073/*}}} */ 3120/*}}} */
3074 3121
3075#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3076/* ARGSUSED */
3077void 3123void
3078rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3079{ 3125{
3080 int x, y; 3126 int x, y;
3081 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3090 { 3136 {
3091 /* 3137 /*
3092 * commands 3138 * commands
3093 */ 3139 */
3094 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3095 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3096 break; 3142 break;
3097 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3098 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3099 break; 3145 break;
3100 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3101 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3102 break; 3148 break;
3103 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3104 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3105 break; 3151 break;
3106 case 5: /* raise window */ 3152 case 5: /* raise window */
3107 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3108 break; 3154 break;
3109 case 6: /* lower window */ 3155 case 6: /* lower window */
3110 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3111 break; 3157 break;
3112 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3113 scr_touch (true); 3159 scr_touch (true);
3114 break; 3160 break;
3115 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3118 break; 3164 break;
3119 3165
3120 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3121 default: 3167 default:
3122 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3123 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3124 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3125 break; 3171 break;
3126 3172
3127 /* 3173 /*
3128 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3129 */ 3175 */
3130 case 11: /* report window state */ 3176 case 11: /* report window state */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3133 break; 3179 break;
3134 case 13: /* report window position */ 3180 case 13: /* report window position */
3135 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3136 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3137 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3138 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3139 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3140 break; 3186 break;
3141 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3142 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3143 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3144 break; 3190 break;
3145 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3146 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3147 break; 3193 break;
… …
3149 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3150 break; 3196 break;
3151 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3152 { 3198 {
3153 char *s; 3199 char *s;
3154 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3155 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 */
3156 XFree (s); 3202 XFree (s);
3157 } 3203 }
3158 break; 3204 break;
3159 case 21: /* report window title */ 3205 case 21: /* report window title */
3160 { 3206 {
3161 char *s; 3207 char *s;
3162 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3163 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 */
3164 XFree (s); 3210 XFree (s);
3165 } 3211 }
3166 break; 3212 break;
3167 } 3213 }
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3269 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3270 */
3225void 3271void
3226rxvt_term::process_dcs_seq () 3272rxvt_term::process_dcs_seq ()
3227{ 3273{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3274 /*
3232 * Not handled yet 3275 * Not handled yet
3233 */ 3276 */
3277
3278 unicode_t eh;
3234 s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3235 if (s) 3280 if (s)
3236 free (s); 3281 free (s);
3237 3282
3238 return; 3283 return;
3239} 3284}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3288 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3289 */
3245void 3290void
3246rxvt_term::process_osc_seq () 3291rxvt_term::process_osc_seq ()
3247{ 3292{
3248 unicode_t ch, eh;
3249 int arg; 3293 int arg;
3250 3294
3251 ch = cmd_getc (); 3295 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3296 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3297 arg = arg * 10 + (ch - '0');
3254 3298
3255 if (ch == ';') 3299 if (ch == ';')
3256 { 3300 {
3301 unicode_t eh;
3257 char *s = get_to_st (eh); 3302 char *s = get_to_st (eh);
3258 3303
3259 if (s) 3304 if (s)
3260 { 3305 {
3261 process_xterm_seq (arg, s, eh); 3306 process_xterm_seq (arg, s, eh);
… …
3322 unsigned long bytes_after; 3367 unsigned long bytes_after;
3323 unsigned char *value = 0; 3368 unsigned char *value = 0;
3324 const char *str = ""; 3369 const char *str = "";
3325 3370
3326 if (prop 3371 if (prop
3327 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3328 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3329 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3330 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3331 && actual_type != None 3376 && actual_type != None
3332 && actual_format == 8) 3377 && actual_format == 8)
… …
3344 { 3389 {
3345 *eq = 0; 3390 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3347 } 3392 }
3348 else 3393 else
3349 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3350 display->atom (str)); 3395 display->atom (str));
3351 } 3396 }
3352 break; 3397 break;
3353 3398
3354 case XTerm_Color: 3399 case XTerm_Color:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3431 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3432 break;
3388 case XTerm_Color_pointer_bg: 3433 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3434 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3435 break;
3436#ifdef OPTION_HC
3437 case XTerm_Color_HC:
3438 process_color_seq (op, Color_HC, str, resp);
3439 break;
3440 case XTerm_Color_HTC:
3441 process_color_seq (op, Color_HTC, str, resp);
3442 break;
3443#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3444#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3445 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3446 process_color_seq (op, Color_BD, str, resp);
3398 break; 3447 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3448 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3449 process_color_seq (op, Color_UL, str, resp);
3402 break; 3450 break;
3403 case URxvt_Color_IT: 3451 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3452 process_color_seq (op, Color_IT, str, resp);
… …
3412 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3413 { 3461 {
3414 bool changed = false; 3462 bool changed = false;
3415 3463
3416 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420 3466
3421 if (changed) 3467 if (changed)
3422 update_background (); 3468 update_background ();
3423 } 3469 }
3424 3470
… …
3428#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3429 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3431 { 3477 {
3432 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;
3433 3483
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3484 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3485 h_scale, v_scale,
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3486 h_align, v_align);
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3488 }
3439 else 3489 else
3440 { 3490 {
3441 int changed = 0; 3491 bool changed = false;
3442 3492
3443 if (*str != ';') 3493 if (*str != ';')
3444 { 3494 {
3445 /* reset to default scaling :*/ 3495 try
3446 bgPixmap.unset_geometry (); 3496 {
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3497 fimage.set_file_geometry (this, str);
3448 changed++; 3498 changed = true;
3449 str = strchr (str, ';'); 3499 }
3450 if (str == NULL) 3500 catch (const class rxvt_failure_exception &e)
3451 bgPixmap.set_defaultGeometry (); 3501 {
3502 }
3452 } 3503 }
3453 3504 else
3454 while (str)
3455 { 3505 {
3456 str++; 3506 str++;
3457 if (bgPixmap.set_geometry (str)) 3507 if (fimage.set_geometry (str, true))
3458 changed++; 3508 changed = true;
3459 str = strchr (str, ';');
3460 } 3509 }
3461 3510
3462 if (changed) 3511 if (changed)
3512 {
3513 if (bg_window_position_sensitive ())
3514 {
3515 int x, y;
3516 get_window_origin (x, y);
3517 parent_x = x;
3518 parent_y = y;
3519 }
3463 update_background (); 3520 update_background ();
3521 }
3464 } 3522 }
3465 break; 3523 break;
3466#endif 3524#endif
3467 3525
3468 case XTerm_logfile: 3526 case XTerm_logfile:
… …
3555 * 's' = save 3613 * 's' = save
3556 * 'r' = restore 3614 * 'r' = restore
3557 * 't' = toggle 3615 * 't' = toggle
3558 * so no need for fancy checking 3616 * so no need for fancy checking
3559 */ 3617 */
3560int 3618int ecb_cold
3561rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3562{ 3620{
3563 int state; 3621 int state;
3564 3622
3565 if (mode == 's') 3623 if (mode == 's')
3566 { 3624 {
3567 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3568 return -1; 3629 return -1;
3569 } 3630 }
3570 else 3631 else
3571 { 3632 {
3572 if (mode == 'r') 3633 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3635 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3576 set_privmode (bit, state); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3577 } 3642 }
3578 3643
3579 return state; 3644 return state;
3580} 3645}
3581 3646
3582/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3583void 3648void
3584rxvt_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)
3585{ 3650{
3586 unsigned int i, j; 3651 unsigned int i, j;
3587 int state; 3652 int state;
3588 3653
3589 static const struct 3654 static const struct
3590 { 3655 {
3591 const int argval; 3656 const int argval;
3592 const unsigned long bit; 3657 const unsigned long bit;
3593 } argtopriv[] = { 3658 } argtopriv[] = {
3594 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3595 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3596 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3597 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3598 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3599 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3669 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3673#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3611 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3612 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3613 // 45 margin bell NYI 3678 // 45 margin bell NYI
3614 // 46 start logging 3679 // 46 start logging
3615 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3617#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3618 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3619#endif 3684#endif
3620 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3621 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
3622 { 1003, PrivMode_MouseAnyEvent }, 3687 { 1003, PrivMode_MouseAnyEvent },
3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste }, 3703 { 2004, PrivMode_BracketPaste },
3633 }; 3704 };
3634 3705
… …
3644 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3645 { 3716 {
3646 state = -1; 3717 state = -1;
3647 3718
3648 /* basic handling */ 3719 /* basic handling */
3649 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3650 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3651 { 3722 {
3652 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3653 break; 3724 break;
3654 } 3725 }
… …
3680 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3754 * within VT52 mode
3684 */ 3755 */
3685 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3686 break; 3757 break;
3687 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3761 break;
… …
3705 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3778 break;
3708#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3709 case scrollBar_esc: 3780 case scrollBar_esc:
3710 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3711 {
3712 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3783 scr_touch (true);
3714 }
3715 break; 3784 break;
3716#endif 3785#endif
3717 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3718 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3719 break; 3788 break;
… …
3732 case 1003: 3801 case 1003:
3733 if (state) 3802 if (state)
3734 { 3803 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3737 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3738 } 3808 }
3739 else 3809 else
3740 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3741 3811
… …
3773 } 3843 }
3774} 3844}
3775/*}}} */ 3845/*}}} */
3776 3846
3777/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3778void 3848void ecb_hot
3779rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3780{ 3850{
3781 unsigned int i; 3851 unsigned int i;
3782 short rendset; 3852 short rendset;
3783 int rendstyle; 3853 int rendstyle;
… …
3926 } 3996 }
3927 } 3997 }
3928} 3998}
3929/*}}} */ 3999/*}}} */
3930 4000
3931/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3932void
3933rxvt_term::process_graphics ()
3934{
3935 unicode_t ch, cmd = cmd_getc ();
3936
3937 if (cmd == 'Q')
3938 {
3939 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3951 4002
3952/* 4003/*
3953 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3967 4018
3968/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3970 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3971 */ 4022 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973 4024
3974void 4025void
3975rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 4027{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3982 4033
3983 if (v_buflen == 0) 4034 if (v_buflen == 0)
3984 { 4035 {
3985 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));
3986 4037
4038 max_it (written, 0);
4039
3987 if ((unsigned int)written == len) 4040 if (written == len)
3988 return; 4041 return;
3989 4042
3990 data += written; 4043 data += written;
3991 len -= written; 4044 len -= written;
3992 } 4045 }
3993 4046
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4048
3996 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4050 v_buflen += len;
3998 4051
3999 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