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.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.542 by root, Thu Apr 24 22:32:59 2014 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-2014 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 (lnsppg);
513 return; 516 return;
514 } 517 }
515 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
516 { 519 {
517 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
518 return; 521 return;
519 } 522 }
520 } 523 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
523 { 526 {
524 if (keysym == XK_Up) 527 if (keysym == XK_Up)
525 { 528 {
526 scr_page (UP, 1); 529 scr_page (1);
527 return; 530 return;
528 } 531 }
529 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
530 { 533 {
531 scr_page (DN, 1); 534 scr_page (-1);
532 return; 535 return;
533 } 536 }
534 } 537 }
535#endif 538#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
538 { 541 {
539 if (keysym == XK_Home) 542 if (keysym == XK_Home)
540 { 543 {
541 scr_move_to (0, 1); 544 scr_changeview (top_row);
542 return; 545 return;
543 } 546 }
544 else if (keysym == XK_End) 547 else if (keysym == XK_End)
545 { 548 {
546 scr_move_to (1, 1); 549 scr_changeview (0);
547 return; 550 return;
548 } 551 }
549 } 552 }
550#endif 553#endif
551 } 554 }
… …
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 }
581 582
582#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 584 // ISO 14755 support
584 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 586 {
586 int hv; 587 int hv;
587 588
588 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
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_IMG
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
… …
1087 1077
1088#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1089void 1079void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1081{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1093 { 1083 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1085 want_refresh = 1;
1096 refresh_check (); 1086 refresh_check ();
1097 } 1087 }
… …
1102 1092
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1094void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1096{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1108 { 1098 {
1109 want_refresh = 1; 1099 want_refresh = 1;
1110 refresh_check (); 1100 refresh_check ();
1111 } 1101 }
1112 1102
… …
1127 { 1117 {
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.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1132 1125
1133 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1135 1128
1136 w.stop (); 1129 w.stop ();
1137 } 1130 }
1138 1131
… …
1141 { 1134 {
1142 } 1135 }
1143} event_handler; 1136} event_handler;
1144#endif 1137#endif
1145 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
1146bool 1172bool
1147rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1148{ 1174{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1150 1176
1151 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1178
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1154 n = 0;
1155 } 1180 {
1156 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1160 1186
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1188
1163 if (r > 0) 1189 if (r > 0)
1164 { 1190 {
1165 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1166 return true; 1192 return true;
… …
1188{ 1214{
1189 make_current (); 1215 make_current ();
1190 1216
1191 if (revents & ev::READ) 1217 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1220 cmd_parse ();
1195 break;
1196 1221
1197 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1198 pty_write (); 1223 pty_write ();
1199 1224
1200 refresh_check (); 1225 refresh_check ();
1201} 1226}
1202 1227
1203void 1228void ecb_cold
1204rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1205{ 1230{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1232 recolour_cursor ();
1208 1233
… …
1213 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1214#endif 1239#endif
1215} 1240}
1216 1241
1217#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1218void 1243void ecb_cold
1219rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1220{ 1245{
1221 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1222 return; 1247 return;
1223 1248
… …
1225 XFlush (dpy); 1250 XFlush (dpy);
1226 1251
1227 hidden_pointer = 1; 1252 hidden_pointer = 1;
1228} 1253}
1229 1254
1230void 1255void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1257{
1233 make_current (); 1258 make_current ();
1234 1259
1235 pointer_blank (); 1260 pointer_blank ();
… …
1241{ 1266{
1242 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1243 int x, y; 1268 int x, y;
1244 int code = 32; 1269 int code = 32;
1245 1270
1246 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1248 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1249 { 1275 {
1250 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1251 return; 1277 return;
1278
1252 mouse_row = x; 1279 mouse_row = x;
1253 mouse_col = y; 1280 mouse_col = y;
1254 code += 32; 1281 code += 32;
1255 } 1282 }
1256 1283
… …
1259 else 1286 else
1260 { 1287 {
1261 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1290 if (button_number >= 3)
1264 button_number += (64 - 3); 1291 button_number += 64 - 3;
1265 } 1292 }
1266 1293
1267 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1268 { 1295 {
1269 /* 1296 /*
… …
1301 fputc ('A', stderr); 1328 fputc ('A', stderr);
1302 if (key_state & 32) 1329 if (key_state & 32)
1303 fputc ('2', stderr); 1330 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1332 button_number,
1306 x + 1, 1333 x,
1307 y + 1); 1334 y);
1308#endif 1335#endif
1309 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
1310 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1351 code + button_number + key_state,
1312 (32 + x + 1), 1352 32 + x,
1313 (32 + y + 1)); 1353 32 + y);
1314} 1354}
1315 1355
1316/*{{{ process an X event */ 1356/*{{{ process an X event */
1317void 1357void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1319{ 1359{
1320 make_current (); 1360 make_current ();
1321 1361
1322 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1461 focus_out ();
1422 break; 1462 break;
1423 1463
1424 case ConfigureNotify: 1464 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1429 { 1466 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 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_img == 0)
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 }
1432 1502
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1504 {
1435 seen_resize = 1; 1505 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1507 }
1438 else 1508 else
1439 { 1509 {
1440#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1511 if (moved)
1444 update_background (); 1512 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1513#endif
1449 } 1514 }
1450 1515
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1517 }
1453 break; 1518 break;
1454 1519
1455 case PropertyNotify: 1520 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1522 break;
1462 1523
1463 case SelectionClear: 1524 case SelectionClear:
1464 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1526 break;
1471 1527
1472 case SelectionRequest: 1528 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1474 break; 1530 break;
1475 1531
1476 case MapNotify: 1532 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1479 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1482 * reparenting. 1538 // events at startup when the window manager reparents the
1483 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1485 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1492#endif 1543#endif
1493 mapped = 1; 1544 mapped = 1;
1494#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1511 { 1562 {
1512 do 1563 do
1513 { 1564 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1567 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1569
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1571
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1573 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1576 }
1526 1577
1527 want_refresh = 1; 1578 want_refresh = 1;
1528 } 1579 }
1529 else 1580 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1587 ;
1537 1588
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1590 {
1540 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1541 scrollBar.show (0); 1592 scrollBar.show (0);
1542 } 1593 }
1543 } 1594 }
1544 break; 1595 break;
1545 1596
… …
1587 1638
1588#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1642 {
1643 page_dirn scroll_selection_dir;
1592 int dist; 1644 int dist;
1593 1645
1594 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1596 */ 1648 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1612 } 1664 }
1613 else 1665 else
1614 { 1666 {
1615 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1669 }
1618 1670
1619 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1673 + 1;
1622 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1624 } 1677 }
1625 else 1678 else
1626 { 1679 {
1627 /* we are within the text window, so we 1680 /* we are within the text window, so we
1628 * shouldn't be scrolling 1681 * shouldn't be scrolling
… …
1633#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1634 } 1687 }
1635#endif 1688#endif
1636 } 1689 }
1637 } 1690 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1692 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1694 MotionNotify, &ev))
1642 ; 1695 ;
1643 1696
1644 XQueryPointer (dpy, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1700 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1701 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1703 scrollBar.size ());
1651 want_refresh = 1; 1704 want_refresh = 1;
1652 scrollBar.show (1); 1705 scrollBar.show (1);
1653 } 1706 }
1654 break; 1707 break;
1655 } 1708 }
1656 1709
1657#if defined(CURSOR_BLINK) 1710#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1711 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1712 cursor_blink_reset ();
1667 }
1668#endif 1713#endif
1669 1714
1670#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1717 {
… …
1682#endif 1727#endif
1683 1728
1684 refresh_check (); 1729 refresh_check ();
1685} 1730}
1686 1731
1687void 1732#if ENABLE_FRILLS
1733void ecb_cold
1734rxvt_term::set_urgency (bool enable)
1735{
1736 if (enable == urgency_hint)
1737 return;
1738
1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1740 {
1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1742 XSetWMHints (dpy, parent, h);
1743 urgency_hint = enable;
1744 XFree (h);
1745 }
1746}
1747#endif
1748
1749void ecb_cold
1688rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1689{ 1751{
1690 if (!focus) 1752 if (!focus)
1691 { 1753 {
1692 focus = 1; 1754 focus = 1;
1693 want_refresh = 1; 1755 want_refresh = 1;
1694 1756
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1757#if USE_XIM
1698 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1699 { 1759 {
1700 IMSetPosition (); 1760 im_set_position ();
1701 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1702 } 1762 }
1703#endif 1763#endif
1704#if CURSOR_BLINK 1764#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1772 scr_recolour ();
1713 } 1773 }
1714#endif 1774#endif
1715#if ENABLE_FRILLS 1775#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1776 if (option (Opt_urgentOnBell))
1717 { 1777 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1778#endif
1725 }
1726}
1727 1779
1728void 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 }
1782}
1783
1784void ecb_cold
1729rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1730{ 1786{
1731 if (focus) 1787 if (focus)
1732 { 1788 {
1733 focus = 0; 1789 focus = 0;
1734 want_refresh = 1; 1790 want_refresh = 1;
1735 1791
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1792#if ENABLE_FRILLS
1737 1793 if (option (Opt_urgentOnBell))
1794 set_urgency (0);
1795#endif
1738#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1797 if (iso14755buf)
1740 { 1798 {
1741 iso14755buf = 0; 1799 iso14755buf = 0;
1742# if ISO_14755 1800# if ISO_14755
… …
1759 { 1817 {
1760 pix_colors = pix_colors_unfocused; 1818 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1819 scr_recolour ();
1762 } 1820 }
1763#endif 1821#endif
1764 }
1765}
1766 1822
1767void 1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1824 }
1825}
1826
1827void ecb_cold
1768rxvt_term::update_fade_color (unsigned int idx) 1828rxvt_term::update_fade_color (unsigned int idx)
1769{ 1829{
1770#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1772 { 1832 {
… …
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 } 1836 }
1777#endif 1837#endif
1778} 1838}
1779 1839
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL 1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1841void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1843{
1784 make_current (); 1844 make_current ();
1785 1845
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return; 1848 return;
1789 1849
1790# if ENABLE_TRANSPARENCY
1791 switch (ev.type) 1850 switch (ev.type)
1792 { 1851 {
1793 case PropertyNotify: 1852 case PropertyNotify:
1794 /* 1853 /*
1795 * if user used some Esetroot compatible prog to set the root bg, 1854 * if user used some Esetroot compatible prog to set the root bg,
1796 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1797 */ 1856 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1859 {
1801 bgPixmap.set_root_pixmap (); 1860#if BG_IMAGE_FROM_ROOT
1861 if (option (Opt_transparent))
1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1802 update_background (); 1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1803 } 1868 }
1804 1869
1805 break; 1870 break;
1806 } 1871 }
1807# endif
1808 1872
1809 refresh_check (); 1873 refresh_check ();
1810} 1874}
1811#endif 1875#endif
1812 1876
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1909 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1910 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1911#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1912 if (ev.button == MEvent.button && clickintime)
1849 { 1913 {
1850 /* same button, within alloted time */ 1914 /* same button, within allowed time */
1851 MEvent.clicks++; 1915 MEvent.clicks++;
1852 1916
1853 if (MEvent.clicks > 1) 1917 if (MEvent.clicks > 1)
1854 { 1918 {
1855 /* only report double clicks */ 1919 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 2001 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 2003 direction = DN; /* down */
1940 2004
1941 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1942 /* 2006 /*
1943 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 2008 * move up if mouse is above slider
1945 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1946 * 2010 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2050#endif
1987 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
1988 { 2052 {
1989 if (direction == UP) 2053 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
1991 else 2055 else
1992 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
1993 } 2057 }
1994 } 2058 }
1995 else 2059 else
1996 switch (ev.button) 2060 switch (ev.button)
1997 { 2061 {
1998 case Button2: 2062 case Button2:
1999 switch (scrollBar.align) 2063 switch (scrollBar.align)
2000 { 2064 {
2001 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2002 csrO = 0; 2066 csrO = 0;
2003 break; 2067 break;
2004 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2070 break;
2007 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2073 break;
2010 } 2074 }
2011 2075
2012 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2080
2017 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2018 break; 2082 break;
2019 2083
2020 case Button1: 2084 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2024 2088
2025 case Button3: 2089 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2091 {
2028 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2031# else 2095# else
2032 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2033# endif 2097# endif
2034 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2037# else 2101# else
2038 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2039# endif 2103# endif
2040 else 2104 else
2041 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2042 } 2106 }
2043 else 2107 else
2044 { 2108 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2110 (nrow
2047 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2048 / scrollBar.size ())); 2112 / scrollBar.size ()));
2049 } 2113 }
2050 2114
2051 break; 2115 break;
2052 } 2116 }
… …
2063 2127
2064 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2129 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2131
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2133 {
2070 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2071 scrollBar.show (0); 2135 scrollBar.show (0);
2072 } 2136 }
2073 2137
2074#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
… …
2125 case Button3: 2189 case Button3:
2126 selection_make (ev.time); 2190 selection_make (ev.time);
2127 break; 2191 break;
2128 2192
2129 case Button2: 2193 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2196 break;
2133 2197
2134#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2135 case Button4: 2199 case Button4:
2136 case Button5: 2200 case Button5:
2137 { 2201 {
2138 int i; 2202 int lines;
2139 page_dirn v; 2203 page_dirn dirn;
2140 2204
2141 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2142 2206
2143 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2144 i = 1; 2208 lines = 1;
2145 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2210 lines = nrow - 1;
2147 else 2211 else
2148 i = 5; 2212 lines = 5;
2149 2213
2150# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2151 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2152 { 2216 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2219
2157 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159 } 2222 }
2160 else 2223 else
2161# endif 2224# endif
2162 { 2225 {
2163 scr_page (v, i); 2226 scr_page (dirn, lines);
2164 scrollBar.show (1); 2227 scrollBar.show (1);
2165 } 2228 }
2166 } 2229 }
2167 break; 2230 break;
2168#endif 2231#endif
… …
2170 } 2233 }
2171} 2234}
2172 2235
2173/*}}} */ 2236/*}}} */
2174 2237
2175bool 2238void ecb_hot
2176rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
2177{ 2240{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
2181 2243
2182 for (;;) 2244 for (;;)
2183 { 2245 {
2184 if (ch == NOCHAR) 2246 if (ecb_unlikely (ch == NOCHAR))
2185 { 2247 {
2186 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2249 ch = next_char ();
2188 2250
2189 if (ch == NOCHAR) 2251 if (ch == NOCHAR)
2190 break; 2252 break;
2191 } 2253 }
2192 2254
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2255 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2256 {
2195 if (!seen_input) 2257 if (ecb_unlikely (!seen_input))
2196 { 2258 {
2197 seen_input = 1; 2259 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2260 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2261 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2262 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2275 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2277
2216 for (;;) 2278 for (;;)
2217 { 2279 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2280 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2281 break;
2220 2282
2221 *str++ = ch; 2283 *str++ = ch;
2222 2284
2223 if (ch == C0_LF || str >= eol) 2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2286 {
2225 if (ch == C0_LF) 2287 if (ch == C0_LF)
2226 nlines++; 2288 nlines++;
2227 2289
2228 refresh_count++; 2290 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2339 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2340 * if skipScroll is enabled.
2279 */ 2341 */
2280 if (refreshnow) 2342 if (refreshnow)
2281 { 2343 {
2282 flag = true;
2283 scr_refresh (); 2344 scr_refresh ();
2284 want_refresh = 1; 2345 want_refresh = 1;
2285 } 2346 }
2286
2287 } 2347 }
2288 else 2348 else
2289 { 2349 {
2290 try 2350 try
2291 { 2351 {
… …
2299 } 2359 }
2300 2360
2301 ch = NOCHAR; 2361 ch = NOCHAR;
2302 } 2362 }
2303 } 2363 }
2304
2305 return flag;
2306} 2364}
2307 2365
2308// read the next character 2366// read the next character
2309wchar_t 2367wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2368rxvt_term::next_char () NOTHROW
2311{ 2369{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2371 {
2314 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2317 2375
2318 wchar_t wc; 2376 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2378
… …
2325 break; 2383 break;
2326 } 2384 }
2327 2385
2328 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2329 { 2387 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2388 mbstate.reset (); // reset now undefined conversion state
2389 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2390 // in which case we "erroneously" return the next byte which might be valid.
2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2391 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 } 2392 }
2333 2393
2334 // assume wchar == unicode 2394 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
… …
2338 2398
2339 return NOCHAR; 2399 return NOCHAR;
2340} 2400}
2341 2401
2342// read the next octet 2402// read the next octet
2343uint32_t 2403uint32_t ecb_hot
2344rxvt_term::next_octet () NOTHROW 2404rxvt_term::next_octet () NOTHROW
2345{ 2405{
2346 return cmdbuf_ptr < cmdbuf_endp 2406 return cmdbuf_ptr < cmdbuf_endp
2347 ? (unsigned char)*cmdbuf_ptr++ 2407 ? (unsigned char)*cmdbuf_ptr++
2348 : NOCHAR; 2408 : NOCHAR;
2349} 2409}
2350 2410
2351static class out_of_input out_of_input; 2411static class out_of_input out_of_input;
2352 2412
2353/* rxvt_cmd_getc () - Return next input character */ 2413wchar_t ecb_hot
2354/*
2355 * Return the next input character after first passing any keyboard input
2356 * to the command.
2357 */
2358wchar_t
2359rxvt_term::cmd_getc () THROW ((class out_of_input)) 2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2360{ 2415{
2361 wchar_t c = next_char (); 2416 wchar_t c = next_char ();
2362 2417
2363 if (c == NOCHAR) 2418 if (c == NOCHAR)
2364 throw out_of_input; 2419 throw out_of_input;
2365 2420
2366 return c; 2421 return c;
2367} 2422}
2368 2423
2369uint32_t 2424uint32_t ecb_hot
2370rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2371{ 2426{
2372 uint32_t c = next_octet (); 2427 uint32_t c = next_octet ();
2373 2428
2374 if (c == NOCHAR) 2429 if (c == NOCHAR)
… …
2378} 2433}
2379 2434
2380/*{{{ print pipe */ 2435/*{{{ print pipe */
2381/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2382#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2383FILE * 2438FILE * ecb_cold
2384rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2385{ 2440{
2386 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2387 2442
2388 if (stream == NULL) 2443 if (stream == NULL)
2389 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2390 2445
2391 return stream; 2446 return stream;
2392} 2447}
2393 2448
2394int 2449int ecb_cold
2395rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2396{ 2451{
2397 fflush (stream); 2452 fflush (stream);
2398 return pclose (stream); 2453 return pclose (stream);
2399} 2454}
2400 2455
2401/* 2456/*
2402 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2403 */ 2458 */
2404void 2459void ecb_cold
2405rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2406{ 2461{
2407 int done; 2462 FILE *fd = popen_printer ();
2408 FILE *fd;
2409 2463
2410 if ((fd = popen_printer ()) == NULL) 2464 if (!fd)
2411 return; 2465 return;
2412 2466
2413 /* 2467 /*
2414 * Send all input to the printer until either ESC[4i or ESC[?4i 2468 * Send all input to the printer until either ESC[4i or ESC[?4i
2415 * is received. 2469 * is received.
2416 */ 2470 */
2417 for (done = 0; !done;) 2471 for (int done = 0; !done; )
2418 { 2472 {
2419 unsigned char buf[8]; 2473 unsigned char buf[8];
2420 unicode_t ch; 2474 unicode_t ch;
2421 unsigned int i, len; 2475 unsigned int i, len;
2422 2476
… …
2456 pclose_printer (fd); 2510 pclose_printer (fd);
2457} 2511}
2458#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2459/*}}} */ 2513/*}}} */
2460 2514
2461/* *INDENT-OFF* */
2462enum { 2515enum {
2463 C1_40 = 0x40, 2516 C1_40 = 0x40,
2464 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2517 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2465 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2518 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2466 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2519 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2467 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2520 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2468}; 2521};
2469/* *INDENT-ON* */
2470 2522
2471/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2472void 2524void ecb_hot
2473rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2474{ 2526{
2475 switch (ch) 2527 switch (ch)
2476 { 2528 {
2477 case C0_ESC: 2529 case C0_ESC:
… …
2523} 2575}
2524/*}}} */ 2576/*}}} */
2525 2577
2526 2578
2527/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2528void 2580void ecb_cold
2529rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2530{ 2582{
2531 int row, col; 2583 int row, col;
2532 2584
2533 switch (ch) 2585 switch (ch)
… …
2567 break; 2619 break;
2568 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2569 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2570 break; 2622 break;
2571 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2572 set_privmode (PrivMode_vt52, 0); 2624 priv_modes &= ~PrivMode_vt52;
2573 break; 2625 break;
2574 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2575 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2576 /* unimplemented */ 2628 /* unimplemented */
2577 break; 2629 break;
… …
2583} 2635}
2584/*}}} */ 2636/*}}} */
2585 2637
2586 2638
2587/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2588void 2640void ecb_hot
2589rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2590{ 2642{
2591 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2592 2644
2593 if (priv_modes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
… …
2596 return; 2648 return;
2597 } 2649 }
2598 2650
2599 switch (ch) 2651 switch (ch)
2600 { 2652 {
2601 /* case 1: do_tek_mode (); break; */
2602 case '#': 2653 case '#':
2603 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2604 scr_E (); 2655 scr_E ();
2605 break; 2656 break;
2606 case '(': 2657 case '(':
… …
2629#if !ENABLE_MINIMAL 2680#if !ENABLE_MINIMAL
2630 case '9': 2681 case '9':
2631 scr_forwardindex (); 2682 scr_forwardindex ();
2632 break; 2683 break;
2633#endif 2684#endif
2685 // DECPAM/DECPNM
2634 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2635 case '>': 2689 case '>':
2636 set_privmode (PrivMode_aplKP, ch == '='); 2690 priv_modes &= ~PrivMode_aplKP;
2637 break; 2691 break;
2638 2692
2639 case C1_40: 2693 case C1_40:
2640 cmd_getc (); 2694 cmd_getc ();
2641 break; 2695 break;
… …
2645 2699
2646 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2647 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2648 { 2702 {
2649 wchar_t nlcr[] = { C0_LF, C0_CR }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2650 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2651 } 2705 }
2652 break; 2706 break;
2653 2707
2654 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2655 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2656 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q')
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2657 break; 2713 break;
2658 2714
2659 /* 8.3.63: CHARACTER TABULATION SET */ 2715 /* 8.3.63: CHARACTER TABULATION SET */
2660 case C1_HTS: /* ESC H */ 2716 case C1_HTS: /* ESC H */
2661 scr_set_tab (1); 2717 scr_set_tab (1);
… …
2665 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2666 scr_index (DN); 2722 scr_index (DN);
2667 break; 2723 break;
2668 2724
2669 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2670 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2671 2727
2672 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2673 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2674 2730
2675 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2676 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2677 process_dcs_seq (); 2733 process_dcs_seq ();
2678 break; 2734 break;
… …
2680 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2736 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2681 case C1_SCI: /* ESC Z */ 2737 case C1_SCI: /* ESC Z */
2682 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2738 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2683 break; /* steal obsolete ESC [ c */ 2739 break; /* steal obsolete ESC [ c */
2684 2740
2685 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2741 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2686 case C1_CSI: /* ESC [ */ 2742 case C1_CSI: /* ESC [ */
2687 process_csi_seq (); 2743 process_csi_seq ();
2688 break; 2744 break;
2689 2745
2690 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2746 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2691 case C1_OSC: /* ESC ] */ 2747 case C1_OSC: /* ESC ] */
2692 process_osc_seq (); 2748 process_osc_seq ();
2693 break; 2749 break;
2694 2750
2695 /* 8.3.106: RESET TO INITIAL STATE */ 2751 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2696 case 'c': 2752 case 'c':
2697 mbstate.reset (); 2753 mbstate.reset ();
2698 scr_poweron (); 2754 scr_poweron ();
2699 scrollBar.show (1); 2755 scrollBar.show (1);
2700 break; 2756 break;
… …
2711 } 2767 }
2712} 2768}
2713/*}}} */ 2769/*}}} */
2714 2770
2715/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2716/* *INDENT-OFF* */
2717enum { 2772enum {
2718 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2719 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2774 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2720 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2775 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2721 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2776 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2724 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2779 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2725 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2780 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2726 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2781 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2727}; 2782};
2728 2783
2729#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2784#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2730 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2785 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2731 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2786 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2732#define get_byte_array_bit(array, bit) \ 2787#define get_byte_array_bit(array, bit) \
2733 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2788 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2734 2789
2735const unsigned char csi_defaults[] = 2790static const unsigned char csi_defaults[] =
2736 { 2791 {
2737 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2792 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2738 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2793 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2739 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2794 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2740 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2795 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2741 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2796 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2742 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2797 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2743 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2744 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2745 }; 2800 };
2746/* *INDENT-ON* */
2747 2801
2748void 2802void ecb_hot
2749rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2750{ 2804{
2751 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2752 unsigned int nargs, p; 2806 unsigned int nargs, p;
2753 int n, ndef; 2807 int n, ndef;
2754 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2755 2809
2756 nargs = 0; 2810 nargs = 0;
2757 2811
2758 priv = 0; 2812 priv = 0;
2759 ch = cmd_getc (); 2813 ch = cmd_getc ();
2760 if (ch >= '<' && ch <= '?') 2814 if ((ch >= '<' && ch <= '?') || ch == '!')
2761 { 2815 {
2762 /* '<' '=' '>' '?' */ 2816 /* '<' '=' '>' '?' '!' */
2763 priv = ch; 2817 priv = ch;
2764 ch = cmd_getc (); 2818 ch = cmd_getc ();
2765 } 2819 }
2766 2820
2821 prev_ch = 0;
2767 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2768 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2769 { 2824 {
2770 if (isdigit (ch)) 2825 if (isdigit (ch))
2771 { 2826 {
… …
2781 n = -1; 2836 n = -1;
2782 } 2837 }
2783 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2784 process_nonprinting (ch); 2839 process_nonprinting (ch);
2785 2840
2841 prev_ch = ch;
2786 ch = cmd_getc (); 2842 ch = cmd_getc ();
2787 } 2843 }
2788 2844
2789 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2790 return; 2846 return;
… …
2821 2877
2822 case '?': 2878 case '?':
2823 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2824 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2825 break; 2881 break;
2882
2883 case '!':
2884 if (ch == CSI_70)
2885 {
2886 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2887 scr_soft_reset ();
2888
2889 static const int pm_h[] = { 7, 25 };
2890 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2891
2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2826 } 2894 }
2895 break;
2896 }
2897
2827 return; 2898 return;
2828 } 2899 }
2829 2900
2830 switch (ch) 2901 switch (ch)
2831 { 2902 {
… …
2845 } 2916 }
2846 break; 2917 break;
2847#endif 2918#endif
2848 2919
2849 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2850 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2851 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2852 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2853 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2854 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2855 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2856 break; 2927 break;
2857 2928
2858 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2859 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3009 scr_insert_mode (1); 3080 scr_insert_mode (1);
3010 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3011 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3012 break; 3083 break;
3013 3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3088 break;
3089
3014 /* 3090 /*
3015 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3016 */ 3092 */
3017 case CSI_72: /* DECSTBM: set top and bottom margins */ 3093 case CSI_72: /* DECSTBM: set top and bottom margins */
3018 if (nargs == 1) 3094 if (nargs == 1)
… …
3046 } 3122 }
3047} 3123}
3048/*}}} */ 3124/*}}} */
3049 3125
3050#if !ENABLE_MINIMAL 3126#if !ENABLE_MINIMAL
3051/* ARGSUSED */
3052void 3127void
3053rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3054{ 3129{
3055 int x, y; 3130 int x, y;
3056 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
… …
3065 { 3140 {
3066 /* 3141 /*
3067 * commands 3142 * commands
3068 */ 3143 */
3069 case 1: /* deiconify window */ 3144 case 1: /* deiconify window */
3070 XMapWindow (dpy, parent[0]); 3145 XMapWindow (dpy, parent);
3071 break; 3146 break;
3072 case 2: /* iconify window */ 3147 case 2: /* iconify window */
3073 XIconifyWindow (dpy, parent[0], display->screen); 3148 XIconifyWindow (dpy, parent, display->screen);
3074 break; 3149 break;
3075 case 3: /* set position (pixels) */ 3150 case 3: /* set position (pixels) */
3076 XMoveWindow (dpy, parent[0], args[1], args[2]); 3151 XMoveWindow (dpy, parent, args[1], args[2]);
3077 break; 3152 break;
3078 case 4: /* set size (pixels) */ 3153 case 4: /* set size (pixels) */
3079 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3154 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3080 break; 3155 break;
3081 case 5: /* raise window */ 3156 case 5: /* raise window */
3082 XRaiseWindow (dpy, parent[0]); 3157 XRaiseWindow (dpy, parent);
3083 break; 3158 break;
3084 case 6: /* lower window */ 3159 case 6: /* lower window */
3085 XLowerWindow (dpy, parent[0]); 3160 XLowerWindow (dpy, parent);
3086 break; 3161 break;
3087 case 7: /* refresh window */ 3162 case 7: /* refresh window */
3088 scr_touch (true); 3163 scr_touch (true);
3089 break; 3164 break;
3090 case 8: /* set size (chars) */ 3165 case 8: /* set size (chars) */
… …
3093 break; 3168 break;
3094 3169
3095 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
3096 default: 3171 default:
3097 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
3098 set_widthheight ((unsigned int)width, 3173 set_widthheight ((unsigned int)vt_width,
3099 (unsigned int) (args[1] * fheight)); 3174 (unsigned int) (args[1] * fheight));
3100 break; 3175 break;
3101 3176
3102 /* 3177 /*
3103 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
3104 */ 3179 */
3105 case 11: /* report window state */ 3180 case 11: /* report window state */
3106 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3107 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3182 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3108 break; 3183 break;
3109 case 13: /* report window position */ 3184 case 13: /* report window position */
3110 XGetWindowAttributes (dpy, parent[0], &wattr); 3185 XGetWindowAttributes (dpy, parent, &wattr);
3111 XTranslateCoordinates (dpy, parent[0], wattr.root, 3186 XTranslateCoordinates (dpy, parent, wattr.root,
3112 -wattr.border_width, -wattr.border_width, 3187 -wattr.border_width, -wattr.border_width,
3113 &x, &y, &wdummy); 3188 &x, &y, &wdummy);
3114 tt_printf ("\033[3;%d;%dt", x, y); 3189 tt_printf ("\033[3;%d;%dt", x, y);
3115 break; 3190 break;
3116 case 14: /* report window size (pixels) */ 3191 case 14: /* report window size (pixels) */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3192 XGetWindowAttributes (dpy, parent, &wattr);
3118 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3193 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3119 break; 3194 break;
3120 case 18: /* report text area size (chars) */ 3195 case 18: /* report text area size (chars) */
3121 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3196 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3122 break; 3197 break;
… …
3124 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3199 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3125 break; 3200 break;
3126 case 20: /* report icon label */ 3201 case 20: /* report icon label */
3127 { 3202 {
3128 char *s; 3203 char *s;
3129 XGetIconName (dpy, parent[0], &s); 3204 XGetIconName (dpy, parent, &s);
3130 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3205 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3131 XFree (s); 3206 XFree (s);
3132 } 3207 }
3133 break; 3208 break;
3134 case 21: /* report window title */ 3209 case 21: /* report window title */
3135 { 3210 {
3136 char *s; 3211 char *s;
3137 XFetchName (dpy, parent[0], &s); 3212 XFetchName (dpy, parent, &s);
3138 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3139 XFree (s); 3214 XFree (s);
3140 } 3215 }
3141 break; 3216 break;
3142 } 3217 }
… …
3152rxvt_term::get_to_st (unicode_t &ends_how) 3227rxvt_term::get_to_st (unicode_t &ends_how)
3153{ 3228{
3154 unicode_t ch; 3229 unicode_t ch;
3155 bool seen_esc = false; 3230 bool seen_esc = false;
3156 unsigned int n = 0; 3231 unsigned int n = 0;
3157 wchar_t string[STRING_MAX]; 3232 wchar_t string[CBUFSIZ];
3158 3233
3159 while ((ch = cmd_getc ()) != NOCHAR) 3234 while ((ch = cmd_getc ()) != NOCHAR)
3160 { 3235 {
3161 if (seen_esc) 3236 if (seen_esc)
3162 { 3237 {
… …
3177 else if (ch < 0x20) 3252 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3253 return NULL; /* other control character - exit */
3179 3254
3180 seen_esc = false; 3255 seen_esc = false;
3181 3256
3182 if (n >= STRING_MAX - 1) 3257 if (n >= sizeof (string) - 1)
3183 // stop at some sane length 3258 // stop at some sane length
3184 return NULL; 3259 return NULL;
3185 3260
3186 string[n++] = ch; 3261 string[n++] = ch;
3187 } 3262 }
… …
3198 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3273 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3199 */ 3274 */
3200void 3275void
3201rxvt_term::process_dcs_seq () 3276rxvt_term::process_dcs_seq ()
3202{ 3277{
3203 char *s;
3204 unicode_t eh;
3205
3206 /* 3278 /*
3207 * Not handled yet 3279 * Not handled yet
3208 */ 3280 */
3281
3282 unicode_t eh;
3209 s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3210 if (s) 3284 if (s)
3211 free (s); 3285 free (s);
3212 3286
3213 return; 3287 return;
3214} 3288}
… …
3218 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3292 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3219 */ 3293 */
3220void 3294void
3221rxvt_term::process_osc_seq () 3295rxvt_term::process_osc_seq ()
3222{ 3296{
3223 unicode_t ch, eh;
3224 int arg; 3297 int arg;
3225 3298
3226 ch = cmd_getc (); 3299 unicode_t ch = cmd_getc ();
3227 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3300 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3228 arg = arg * 10 + (ch - '0'); 3301 arg = arg * 10 + (ch - '0');
3229 3302
3230 if (ch == ';') 3303 if (ch == ';')
3231 { 3304 {
3305 unicode_t eh;
3232 char *s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3233 3307
3234 if (s) 3308 if (s)
3235 { 3309 {
3236 process_xterm_seq (arg, s, eh); 3310 process_xterm_seq (arg, s, eh);
… …
3260 3334
3261/* 3335/*
3262 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3336 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3263 */ 3337 */
3264void 3338void
3265rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3339rxvt_term::process_xterm_seq (int op, char *str, char resp)
3266{ 3340{
3267 int color; 3341 int color;
3268 char *buf, *name; 3342 char *buf, *name;
3269 bool query = str[0] == '?' && !str[1]; 3343 bool query = str[0] == '?' && !str[1];
3270 int saveop = op; 3344 int saveop = op;
… …
3297 unsigned long bytes_after; 3371 unsigned long bytes_after;
3298 unsigned char *value = 0; 3372 unsigned char *value = 0;
3299 const char *str = ""; 3373 const char *str = "";
3300 3374
3301 if (prop 3375 if (prop
3302 && XGetWindowProperty (dpy, parent[0], 3376 && XGetWindowProperty (dpy, parent,
3303 prop, 0, 1<<16, 0, AnyPropertyType, 3377 prop, 0, 1<<16, 0, AnyPropertyType,
3304 &actual_type, &actual_format, 3378 &actual_type, &actual_format,
3305 &nitems, &bytes_after, &value) == Success 3379 &nitems, &bytes_after, &value) == Success
3306 && actual_type != None 3380 && actual_type != None
3307 && actual_format == 8) 3381 && actual_format == 8)
3308 str = (const char *)(value); 3382 str = (const char *)(value);
3309 3383
3310 tt_printf ("\033]%d;%s%c", op, str, resp); 3384 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3311 3385
3312 XFree (value); 3386 XFree (value);
3313 } 3387 }
3314 else 3388 else
3315 { 3389 {
3316 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3390 char *eq = strchr (str, '=');
3317 3391
3318 if (eq) 3392 if (eq)
3319 { 3393 {
3320 *eq = 0; 3394 *eq = 0;
3321 set_utf8_property (display->atom (str), eq + 1); 3395 set_utf8_property (display->atom (str), eq + 1);
3322 } 3396 }
3323 else 3397 else
3324 XDeleteProperty (dpy, parent[0], 3398 XDeleteProperty (dpy, parent,
3325 display->atom (str)); 3399 display->atom (str));
3326 } 3400 }
3327 break; 3401 break;
3328 3402
3329 case XTerm_Color: 3403 case XTerm_Color:
… …
3361 process_color_seq (op, Color_pointer_fg, str, resp); 3435 process_color_seq (op, Color_pointer_fg, str, resp);
3362 break; 3436 break;
3363 case XTerm_Color_pointer_bg: 3437 case XTerm_Color_pointer_bg:
3364 process_color_seq (op, Color_pointer_bg, str, resp); 3438 process_color_seq (op, Color_pointer_bg, str, resp);
3365 break; 3439 break;
3440#ifdef OPTION_HC
3441 case XTerm_Color_HC:
3442 process_color_seq (op, Color_HC, str, resp);
3443 break;
3444 case XTerm_Color_HTC:
3445 process_color_seq (op, Color_HTC, str, resp);
3446 break;
3447#endif
3366#ifndef NO_BOLD_UNDERLINE_REVERSE 3448#ifndef NO_BOLD_UNDERLINE_REVERSE
3367 case XTerm_Color_RV:
3368 process_color_seq (op, Color_RV, str, resp);
3369 break;
3370 case Rxvt_Color_BD:
3371 case URxvt_Color_BD: 3449 case URxvt_Color_BD:
3372 process_color_seq (op, Color_BD, str, resp); 3450 process_color_seq (op, Color_BD, str, resp);
3373 break; 3451 break;
3374 case Rxvt_Color_UL:
3375 case URxvt_Color_UL: 3452 case URxvt_Color_UL:
3376 process_color_seq (op, Color_UL, str, resp); 3453 process_color_seq (op, Color_UL, str, resp);
3377 break; 3454 break;
3378 case URxvt_Color_IT: 3455 case URxvt_Color_IT:
3379 process_color_seq (op, Color_IT, str, resp); 3456 process_color_seq (op, Color_IT, str, resp);
3380 break; 3457 break;
3381#endif 3458#endif
3382#if ENABLE_TRANSPARENCY 3459 case URxvt_Color_border:
3460 process_color_seq (op, Color_border, str, resp);
3461 break;
3462
3463#if BG_IMAGE_FROM_ROOT
3383 case URxvt_Color_tint: 3464 case URxvt_Color_tint:
3384 process_color_seq (op, Color_tint, str, resp); 3465 process_color_seq (op, Color_tint, str, resp);
3385 { 3466 {
3386 bool changed = false; 3467 bool changed = false;
3387 3468
3388 if (ISSET_PIXCOLOR (Color_tint)) 3469 if (ISSET_PIXCOLOR (Color_tint))
3389 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3390 else
3391 changed = bgPixmap.unset_tint ();
3392 3471
3393 if (changed) 3472 if (changed)
3394 update_background (); 3473 update_background ();
3395 } 3474 }
3396 3475
… …
3400#if BG_IMAGE_FROM_FILE 3479#if BG_IMAGE_FROM_FILE
3401 case Rxvt_Pixmap: 3480 case Rxvt_Pixmap:
3402 if (!strcmp (str, "?")) 3481 if (!strcmp (str, "?"))
3403 { 3482 {
3404 char str[256]; 3483 char str[256];
3484 int h_scale = fimage.h_scale;
3485 int v_scale = fimage.v_scale;
3486 int h_align = fimage.h_align;
3487 int v_align = fimage.v_align;
3405 3488
3406 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3489 sprintf (str, "[%dx%d+%d+%d]",
3407 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3490 h_scale, v_scale,
3408 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3491 h_align, v_align);
3409 process_xterm_seq (XTerm_title, str, CHAR_ST); 3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3410 } 3493 }
3411 else 3494 else
3412 { 3495 {
3413 int changed = 0; 3496 bool changed = false;
3414 3497
3415 if (*str != ';') 3498 if (*str != ';')
3416 { 3499 {
3417 /* reset to default scaling :*/ 3500 try
3418 bgPixmap.unset_geometry (); 3501 {
3419 if (bgPixmap.set_file (str)) /* change pixmap */ 3502 fimage.set_file_geometry (this, str);
3420 changed++; 3503 changed = true;
3421 str = strchr (str, ';'); 3504 }
3422 if (str == NULL) 3505 catch (const class rxvt_failure_exception &e)
3423 bgPixmap.set_defaultGeometry (); 3506 {
3507 }
3424 } 3508 }
3425 3509 else
3426 while (str)
3427 { 3510 {
3428 str++; 3511 str++;
3429 if (bgPixmap.set_geometry (str)) 3512 if (fimage.set_geometry (str, true))
3430 changed++; 3513 changed = true;
3431 str = strchr (str, ';');
3432 } 3514 }
3433 3515
3434 if (changed) 3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 parent_x = x;
3523 parent_y = y;
3524 }
3435 update_background (); 3525 update_background ();
3526 }
3436 } 3527 }
3437 break; 3528 break;
3438#endif 3529#endif
3439 3530
3440 case XTerm_logfile: 3531 case XTerm_logfile:
… …
3510 break; 3601 break;
3511#endif 3602#endif
3512 3603
3513#if ENABLE_PERL 3604#if ENABLE_PERL
3514 case URxvt_perl: 3605 case URxvt_perl:
3515 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3606 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3516 ; // no responses yet
3517 break; 3607 break;
3518#endif 3608#endif
3519 } 3609 }
3520} 3610}
3521/*----------------------------------------------------------------------*/ 3611/*----------------------------------------------------------------------*/
… …
3528 * 's' = save 3618 * 's' = save
3529 * 'r' = restore 3619 * 'r' = restore
3530 * 't' = toggle 3620 * 't' = toggle
3531 * so no need for fancy checking 3621 * so no need for fancy checking
3532 */ 3622 */
3533int 3623int ecb_cold
3534rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3535{ 3625{
3536 int state; 3626 int state;
3537 3627
3538 if (mode == 's') 3628 if (mode == 's')
3539 { 3629 {
3540 SavedModes |= (priv_modes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3541 return -1; 3634 return -1;
3542 } 3635 }
3543 else 3636 else
3544 { 3637 {
3545 if (mode == 'r') 3638 if (mode == 'r')
3546 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3547 else 3640 else
3548 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3549 set_privmode (bit, state); 3642
3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3550 } 3647 }
3551 3648
3552 return state; 3649 return state;
3553} 3650}
3554 3651
3555/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3556void 3653void
3557rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3654rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3558{ 3655{
3559 unsigned int i, j; 3656 unsigned int i, j;
3560 int state; 3657 int state;
3561 3658
3562 static const struct 3659 static const struct
3563 { 3660 {
3564 const int argval; 3661 const int argval;
3565 const unsigned long bit; 3662 const unsigned long bit;
3566 } argtopriv[] = { 3663 } argtopriv[] = {
3567 { 1, PrivMode_aplCUR }, 3664 { 1, PrivMode_aplCUR }, // DECCKM
3568 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3569 { 3, PrivMode_132 }, 3666 { 3, PrivMode_132 }, // DECCOLM
3570 { 4, PrivMode_smoothScroll }, 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3571 { 5, PrivMode_rVideo }, 3668 { 5, PrivMode_rVideo }, // DECSCNM
3572 { 6, PrivMode_relOrigin }, 3669 { 6, PrivMode_relOrigin }, // DECOM
3573 { 7, PrivMode_Autowrap }, 3670 { 7, PrivMode_Autowrap }, // DECAWM
3574 // 8, bi-directional support mode 3671 // 8, auto-repeat keys // DECARM
3575 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3576 // 18, 19 printing-related 3673 // 18 end FF to printer after print screen
3674 // 19 Print screen prints full screen/scroll region
3577 { 25, PrivMode_VisibleCursor }, 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3578#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3579 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3580#endif 3678#endif
3581 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3680 // 38, tektronix mode // DECTEK
3582 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3583 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3584 // 45 margin bell NYI 3683 // 45 margin bell NYI
3585 // 46 start logging 3684 // 46 start logging
3586 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3587 { 66, PrivMode_aplKP }, 3686 { 66, PrivMode_aplKP }, // DECNKM
3588#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3589 { 67, PrivMode_BackSpace }, 3688 { 67, PrivMode_BackSpace }, // DECBKM
3590#endif 3689#endif
3591 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3592 { 1002, PrivMode_MouseBtnEvent }, 3691 { 1002, PrivMode_MouseBtnEvent },
3593 { 1003, PrivMode_MouseAnyEvent }, 3692 { 1003, PrivMode_MouseAnyEvent },
3693#if ENABLE_FRILLS
3694 { 1005, PrivMode_ExtModeMouse },
3695#endif
3594 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3696 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3595 { 1011, PrivMode_Keypress }, // rxvt extension 3697 { 1011, PrivMode_Keypress }, // rxvt extension
3698#if ENABLE_FRILLS
3699 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3700#endif
3596 // 1035 enable modifiers for alt, numlock NYI 3701 // 1035 enable modifiers for alt, numlock NYI
3597 // 1036 send ESC for meta keys NYI 3702 // 1036 send ESC for meta keys NYI
3598 // 1037 send DEL for keypad delete NYI 3703 // 1037 send DEL for keypad delete NYI
3599 { 1047, PrivMode_Screen }, 3704 { 1047, PrivMode_Screen },
3600 // 1048 save and restore cursor 3705 // 1048 save and restore cursor, implemented in code
3601 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3706 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3602 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3707 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3603 { 2004, PrivMode_BracketPaste }, 3708 { 2004, PrivMode_BracketPaste },
3604 }; 3709 };
3605 3710
… …
3615 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3616 { 3721 {
3617 state = -1; 3722 state = -1;
3618 3723
3619 /* basic handling */ 3724 /* basic handling */
3620 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3621 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3622 { 3727 {
3623 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3624 break; 3729 break;
3625 } 3730 }
… …
3633 3738
3634 scr_touch (true); 3739 scr_touch (true);
3635 break; 3740 break;
3636#endif 3741#endif
3637 case 1048: /* alternative cursor save */ 3742 case 1048: /* alternative cursor save */
3638 case 1049:
3639 if (option (Opt_secondaryScreen)) 3743 if (option (Opt_secondaryScreen))
3640 if (mode == 0) 3744 if (mode == 0)
3641 scr_cursor (RESTORE); 3745 scr_cursor (RESTORE);
3642 else if (mode == 1) 3746 else if (mode == 1)
3643 scr_cursor (SAVE); 3747 scr_cursor (SAVE);
… …
3652 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3653 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3654 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3655 * within VT52 mode 3759 * within VT52 mode
3656 */ 3760 */
3657 set_privmode (PrivMode_vt52, 1); 3761 priv_modes |= PrivMode_vt52;
3658 break; 3762 break;
3659 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3660 if (priv_modes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3661 {
3662 scr_poweron ();
3663 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3664 }
3665 break; 3766 break;
3666 case 4: /* smooth scrolling */ 3767 case 4: /* smooth scrolling */
3667 set_option (Opt_jumpScroll, !state); 3768 set_option (Opt_jumpScroll, !state);
3668 break; 3769 break;
3669 case 5: /* reverse video */ 3770 case 5: /* reverse video */
… …
3680 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3681 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3682 break; 3783 break;
3683#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3684 case scrollBar_esc: 3785 case scrollBar_esc:
3685 if (scrollBar.map (state)) 3786 scrollBar.map (state);
3686 {
3687 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3688 scr_touch (true); 3788 scr_touch (true);
3689 }
3690 break; 3789 break;
3691#endif 3790#endif
3692 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3693 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3694 break; 3793 break;
… …
3707 case 1003: 3806 case 1003:
3708 if (state) 3807 if (state)
3709 { 3808 {
3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3809 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3711 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3810 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3811 mouse_row = mouse_col = 0;
3712 vt_emask_mouse = PointerMotionMask; 3812 vt_emask_mouse = PointerMotionMask;
3713 } 3813 }
3714 else 3814 else
3715 vt_emask_mouse = NoEventMask; 3815 vt_emask_mouse = NoEventMask;
3816
3716 vt_select_input (); 3817 vt_select_input ();
3717 break; 3818 break;
3718 case 1010: /* scroll to bottom on TTY output inhibit */ 3819 case 1010: /* scroll to bottom on TTY output inhibit */
3719 set_option (Opt_scrollTtyOutput, !state); 3820 set_option (Opt_scrollTtyOutput, !state);
3720 break; 3821 break;
3721 case 1011: /* scroll to bottom on key press */ 3822 case 1011: /* scroll to bottom on key press */
3722 set_option (Opt_scrollTtyKeypress, state); 3823 set_option (Opt_scrollTtyKeypress, state);
3723 break; 3824 break;
3724 case 1047: /* secondary screen w/ clearing last */ 3825 case 1047: /* secondary screen w/ clearing last */
3725 if (option (Opt_secondaryScreen)) 3826 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3827 if (!state)
3727 scr_erase_screen (2); 3828 scr_erase_screen (2);
3829
3728 scr_change_screen (state); 3830 scr_change_screen (state);
3729 break; 3831 break;
3730 case 1049: /* secondary screen w/ clearing first */ 3832 case 1049: /* secondary screen w/ clearing first */
3833 if (option (Opt_secondaryScreen))
3834 if (state)
3835 scr_cursor (SAVE);
3836
3731 scr_change_screen (state); 3837 scr_change_screen (state);
3838
3732 if (option (Opt_secondaryScreen)) 3839 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3840 if (state)
3734 scr_erase_screen (2); 3841 scr_erase_screen (2);
3842 else
3843 scr_cursor (RESTORE);
3735 break; 3844 break;
3736 default: 3845 default:
3737 break; 3846 break;
3738 } 3847 }
3739 } 3848 }
3740} 3849}
3741/*}}} */ 3850/*}}} */
3742 3851
3743/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3744void 3853void ecb_hot
3745rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3746{ 3855{
3747 unsigned int i; 3856 unsigned int i;
3748 short rendset; 3857 short rendset;
3749 int rendstyle; 3858 int rendstyle;
… …
3890 break; 3999 break;
3891#endif 4000#endif
3892 } 4001 }
3893 } 4002 }
3894} 4003}
3895/*}}} */
3896 4004
3897/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3898void 4005void
3899rxvt_term::process_graphics () 4006rxvt_term::set_cursor_style (int style)
3900{ 4007{
3901 unicode_t ch, cmd = cmd_getc (); 4008 if (!IN_RANGE_INC (style, 0, 4))
3902
3903 if (cmd == 'Q')
3904 {
3905 /* query graphics */
3906 tt_printf ("\033G0\012"); /* no graphics */
3907 return; 4009 return;
3908 } 4010
3909 /* swallow other graphics sequences until terminating ':' */ 4011 set_option (Opt_cursorUnderline, style >= 3);
3910 do 4012
3911 ch = cmd_getc (); 4013#ifdef CURSOR_BLINK
3912 while (ch != ':'); 4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
3913} 4019}
3914/*}}} */ 4020/*}}} */
3915 4021
3916/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3917 4023
… …
3933 4039
3934/* ---------------------------------------------------------------------- */ 4040/* ---------------------------------------------------------------------- */
3935/* Write data to the pty as typed by the user, pasted with the mouse, 4041/* Write data to the pty as typed by the user, pasted with the mouse,
3936 * or generated by us in response to a query ESC sequence. 4042 * or generated by us in response to a query ESC sequence.
3937 */ 4043 */
3938const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4044static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3939 4045
3940void 4046void
3941rxvt_term::tt_write (const char *data, unsigned int len) 4047rxvt_term::tt_write (const char *data, unsigned int len)
3942{ 4048{
3943 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4049 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3948 4054
3949 if (v_buflen == 0) 4055 if (v_buflen == 0)
3950 { 4056 {
3951 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4057 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3952 4058
4059 max_it (written, 0);
4060
3953 if ((unsigned int)written == len) 4061 if (written == len)
3954 return; 4062 return;
3955 4063
3956 data += written; 4064 data += written;
3957 len -= written; 4065 len -= written;
3958 } 4066 }
3959 4067
3960 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4068 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3961 4069
3962 memcpy (v_buffer + v_buflen, data, len); 4070 memcpy (v_buffer + v_buflen, data, len);
3963 v_buflen += len; 4071 v_buflen += len;
3964 4072
3965 pty_ev.set (ev::READ | ev::WRITE); 4073 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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