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.427 by root, Wed Nov 5 15:44:04 2008 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 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 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
400{ 416{
401 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
402 KeySym keysym; 418 KeySym keysym;
403 int valid_keysym; 419 int valid_keysym;
… …
416 */ 432 */
417 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
420 436
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; 437 kbuf[0] = 0;
428 438
429#ifdef USE_XIM 439#if USE_XIM
430 if (Input_Context) 440 if (Input_Context)
431 { 441 {
432 Status status_return; 442 Status status_return;
433 443
434#if 0 444#if 0
… …
505#ifdef PAGING_CONTEXT_LINES 515#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 516 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 517#else
508 lnsppg = nrow * 4 / 5; 518 lnsppg = nrow * 4 / 5;
509#endif 519#endif
520 max_it (lnsppg, 1);
521
510 if (keysym == XK_Prior) 522 if (keysym == XK_Prior)
511 { 523 {
512 scr_page (UP, lnsppg); 524 scr_page (lnsppg);
513 return; 525 return;
514 } 526 }
515 else if (keysym == XK_Next) 527 else if (keysym == XK_Next)
516 { 528 {
517 scr_page (DN, lnsppg); 529 scr_page (-lnsppg);
518 return; 530 return;
519 } 531 }
520 } 532 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 533#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 534 if (IS_SCROLL_MOD)
523 { 535 {
524 if (keysym == XK_Up) 536 if (keysym == XK_Up)
525 { 537 {
526 scr_page (UP, 1); 538 scr_page (1);
527 return; 539 return;
528 } 540 }
529 else if (keysym == XK_Down) 541 else if (keysym == XK_Down)
530 { 542 {
531 scr_page (DN, 1); 543 scr_page (-1);
532 return; 544 return;
533 } 545 }
534 } 546 }
535#endif 547#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 548#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 549 if (IS_SCROLL_MOD)
538 { 550 {
539 if (keysym == XK_Home) 551 if (keysym == XK_Home)
540 { 552 {
541 scr_move_to (0, 1); 553 scr_changeview (top_row);
542 return; 554 return;
543 } 555 }
544 else if (keysym == XK_End) 556 else if (keysym == XK_End)
545 { 557 {
546 scr_move_to (1, 1); 558 scr_changeview (0);
547 return; 559 return;
548 } 560 }
549 } 561 }
550#endif 562#endif
551 } 563 }
… …
567 selection_request (ev.time); 579 selection_request (ev.time);
568 return; 580 return;
569#if TODO 581#if TODO
570 /* rxvt extras */ 582 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 583 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 584 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 585 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 586 return;
577#endif 587#endif
578 } 588 }
579 } 589 }
580 } 590 }
581 591
592 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
593 {
594 if (keysym == XK_v)
595 selection_request (ev.time, Sel_Clipboard);
596 else if (selection.len > 0)
597 {
598 free (selection.clip_text);
599 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
600 selection.clip_len = selection.len;
601 selection_grab (CurrentTime, true);
602 }
603
604 return;
605 }
606
582#if ENABLE_FRILLS || ISO_14755 607#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 608 // ISO 14755 support
584 if (shft && ctrl) 609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 610 {
586 int hv; 611 int hv;
587 612
588 if (iso14755buf & ISO_14755_51 613 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 614 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 644 scr_overlay_off ();
620# endif 645# endif
621 iso14755buf = 0; 646 iso14755buf = 0;
622 } 647 }
623 } 648 }
649 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 650 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 651 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 652 if (!(iso14755buf & ISO_14755_STARTED))
627 { 653 {
628 iso14755buf |= ISO_14755_STARTED; 654 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 655# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 656 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 670 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 671 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 672 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 673 unsigned int newlen = 1;
648 674
675 if (ev.state & ModNumLockMask)
676 kp = false;
677
649 switch (translate_keypad (keysym, kp)) 678 keysym = translate_keypad (keysym, kp);
679
680 switch (keysym)
650 { 681 {
651#ifndef NO_BACKSPACE_KEY 682#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 683 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 684 if (priv_modes & PrivMode_HaveBackSpace)
654 { 685 {
… …
773 } 804 }
774 805
775 if (newlen) 806 if (newlen)
776 len = strlen (kbuf); 807 len = strlen (kbuf);
777 808
809 if (len > 0)
810 {
778 /* 811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
779 * Pass meta for all function keys, if 'meta' option set 824 * Pass meta for all function keys, if 'meta' option set
780 */ 825 */
781#ifdef META8_OPTION 826#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 827 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 828 kbuf[len - 1] |= 0x80;
784#endif 829#endif
830 }
785 831
786 } 832 }
787 else if (ctrl && keysym == XK_minus) 833 else if (ctrl && keysym == XK_minus)
788 { 834 {
789 len = 1; 835 len = 1;
… …
823 { 869 {
824 view_start = 0; 870 view_start = 0;
825 want_refresh = 1; 871 want_refresh = 1;
826 } 872 }
827 873
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 */ 874 /* escape prefix */
843 if (meta 875 if (meta
844#ifdef META8_OPTION 876#ifdef META8_OPTION
845 && meta_char == C0_ESC 877 && meta_char == C0_ESC
846#endif 878#endif
… …
851 } 883 }
852 884
853 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
854} 886}
855 887
856void 888void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 889rxvt_term::key_release (XKeyEvent &ev)
858{ 890{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 891#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 892 KeySym keysym;
861 893
… …
881 commit_iso14755 (); 913 commit_iso14755 ();
882 914
883 return; 915 return;
884 } 916 }
885 917
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 918 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 919 if (i[0] == keysym)
888 { 920 {
889 iso14755buf = ISO_14755_51 | i[1]; 921 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 922 commit_iso14755 ();
891 923
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 960 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 961 mouse_slip_wheel_speed = 0;
930#endif 962#endif
931} 963}
932 964
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 965void
967rxvt_term::flush () 966rxvt_term::flush ()
968{ 967{
969 flush_ev.stop (); 968 flush_ev.stop ();
970 969
971#ifdef HAVE_BG_PIXMAP 970#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 971 if (bg_flags & BG_NEEDS_REFRESH)
973 { 972 {
974// scr_clear (true); This needs to be researched further! 973 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 974 scr_touch (false);
976 } 975 }
977#endif 976#endif
978 977
979 if (want_refresh) 978 if (want_refresh)
… …
1016 while (row < end_row); 1015 while (row < end_row);
1017 } 1016 }
1018 1017
1019 scr_refresh (); 1018 scr_refresh ();
1020 scrollBar.show (1); 1019 scrollBar.show (1);
1021#ifdef USE_XIM 1020#if USE_XIM
1022 IMSendSpot (); 1021 im_send_spot ();
1023#endif 1022#endif
1024 } 1023 }
1025 1024
1026 display->flush (); 1025 display->flush ();
1027} 1026}
1028 1027
1029/* checks wether a refresh is requested and starts the refresh timer */ 1028/* checks whether a refresh is requested and starts the refresh timer */
1030void 1029void
1031rxvt_term::refresh_check () 1030rxvt_term::refresh_check ()
1032{ 1031{
1033 if (want_refresh && !flush_ev.is_active ()) 1032 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1033 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1043 refresh_count = 0;
1045 flush (); 1044 flush ();
1046} 1045}
1047 1046
1048#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
1048void
1049rxvt_term::cursor_blink_reset ()
1050{
1051 if (hidden_cursor)
1052 {
1053 hidden_cursor = 0;
1054 want_refresh = 1;
1055 }
1056
1057 if (option (Opt_cursorBlink))
1058 cursor_blink_ev.again ();
1059 else
1060 cursor_blink_ev.stop ();
1061}
1062
1049void 1063void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1064rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1065{
1052 hidden_cursor = !hidden_cursor; 1066 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1067 want_refresh = 1;
… …
1072 1086
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1088void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1090{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1091 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1092 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1093 {
1080 want_refresh = 1; 1094 want_refresh = 1;
1081 refresh_check (); 1095 refresh_check ();
1082 } 1096 }
1083 else 1097 else
… …
1087 1101
1088#ifdef SELECTION_SCROLLING 1102#ifdef SELECTION_SCROLLING
1089void 1103void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1104rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1105{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1106 if (scr_page (scroll_selection_lines))
1093 { 1107 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1108 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1109 want_refresh = 1;
1096 refresh_check (); 1110 refresh_check ();
1097 } 1111 }
… …
1102 1116
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1117#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1118void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1119rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1120{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1121 if (scr_page (mouse_slip_wheel_speed))
1108 { 1122 {
1109 want_refresh = 1; 1123 want_refresh = 1;
1110 refresh_check (); 1124 refresh_check ();
1111 } 1125 }
1112 1126
… …
1128 // this should really be sched_yield(), but the linux guys thought 1142 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1143 // 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 1144 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1145 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1146 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1147 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1148 // we just nanosleep a bit and hope for the best.
1135 1149
1136 struct timespec ts = { 0, 1000 }; 1150 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1151 nanosleep (&ts, 0);
1138 1152
… …
1144 { 1158 {
1145 } 1159 }
1146} event_handler; 1160} event_handler;
1147#endif 1161#endif
1148 1162
1163/* make sure all the cmd data is at beginning of cmdbuf */
1164void
1165rxvt_term::cmdbuf_reify ()
1166{
1167 if (cmdbuf_ptr == cmdbuf_base)
1168 return;
1169
1170 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1171
1172 memmove (cmdbuf_base, cmdbuf_ptr, used);
1173 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + used;
1175
1176}
1177
1178#if defined (KEYSYM_RESOURCE)
1179void
1180rxvt_term::cmdbuf_append (const char *str, size_t count)
1181{
1182 cmdbuf_reify ();
1183
1184 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1185
1186 if (count > avail)
1187 return;
1188
1189 memcpy (cmdbuf_endp, str, count);
1190 cmdbuf_endp += count;
1191
1192 cmd_parse ();
1193}
1194#endif
1195
1149bool 1196bool
1150rxvt_term::pty_fill () 1197rxvt_term::pty_fill ()
1151{ 1198{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1199 cmdbuf_reify ();
1153 1200
1154 if (CBUFSIZ == n) 1201 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1202
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1203 if (!avail)
1157 n = 0;
1158 } 1204 {
1159 1205 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1206 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1207 cmdbuf_endp = cmdbuf_ptr;
1208 avail = CBUFSIZ;
1209 }
1163 1210
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1211 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1212
1166 if (r > 0) 1213 if (r > 0)
1167 { 1214 {
1168 cmdbuf_endp += r; 1215 cmdbuf_endp += r;
1169 return true; 1216 return true;
… …
1200 pty_write (); 1247 pty_write ();
1201 1248
1202 refresh_check (); 1249 refresh_check ();
1203} 1250}
1204 1251
1205void 1252void ecb_cold
1206rxvt_term::pointer_unblank () 1253rxvt_term::pointer_unblank ()
1207{ 1254{
1208 XDefineCursor (dpy, vt, TermWin_cursor); 1255 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor (); 1256 recolour_cursor ();
1210 1257
… …
1215 pointer_ev.start (pointerBlankDelay); 1262 pointer_ev.start (pointerBlankDelay);
1216#endif 1263#endif
1217} 1264}
1218 1265
1219#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1220void 1267void ecb_cold
1221rxvt_term::pointer_blank () 1268rxvt_term::pointer_blank ()
1222{ 1269{
1223 if (!option (Opt_pointerBlank)) 1270 if (!option (Opt_pointerBlank))
1224 return; 1271 return;
1225 1272
… …
1227 XFlush (dpy); 1274 XFlush (dpy);
1228 1275
1229 hidden_pointer = 1; 1276 hidden_pointer = 1;
1230} 1277}
1231 1278
1232void 1279void ecb_cold
1233rxvt_term::pointer_cb (ev::timer &w, int revents) 1280rxvt_term::pointer_cb (ev::timer &w, int revents)
1234{ 1281{
1235 make_current (); 1282 make_current ();
1236 1283
1237 pointer_blank (); 1284 pointer_blank ();
… …
1243{ 1290{
1244 int button_number, key_state = 0; 1291 int button_number, key_state = 0;
1245 int x, y; 1292 int x, y;
1246 int code = 32; 1293 int code = 32;
1247 1294
1248 x = Pixel2Col (ev.x); 1295 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1296 y = Pixel2Row (ev.y) + 1;
1297
1250 if (ev.type == MotionNotify) 1298 if (ev.type == MotionNotify)
1251 { 1299 {
1252 if (x == mouse_row && y == mouse_col) 1300 if (x == mouse_row && y == mouse_col)
1253 return; 1301 return;
1302
1254 mouse_row = x; 1303 mouse_row = x;
1255 mouse_col = y; 1304 mouse_col = y;
1256 code += 32; 1305 code += 32;
1257 } 1306 }
1258 1307
… …
1261 else 1310 else
1262 { 1311 {
1263 button_number = MEvent.button - Button1; 1312 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1313 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1314 if (button_number >= 3)
1266 button_number += (64 - 3); 1315 button_number += 64 - 3;
1267 } 1316 }
1268 1317
1269 if (priv_modes & PrivMode_MouseX10) 1318 if (priv_modes & PrivMode_MouseX10)
1270 { 1319 {
1271 /* 1320 /*
… …
1303 fputc ('A', stderr); 1352 fputc ('A', stderr);
1304 if (key_state & 32) 1353 if (key_state & 32)
1305 fputc ('2', stderr); 1354 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1355 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1356 button_number,
1308 x + 1, 1357 x,
1309 y + 1); 1358 y);
1310#endif 1359#endif
1311 1360
1361#if ENABLE_FRILLS
1362 if (priv_modes & PrivMode_ExtMouseRight)
1363 tt_printf ("\033[%d;%d;%dM",
1364 code + button_number + key_state,
1365 x,
1366 y);
1367 else if (priv_modes & PrivMode_ExtModeMouse)
1368 tt_printf ("\033[M%c%lc%lc",
1369 code + button_number + key_state,
1370 wint_t (32 + x),
1371 wint_t (32 + y));
1372 else
1373#endif
1312 tt_printf ("\033[M%c%c%c", 1374 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1375 code + button_number + key_state,
1314 (32 + x + 1), 1376 32 + x,
1315 (32 + y + 1)); 1377 32 + y);
1316} 1378}
1317 1379
1318/*{{{ process an X event */ 1380/*{{{ process an X event */
1319void 1381void ecb_hot
1320rxvt_term::x_cb (XEvent &ev) 1382rxvt_term::x_cb (XEvent &ev)
1321{ 1383{
1322 make_current (); 1384 make_current ();
1323 1385
1324 dLocal (Display *, dpy); 1386 dLocal (Display *, dpy);
… …
1422 && ev.xfocus.mode != NotifyGrab) 1484 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1485 focus_out ();
1424 break; 1486 break;
1425 1487
1426 case ConfigureNotify: 1488 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent)
1431 { 1490 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1492 ;
1493
1494 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1495
1496 bool moved = false;
1497#ifdef HAVE_BG_PIXMAP
1498 if (bg_window_position_sensitive ())
1499 {
1500 want_position_change = true;
1501 if (bg_img == 0)
1502 moved = true;
1503 }
1504#endif
1505
1506 if (want_position_change)
1507 {
1508 int x, y;
1509
1510 if (ev.xconfigure.send_event)
1511 {
1512 x = ev.xconfigure.x;
1513 y = ev.xconfigure.y;
1514 }
1515 else
1516 get_window_origin (x, y);
1517
1518 if (x != parent_x || y != parent_y)
1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 moved = true;
1524 }
1525 }
1434 1526
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1528 {
1437 seen_resize = 1; 1529 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1531 }
1440 else 1532 else
1441 { 1533 {
1442#ifdef HAVE_BG_PIXMAP 1534#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1535 if (moved)
1446 update_background (); 1536 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1537#endif
1451 } 1538 }
1452 1539
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1540 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1541 }
1455 break; 1542 break;
1456 1543
1457 case PropertyNotify: 1544 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1546 break;
1464 1547
1465 case SelectionClear: 1548 case SelectionClear:
1466 selection_clear (); 1549 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1550 break;
1473 1551
1474 case SelectionRequest: 1552 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1553 selection_send (ev.xselectionrequest);
1476 break; 1554 break;
1477 1555
1478 case MapNotify: 1556 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1557#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1558 // This is needed at startup for the case of no window manager
1481 * non-reparenting window manager. In those cases we never get first 1559 // or a non-reparenting window manager and also because we
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1560 // defer bg image updates if the window is not mapped. The
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1561 // short delay is to optimize for multiple ConfigureNotify
1484 * reparenting. 1562 // events at startup when the window manager reparents the
1485 * We should not render background immidiately, as there could be several 1563 // window, so as to perform the computation after we have
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1564 // received all of them.
1487 * by scheduling background redraw as soon as we can, but giving a short 1565 if (bg_img == 0)
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025); 1566 update_background_ev.start (0.025);
1494#endif 1567#endif
1495 mapped = 1; 1568 mapped = 1;
1496#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1570 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1513 { 1586 {
1514 do 1587 do
1515 { 1588 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1591 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1592 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1593
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1594 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1595
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1597 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1600 }
1528 1601
1529 want_refresh = 1; 1602 want_refresh = 1;
1530 } 1603 }
1531 else 1604 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1611 ;
1539 1612
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1613 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1614 {
1542 scrollBar.state = STATE_IDLE; 1615 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1616 scrollBar.show (0);
1544 } 1617 }
1545 } 1618 }
1546 break; 1619 break;
1547 1620
… …
1589 1662
1590#ifdef SELECTION_SCROLLING 1663#ifdef SELECTION_SCROLLING
1591 if (ev.xbutton.y < int_bwidth 1664 if (ev.xbutton.y < int_bwidth
1592 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1665 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1593 { 1666 {
1667 page_dirn scroll_selection_dir;
1594 int dist; 1668 int dist;
1595 1669
1596 /* don't clobber the current delay if we are 1670 /* don't clobber the current delay if we are
1597 * already in the middle of scrolling. 1671 * already in the middle of scrolling.
1598 */ 1672 */
… …
1613 dist = int_bwidth - ev.xbutton.y; 1687 dist = int_bwidth - ev.xbutton.y;
1614 } 1688 }
1615 else 1689 else
1616 { 1690 {
1617 scroll_selection_dir = DN; 1691 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1692 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1693 }
1620 1694
1621 scroll_selection_lines = Pixel2Height (dist) 1695 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1696 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1697 + 1;
1624 min_it (scroll_selection_lines, 1698 min_it (scroll_selection_lines,
1625 SELECTION_SCROLL_MAX_LINES); 1699 SELECTION_SCROLL_MAX_LINES);
1700 scroll_selection_lines *= scroll_selection_dir;
1626 } 1701 }
1627 else 1702 else
1628 { 1703 {
1629 /* we are within the text window, so we 1704 /* we are within the text window, so we
1630 * shouldn't be scrolling 1705 * shouldn't be scrolling
… …
1635#ifdef MOUSE_THRESHOLD 1710#ifdef MOUSE_THRESHOLD
1636 } 1711 }
1637#endif 1712#endif
1638 } 1713 }
1639 } 1714 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1715 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1716 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1718 MotionNotify, &ev))
1644 ; 1719 ;
1645 1720
1646 XQueryPointer (dpy, scrollBar.win, 1721 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1722 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1723 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1724 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1725 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1726 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1727 scrollBar.size ());
1653 want_refresh = 1; 1728 want_refresh = 1;
1654 scrollBar.show (1); 1729 scrollBar.show (1);
1655 } 1730 }
1656 break; 1731 break;
1657 } 1732 }
1658 1733
1659#if defined(CURSOR_BLINK) 1734#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1735 if (ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again (); 1736 cursor_blink_reset ();
1669 }
1670#endif 1737#endif
1671 1738
1672#if defined(POINTER_BLANK) 1739#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1740 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1741 {
… …
1684#endif 1751#endif
1685 1752
1686 refresh_check (); 1753 refresh_check ();
1687} 1754}
1688 1755
1689void 1756#if ENABLE_FRILLS
1757void ecb_cold
1690rxvt_term::set_urgency (bool enable) 1758rxvt_term::set_urgency (bool enable)
1691{ 1759{
1692 if (enable == urgency_hint) 1760 if (enable == urgency_hint)
1693 return; 1761 return;
1694 1762
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1763 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1764 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1765 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1766 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1767 urgency_hint = enable;
1768 XFree (h);
1700 } 1769 }
1701} 1770}
1771#endif
1702 1772
1703void 1773void ecb_cold
1704rxvt_term::focus_in () 1774rxvt_term::focus_in ()
1705{ 1775{
1706 if (!focus) 1776 if (!focus)
1707 { 1777 {
1708 focus = 1; 1778 focus = 1;
1709 want_refresh = 1; 1779 want_refresh = 1;
1710 1780
1711#if USE_XIM 1781#if USE_XIM
1712 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1713 { 1783 {
1714 IMSetPosition (); 1784 im_set_position ();
1715 XSetICFocus (Input_Context); 1785 XSetICFocus (Input_Context);
1716 } 1786 }
1717#endif 1787#endif
1718#if CURSOR_BLINK 1788#if CURSOR_BLINK
1719 if (option (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
… …
1733 1803
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1804 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 } 1805 }
1736} 1806}
1737 1807
1738void 1808void ecb_cold
1739rxvt_term::focus_out () 1809rxvt_term::focus_out ()
1740{ 1810{
1741 if (focus) 1811 if (focus)
1742 { 1812 {
1743 focus = 0; 1813 focus = 0;
… …
1776 1846
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 } 1848 }
1779} 1849}
1780 1850
1781void 1851void ecb_cold
1782rxvt_term::update_fade_color (unsigned int idx) 1852rxvt_term::update_fade_color (unsigned int idx)
1783{ 1853{
1784#if OFF_FOCUS_FADING 1854#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade]) 1855 if (rs[Rs_fade])
1786 { 1856 {
… …
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 } 1860 }
1791#endif 1861#endif
1792} 1862}
1793 1863
1794#if ENABLE_TRANSPARENCY || ENABLE_PERL 1864#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1795void 1865void ecb_hot
1796rxvt_term::rootwin_cb (XEvent &ev) 1866rxvt_term::rootwin_cb (XEvent &ev)
1797{ 1867{
1798 make_current (); 1868 make_current ();
1799 1869
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1870 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1871 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return; 1872 return;
1803 1873
1804# if ENABLE_TRANSPARENCY
1805 switch (ev.type) 1874 switch (ev.type)
1806 { 1875 {
1807 case PropertyNotify: 1876 case PropertyNotify:
1808 /* 1877 /*
1809 * if user used some Esetroot compatible prog to set the root bg, 1878 * if user used some Esetroot compatible prog to set the root bg,
1810 * use the property to determine the pixmap. We use it later on. 1879 * use the property to determine the pixmap. We use it later on.
1811 */ 1880 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1881 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1882 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1883 {
1815 bgPixmap.set_root_pixmap (); 1884#if BG_IMAGE_FROM_ROOT
1885 if (option (Opt_transparent))
1886 {
1887 rxvt_img::new_from_root (this)->replace (root_img);
1816 update_background (); 1888 update_background ();
1889 }
1890#endif
1891 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1817 } 1892 }
1818 1893
1819 break; 1894 break;
1820 } 1895 }
1821# endif
1822 1896
1823 refresh_check (); 1897 refresh_check ();
1824} 1898}
1825#endif 1899#endif
1826 1900
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1933 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1934 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1935#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1936 if (ev.button == MEvent.button && clickintime)
1863 { 1937 {
1864 /* same button, within alloted time */ 1938 /* same button, within allowed time */
1865 MEvent.clicks++; 1939 MEvent.clicks++;
1866 1940
1867 if (MEvent.clicks > 1) 1941 if (MEvent.clicks > 1)
1868 { 1942 {
1869 /* only report double clicks */ 1943 /* only report double clicks */
… …
1950 if (scrollBar.upButton (ev.y)) 2024 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */ 2025 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y)) 2026 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */ 2027 direction = DN; /* down */
1954 2028
1955 scrollBar.state = STATE_IDLE; 2029 scrollBar.state = SB_STATE_IDLE;
1956 /* 2030 /*
1957 * Rxvt-style scrollbar: 2031 * Rxvt-style scrollbar:
1958 * move up if mouse is above slider 2032 * move up if mouse is above slider
1959 * move dn if mouse is below slider 2033 * move dn if mouse is below slider
1960 * 2034 *
… …
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2073 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2074#endif
2001 if (scr_page (direction, 1)) 2075 if (scr_page (direction, 1))
2002 { 2076 {
2003 if (direction == UP) 2077 if (direction == UP)
2004 scrollBar.state = STATE_UP; 2078 scrollBar.state = SB_STATE_UP;
2005 else 2079 else
2006 scrollBar.state = STATE_DOWN; 2080 scrollBar.state = SB_STATE_DOWN;
2007 } 2081 }
2008 } 2082 }
2009 else 2083 else
2010 switch (ev.button) 2084 switch (ev.button)
2011 { 2085 {
2012 case Button2: 2086 case Button2:
2013 switch (scrollBar.align) 2087 switch (scrollBar.align)
2014 { 2088 {
2015 case R_SB_ALIGN_TOP: 2089 case SB_ALIGN_TOP:
2016 csrO = 0; 2090 csrO = 0;
2017 break; 2091 break;
2018 case R_SB_ALIGN_CENTRE: 2092 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2093 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2094 break;
2021 case R_SB_ALIGN_BOTTOM: 2095 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2096 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2097 break;
2024 } 2098 }
2025 2099
2026 if (scrollBar.style == R_SB_XTERM 2100 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2101 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2102 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2103 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2104
2031 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2032 break; 2106 break;
2033 2107
2034 case Button1: 2108 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2109 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2110 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2111 /* FALLTHROUGH */
2038 2112
2039 case Button3: 2113 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2114 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2115 {
2042 if (scrollbar_above_slider (ev.y)) 2116 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2118 scr_page (UP, nrow - 1);
2045# else 2119# else
2046 scr_page (UP, nrow / 4); 2120 scr_page (UP, nrow / 4);
2047# endif 2121# endif
2048 else if (scrollbar_below_slider (ev.y)) 2122 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2123# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2124 scr_page (DN, nrow - 1);
2051# else 2125# else
2052 scr_page (DN, nrow / 4); 2126 scr_page (DN, nrow / 4);
2053# endif 2127# endif
2054 else 2128 else
2055 scrollBar.state = STATE_MOTION; 2129 scrollBar.state = SB_STATE_MOTION;
2056 } 2130 }
2057 else 2131 else
2058 { 2132 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2133 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2134 (nrow
2061 * scrollbar_position (ev.y) 2135 * scrollBar.position (ev.y)
2062 / scrollBar.size ())); 2136 / scrollBar.size ()));
2063 } 2137 }
2064 2138
2065 break; 2139 break;
2066 } 2140 }
… …
2077 2151
2078 csrO = 0; /* reset csr Offset */ 2152 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2153 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2154 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2155
2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2156 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2157 {
2084 scrollBar.state = STATE_IDLE; 2158 scrollBar.state = SB_STATE_IDLE;
2085 scrollBar.show (0); 2159 scrollBar.show (0);
2086 } 2160 }
2087 2161
2088#ifdef SELECTION_SCROLLING 2162#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2163 sel_scroll_ev.stop();
… …
2139 case Button3: 2213 case Button3:
2140 selection_make (ev.time); 2214 selection_make (ev.time);
2141 break; 2215 break;
2142 2216
2143 case Button2: 2217 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2218 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2219 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2220 break;
2147 2221
2148#ifdef MOUSE_WHEEL 2222#ifdef MOUSE_WHEEL
2149 case Button4: 2223 case Button4:
2150 case Button5: 2224 case Button5:
2151 { 2225 {
2152 int i; 2226 int lines;
2153 page_dirn v; 2227 page_dirn dirn;
2154 2228
2155 v = ev.button == Button4 ? UP : DN; 2229 dirn = ev.button == Button4 ? UP : DN;
2156 2230
2157 if (ev.state & ShiftMask) 2231 if (ev.state & ShiftMask)
2158 i = 1; 2232 lines = 1;
2159 else if (option (Opt_mouseWheelScrollPage)) 2233 else if (option (Opt_mouseWheelScrollPage))
2160 i = nrow - 1; 2234 lines = nrow - 1;
2161 else 2235 else
2162 i = 5; 2236 lines = 5;
2163 2237
2164# ifdef MOUSE_SLIP_WHEELING 2238# ifdef MOUSE_SLIP_WHEELING
2165 if (ev.state & ControlMask) 2239 if (ev.state & ControlMask)
2166 { 2240 {
2167 mouse_slip_wheel_speed += v ? -1 : 1; 2241 mouse_slip_wheel_speed += dirn;
2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2242 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2170 2243
2171 if (!slip_wheel_ev.is_active ()) 2244 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2245 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2246 }
2174 else 2247 else
2175# endif 2248# endif
2176 { 2249 {
2177 scr_page (v, i); 2250 scr_page (dirn, lines);
2178 scrollBar.show (1); 2251 scrollBar.show (1);
2179 } 2252 }
2180 } 2253 }
2181 break; 2254 break;
2182#endif 2255#endif
… …
2184 } 2257 }
2185} 2258}
2186 2259
2187/*}}} */ 2260/*}}} */
2188 2261
2189void 2262void ecb_hot
2190rxvt_term::cmd_parse () 2263rxvt_term::cmd_parse ()
2191{ 2264{
2192 wchar_t ch = NOCHAR; 2265 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2266 char *seq_begin; // remember start of esc-sequence here
2194 2267
2195 for (;;) 2268 for (;;)
2196 { 2269 {
2197 if (expect_false (ch == NOCHAR)) 2270 if (ecb_unlikely (ch == NOCHAR))
2198 { 2271 {
2199 seq_begin = cmdbuf_ptr; 2272 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2273 ch = next_char ();
2201 2274
2202 if (ch == NOCHAR) 2275 if (ch == NOCHAR)
2203 break; 2276 break;
2204 } 2277 }
2205 2278
2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2279 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2280 {
2208 if (expect_false (!seen_input)) 2281 if (ecb_unlikely (!seen_input))
2209 { 2282 {
2210 seen_input = 1; 2283 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2284 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2285 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2286 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2299 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2300 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2301
2229 for (;;) 2302 for (;;)
2230 { 2303 {
2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2304 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2305 break;
2233 2306
2234 *str++ = ch; 2307 *str++ = ch;
2235 2308
2236 if (expect_false (ch == C0_LF || str >= eol)) 2309 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2310 {
2238 if (ch == C0_LF) 2311 if (ch == C0_LF)
2239 nlines++; 2312 nlines++;
2240 2313
2241 refresh_count++; 2314 refresh_count++;
… …
2313 } 2386 }
2314 } 2387 }
2315} 2388}
2316 2389
2317// read the next character 2390// read the next character
2318wchar_t 2391wchar_t ecb_hot
2319rxvt_term::next_char () NOTHROW 2392rxvt_term::next_char () NOTHROW
2320{ 2393{
2321 while (cmdbuf_ptr < cmdbuf_endp) 2394 while (cmdbuf_ptr < cmdbuf_endp)
2322 { 2395 {
2323 // assume 7-bit to be ascii ALWAYS 2396 // assume 7-bit to be ascii ALWAYS
2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2397 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2325 return *cmdbuf_ptr++; 2398 return *cmdbuf_ptr++;
2326 2399
2327 wchar_t wc; 2400 wchar_t wc;
2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2401 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2329 2402
… …
2334 break; 2407 break;
2335 } 2408 }
2336 2409
2337 if (len == (size_t)-1) 2410 if (len == (size_t)-1)
2338 { 2411 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2412 mbstate.reset (); // reset now undefined conversion state
2413 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2414 // in which case we "erroneously" return the next byte which might be valid.
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2415 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2416 }
2342 2417
2343 // assume wchar == unicode 2418 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2419 cmdbuf_ptr += len;
… …
2347 2422
2348 return NOCHAR; 2423 return NOCHAR;
2349} 2424}
2350 2425
2351// read the next octet 2426// read the next octet
2352uint32_t 2427uint32_t ecb_hot
2353rxvt_term::next_octet () NOTHROW 2428rxvt_term::next_octet () NOTHROW
2354{ 2429{
2355 return cmdbuf_ptr < cmdbuf_endp 2430 return cmdbuf_ptr < cmdbuf_endp
2356 ? (unsigned char)*cmdbuf_ptr++ 2431 ? (unsigned char)*cmdbuf_ptr++
2357 : NOCHAR; 2432 : NOCHAR;
2358} 2433}
2359 2434
2360static class out_of_input out_of_input; 2435static class out_of_input out_of_input;
2361 2436
2362/* rxvt_cmd_getc () - Return next input character */ 2437wchar_t ecb_hot
2363/*
2364 * Return the next input character after first passing any keyboard input
2365 * to the command.
2366 */
2367wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2438rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2439{
2370 wchar_t c = next_char (); 2440 wchar_t c = next_char ();
2371 2441
2372 if (c == NOCHAR) 2442 if (c == NOCHAR)
2373 throw out_of_input; 2443 throw out_of_input;
2374 2444
2375 return c; 2445 return c;
2376} 2446}
2377 2447
2378uint32_t 2448uint32_t ecb_hot
2379rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2449rxvt_term::cmd_get8 () THROW ((class out_of_input))
2380{ 2450{
2381 uint32_t c = next_octet (); 2451 uint32_t c = next_octet ();
2382 2452
2383 if (c == NOCHAR) 2453 if (c == NOCHAR)
… …
2387} 2457}
2388 2458
2389/*{{{ print pipe */ 2459/*{{{ print pipe */
2390/*----------------------------------------------------------------------*/ 2460/*----------------------------------------------------------------------*/
2391#ifdef PRINTPIPE 2461#ifdef PRINTPIPE
2392FILE * 2462FILE * ecb_cold
2393rxvt_term::popen_printer () 2463rxvt_term::popen_printer ()
2394{ 2464{
2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2465 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2396 2466
2397 if (stream == NULL) 2467 if (stream == NULL)
2398 rxvt_warn ("can't open printer pipe, not printing.\n"); 2468 rxvt_warn ("can't open printer pipe, not printing.\n");
2399 2469
2400 return stream; 2470 return stream;
2401} 2471}
2402 2472
2403int 2473int ecb_cold
2404rxvt_term::pclose_printer (FILE *stream) 2474rxvt_term::pclose_printer (FILE *stream)
2405{ 2475{
2406 fflush (stream); 2476 fflush (stream);
2407 return pclose (stream); 2477 return pclose (stream);
2408} 2478}
2409 2479
2410/* 2480/*
2411 * simulate attached vt100 printer 2481 * simulate attached vt100 printer
2412 */ 2482 */
2413void 2483void ecb_cold
2414rxvt_term::process_print_pipe () 2484rxvt_term::process_print_pipe ()
2415{ 2485{
2416 FILE *fd = popen_printer (); 2486 FILE *fd = popen_printer ();
2417 2487
2418 if (!fd) 2488 if (!fd)
… …
2464 pclose_printer (fd); 2534 pclose_printer (fd);
2465} 2535}
2466#endif /* PRINTPIPE */ 2536#endif /* PRINTPIPE */
2467/*}}} */ 2537/*}}} */
2468 2538
2469/* *INDENT-OFF* */
2470enum { 2539enum {
2471 C1_40 = 0x40, 2540 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2541 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2542 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2543 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2544 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2545};
2477/* *INDENT-ON* */
2478 2546
2479/*{{{ process non-printing single characters */ 2547/*{{{ process non-printing single characters */
2480void 2548void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2549rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2550{
2483 switch (ch) 2551 switch (ch)
2484 { 2552 {
2485 case C0_ESC: 2553 case C0_ESC:
… …
2531} 2599}
2532/*}}} */ 2600/*}}} */
2533 2601
2534 2602
2535/*{{{ process VT52 escape sequences */ 2603/*{{{ process VT52 escape sequences */
2536void 2604void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2605rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2606{
2539 int row, col; 2607 int row, col;
2540 2608
2541 switch (ch) 2609 switch (ch)
… …
2575 break; 2643 break;
2576 case 'Z': /* identify the terminal type */ 2644 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2645 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2646 break;
2579 case '<': /* turn off VT52 mode */ 2647 case '<': /* turn off VT52 mode */
2580 set_privmode (PrivMode_vt52, 0); 2648 priv_modes &= ~PrivMode_vt52;
2581 break; 2649 break;
2582 case 'F': /* use special graphics character set */ 2650 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2651 case 'G': /* use regular character set */
2584 /* unimplemented */ 2652 /* unimplemented */
2585 break; 2653 break;
… …
2591} 2659}
2592/*}}} */ 2660/*}}} */
2593 2661
2594 2662
2595/*{{{ process escape sequences */ 2663/*{{{ process escape sequences */
2596void 2664void ecb_hot
2597rxvt_term::process_escape_seq () 2665rxvt_term::process_escape_seq ()
2598{ 2666{
2599 unicode_t ch = cmd_getc (); 2667 unicode_t ch = cmd_getc ();
2600 2668
2601 if (priv_modes & PrivMode_vt52) 2669 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2672 return;
2605 } 2673 }
2606 2674
2607 switch (ch) 2675 switch (ch)
2608 { 2676 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2677 case '#':
2611 if (cmd_getc () == '8') 2678 if (cmd_getc () == '8')
2612 scr_E (); 2679 scr_E ();
2613 break; 2680 break;
2614 case '(': 2681 case '(':
… …
2637#if !ENABLE_MINIMAL 2704#if !ENABLE_MINIMAL
2638 case '9': 2705 case '9':
2639 scr_forwardindex (); 2706 scr_forwardindex ();
2640 break; 2707 break;
2641#endif 2708#endif
2709 // DECPAM/DECPNM
2642 case '=': 2710 case '=':
2711 priv_modes |= PrivMode_aplKP;
2712 break;
2643 case '>': 2713 case '>':
2644 set_privmode (PrivMode_aplKP, ch == '='); 2714 priv_modes &= ~PrivMode_aplKP;
2645 break; 2715 break;
2646 2716
2647 case C1_40: 2717 case C1_40:
2648 cmd_getc (); 2718 cmd_getc ();
2649 break; 2719 break;
… …
2653 2723
2654 /* 8.3.87: NEXT LINE */ 2724 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2725 case C1_NEL: /* ESC E */
2656 { 2726 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2727 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2728 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2729 }
2660 break; 2730 break;
2661 2731
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2732 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2733 case C1_ESA: /* ESC G */
2664 process_graphics (); 2734 // used by original rxvt for rob nations own graphics mode
2735 if (cmd_getc () == 'Q')
2736 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2737 break;
2666 2738
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2739 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2740 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2741 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2745 case C1_RI: /* ESC M */
2674 scr_index (DN); 2746 scr_index (DN);
2675 break; 2747 break;
2676 2748
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2749 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2750 /* case C1_SS2: break; */
2679 2751
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2752 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2753 /* case C1_SS3: break; */
2682 2754
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2755 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2756 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2757 process_dcs_seq ();
2686 break; 2758 break;
… …
2719 } 2791 }
2720} 2792}
2721/*}}} */ 2793/*}}} */
2722 2794
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2795/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2796enum {
2726 CSI_ICH = 0x40, 2797 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2798 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2799 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2800 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2803 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2804 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2805 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2806};
2736 2807
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2808#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2809 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2810 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2811#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2812 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2813
2743const unsigned char csi_defaults[] = 2814static const unsigned char csi_defaults[] =
2744 { 2815 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2816 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2817 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2818 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2819 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2820 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2821 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2824 };
2754/* *INDENT-ON* */
2755 2825
2756void 2826void ecb_hot
2757rxvt_term::process_csi_seq () 2827rxvt_term::process_csi_seq ()
2758{ 2828{
2759 unicode_t ch, priv, i; 2829 unicode_t ch, priv, prev_ch, i;
2760 unsigned int nargs, p; 2830 unsigned int nargs, p;
2761 int n, ndef; 2831 int n, ndef;
2762 int arg[ESC_ARGS] = { }; 2832 int arg[ESC_ARGS] = { };
2763 2833
2764 nargs = 0; 2834 nargs = 0;
… …
2770 /* '<' '=' '>' '?' '!' */ 2840 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2841 priv = ch;
2772 ch = cmd_getc (); 2842 ch = cmd_getc ();
2773 } 2843 }
2774 2844
2845 prev_ch = 0;
2775 /* read any numerical arguments */ 2846 /* read any numerical arguments */
2776 for (n = -1; ch < CSI_ICH; ) 2847 for (n = -1; ch < CSI_ICH; )
2777 { 2848 {
2778 if (isdigit (ch)) 2849 if (isdigit (ch))
2779 { 2850 {
… …
2789 n = -1; 2860 n = -1;
2790 } 2861 }
2791 else if (IS_CONTROL (ch)) 2862 else if (IS_CONTROL (ch))
2792 process_nonprinting (ch); 2863 process_nonprinting (ch);
2793 2864
2865 prev_ch = ch;
2794 ch = cmd_getc (); 2866 ch = cmd_getc ();
2795 } 2867 }
2796 2868
2797 if (ch > CSI_7F) 2869 if (ch > CSI_7F)
2798 return; 2870 return;
… …
2837 { 2909 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2910 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2911 scr_soft_reset ();
2840 2912
2841 static const int pm_h[] = { 7, 25 }; 2913 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2914 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2915
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2916 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2917 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2846 } 2918 }
2847 break; 2919 break;
2848 } 2920 }
2849 2921
2850 return; 2922 return;
… …
2868 } 2940 }
2869 break; 2941 break;
2870#endif 2942#endif
2871 2943
2872 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2944 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2873 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2945 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2874 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
2875 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
2876 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2948 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2877 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2949 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2878 scr_gotorc (arg[0], 0, RELATIVE); 2950 scr_gotorc (arg[0], 0, RELATIVE);
2879 break; 2951 break;
2880 2952
2881 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2953 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2882 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2954 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3032 scr_insert_mode (1); 3104 scr_insert_mode (1);
3033 else if (arg[0] == 20) 3105 else if (arg[0] == 20)
3034 priv_modes |= PrivMode_LFNL; 3106 priv_modes |= PrivMode_LFNL;
3035 break; 3107 break;
3036 3108
3109 case CSI_71: // DESCUSR: set cursor style
3110 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]);
3112 break;
3113
3037 /* 3114 /*
3038 * PRIVATE USE beyond this point. All CSI_7? sequences here 3115 * PRIVATE USE beyond this point. All CSI_7? sequences here
3039 */ 3116 */
3040 case CSI_72: /* DECSTBM: set top and bottom margins */ 3117 case CSI_72: /* DECSTBM: set top and bottom margins */
3041 if (nargs == 1) 3118 if (nargs == 1)
… …
3069 } 3146 }
3070} 3147}
3071/*}}} */ 3148/*}}} */
3072 3149
3073#if !ENABLE_MINIMAL 3150#if !ENABLE_MINIMAL
3074/* ARGSUSED */
3075void 3151void
3076rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3152rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3077{ 3153{
3078 int x, y; 3154 int x, y;
3079 XWindowAttributes wattr; 3155 XWindowAttributes wattr;
… …
3088 { 3164 {
3089 /* 3165 /*
3090 * commands 3166 * commands
3091 */ 3167 */
3092 case 1: /* deiconify window */ 3168 case 1: /* deiconify window */
3093 XMapWindow (dpy, parent[0]); 3169 XMapWindow (dpy, parent);
3094 break; 3170 break;
3095 case 2: /* iconify window */ 3171 case 2: /* iconify window */
3096 XIconifyWindow (dpy, parent[0], display->screen); 3172 XIconifyWindow (dpy, parent, display->screen);
3097 break; 3173 break;
3098 case 3: /* set position (pixels) */ 3174 case 3: /* set position (pixels) */
3099 XMoveWindow (dpy, parent[0], args[1], args[2]); 3175 XMoveWindow (dpy, parent, args[1], args[2]);
3100 break; 3176 break;
3101 case 4: /* set size (pixels) */ 3177 case 4: /* set size (pixels) */
3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3178 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103 break; 3179 break;
3104 case 5: /* raise window */ 3180 case 5: /* raise window */
3105 XRaiseWindow (dpy, parent[0]); 3181 XRaiseWindow (dpy, parent);
3106 break; 3182 break;
3107 case 6: /* lower window */ 3183 case 6: /* lower window */
3108 XLowerWindow (dpy, parent[0]); 3184 XLowerWindow (dpy, parent);
3109 break; 3185 break;
3110 case 7: /* refresh window */ 3186 case 7: /* refresh window */
3111 scr_touch (true); 3187 scr_touch (true);
3112 break; 3188 break;
3113 case 8: /* set size (chars) */ 3189 case 8: /* set size (chars) */
… …
3116 break; 3192 break;
3117 3193
3118 //case 9: NYI, TODO, restore maximized window or maximize window 3194 //case 9: NYI, TODO, restore maximized window or maximize window
3119 default: 3195 default:
3120 if (args[0] >= 24) /* set height (chars) */ 3196 if (args[0] >= 24) /* set height (chars) */
3121 set_widthheight ((unsigned int)width, 3197 set_widthheight ((unsigned int)vt_width,
3122 (unsigned int) (args[1] * fheight)); 3198 (unsigned int) (args[1] * fheight));
3123 break; 3199 break;
3124 3200
3125 /* 3201 /*
3126 * reports - some output format copied from XTerm 3202 * reports - some output format copied from XTerm
3127 */ 3203 */
3128 case 11: /* report window state */ 3204 case 11: /* report window state */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3205 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3206 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131 break; 3207 break;
3132 case 13: /* report window position */ 3208 case 13: /* report window position */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3134 XTranslateCoordinates (dpy, parent[0], wattr.root, 3210 XTranslateCoordinates (dpy, parent, wattr.root,
3135 -wattr.border_width, -wattr.border_width, 3211 -wattr.border_width, -wattr.border_width,
3136 &x, &y, &wdummy); 3212 &x, &y, &wdummy);
3137 tt_printf ("\033[3;%d;%dt", x, y); 3213 tt_printf ("\033[3;%d;%dt", x, y);
3138 break; 3214 break;
3139 case 14: /* report window size (pixels) */ 3215 case 14: /* report window size (pixels) */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3216 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3217 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142 break; 3218 break;
3143 case 18: /* report text area size (chars) */ 3219 case 18: /* report text area size (chars) */
3144 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145 break; 3221 break;
… …
3147 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3223 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148 break; 3224 break;
3149 case 20: /* report icon label */ 3225 case 20: /* report icon label */
3150 { 3226 {
3151 char *s; 3227 char *s;
3152 XGetIconName (dpy, parent[0], &s); 3228 XGetIconName (dpy, parent, &s);
3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s); 3230 XFree (s);
3155 } 3231 }
3156 break; 3232 break;
3157 case 21: /* report window title */ 3233 case 21: /* report window title */
3158 { 3234 {
3159 char *s; 3235 char *s;
3160 XFetchName (dpy, parent[0], &s); 3236 XFetchName (dpy, parent, &s);
3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3237 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3238 XFree (s);
3163 } 3239 }
3164 break; 3240 break;
3165 } 3241 }
… …
3175rxvt_term::get_to_st (unicode_t &ends_how) 3251rxvt_term::get_to_st (unicode_t &ends_how)
3176{ 3252{
3177 unicode_t ch; 3253 unicode_t ch;
3178 bool seen_esc = false; 3254 bool seen_esc = false;
3179 unsigned int n = 0; 3255 unsigned int n = 0;
3180 wchar_t string[STRING_MAX]; 3256 wchar_t string[CBUFSIZ];
3181 3257
3182 while ((ch = cmd_getc ()) != NOCHAR) 3258 while ((ch = cmd_getc ()) != NOCHAR)
3183 { 3259 {
3184 if (seen_esc) 3260 if (seen_esc)
3185 { 3261 {
… …
3200 else if (ch < 0x20) 3276 else if (ch < 0x20)
3201 return NULL; /* other control character - exit */ 3277 return NULL; /* other control character - exit */
3202 3278
3203 seen_esc = false; 3279 seen_esc = false;
3204 3280
3205 if (n >= STRING_MAX - 1) 3281 if (n >= sizeof (string) - 1)
3206 // stop at some sane length 3282 // stop at some sane length
3207 return NULL; 3283 return NULL;
3208 3284
3209 string[n++] = ch; 3285 string[n++] = ch;
3210 } 3286 }
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3297 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3298 */
3223void 3299void
3224rxvt_term::process_dcs_seq () 3300rxvt_term::process_dcs_seq ()
3225{ 3301{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3302 /*
3230 * Not handled yet 3303 * Not handled yet
3231 */ 3304 */
3305
3306 unicode_t eh;
3232 s = get_to_st (eh); 3307 char *s = get_to_st (eh);
3233 if (s) 3308 if (s)
3234 free (s); 3309 free (s);
3235 3310
3236 return; 3311 return;
3237} 3312}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3316 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3317 */
3243void 3318void
3244rxvt_term::process_osc_seq () 3319rxvt_term::process_osc_seq ()
3245{ 3320{
3246 unicode_t ch, eh;
3247 int arg; 3321 int arg;
3248 3322
3249 ch = cmd_getc (); 3323 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3324 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3325 arg = arg * 10 + (ch - '0');
3252 3326
3253 if (ch == ';') 3327 if (ch == ';')
3254 { 3328 {
3329 unicode_t eh;
3255 char *s = get_to_st (eh); 3330 char *s = get_to_st (eh);
3256 3331
3257 if (s) 3332 if (s)
3258 { 3333 {
3259 process_xterm_seq (arg, s, eh); 3334 process_xterm_seq (arg, s, eh);
… …
3283 3358
3284/* 3359/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3360 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3361 */
3287void 3362void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3363rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3364{
3290 int color; 3365 int color;
3291 char *buf, *name; 3366 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3367 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3368 int saveop = op;
… …
3320 unsigned long bytes_after; 3395 unsigned long bytes_after;
3321 unsigned char *value = 0; 3396 unsigned char *value = 0;
3322 const char *str = ""; 3397 const char *str = "";
3323 3398
3324 if (prop 3399 if (prop
3325 && XGetWindowProperty (dpy, parent[0], 3400 && XGetWindowProperty (dpy, parent,
3326 prop, 0, 1<<16, 0, AnyPropertyType, 3401 prop, 0, 1<<16, 0, AnyPropertyType,
3327 &actual_type, &actual_format, 3402 &actual_type, &actual_format,
3328 &nitems, &bytes_after, &value) == Success 3403 &nitems, &bytes_after, &value) == Success
3329 && actual_type != None 3404 && actual_type != None
3330 && actual_format == 8) 3405 && actual_format == 8)
3331 str = (const char *)(value); 3406 str = (const char *)(value);
3332 3407
3333 tt_printf ("\033]%d;%s%c", op, str, resp); 3408 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3334 3409
3335 XFree (value); 3410 XFree (value);
3336 } 3411 }
3337 else 3412 else
3338 { 3413 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3414 char *eq = strchr (str, '=');
3340 3415
3341 if (eq) 3416 if (eq)
3342 { 3417 {
3343 *eq = 0; 3418 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3419 set_utf8_property (display->atom (str), eq + 1);
3345 } 3420 }
3346 else 3421 else
3347 XDeleteProperty (dpy, parent[0], 3422 XDeleteProperty (dpy, parent,
3348 display->atom (str)); 3423 display->atom (str));
3349 } 3424 }
3350 break; 3425 break;
3351 3426
3352 case XTerm_Color: 3427 case XTerm_Color:
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3459 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3460 break;
3386 case XTerm_Color_pointer_bg: 3461 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3462 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3463 break;
3464#ifdef OPTION_HC
3465 case XTerm_Color_HC:
3466 process_color_seq (op, Color_HC, str, resp);
3467 break;
3468 case XTerm_Color_HTC:
3469 process_color_seq (op, Color_HTC, str, resp);
3470 break;
3471#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3472#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3473 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3474 process_color_seq (op, Color_BD, str, resp);
3396 break; 3475 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3476 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3477 process_color_seq (op, Color_UL, str, resp);
3400 break; 3478 break;
3401 case URxvt_Color_IT: 3479 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3480 process_color_seq (op, Color_IT, str, resp);
3403 break; 3481 break;
3404#endif 3482#endif
3405 case URxvt_Color_border: 3483 case URxvt_Color_border:
3406 process_color_seq (op, Color_border, str, resp); 3484 process_color_seq (op, Color_border, str, resp);
3407 break; 3485 break;
3408#if ENABLE_TRANSPARENCY 3486
3487#if BG_IMAGE_FROM_ROOT
3409 case URxvt_Color_tint: 3488 case URxvt_Color_tint:
3410 process_color_seq (op, Color_tint, str, resp); 3489 process_color_seq (op, Color_tint, str, resp);
3411 { 3490 {
3412 bool changed = false; 3491 bool changed = false;
3413 3492
3414 if (ISSET_PIXCOLOR (Color_tint)) 3493 if (ISSET_PIXCOLOR (Color_tint))
3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3494 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3416 else
3417 changed = bgPixmap.unset_tint ();
3418 3495
3419 if (changed) 3496 if (changed)
3420 update_background (); 3497 update_background ();
3421 } 3498 }
3422 3499
… …
3426#if BG_IMAGE_FROM_FILE 3503#if BG_IMAGE_FROM_FILE
3427 case Rxvt_Pixmap: 3504 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3505 if (!strcmp (str, "?"))
3429 { 3506 {
3430 char str[256]; 3507 char str[256];
3508 int h_scale = fimage.h_scale;
3509 int v_scale = fimage.v_scale;
3510 int h_align = fimage.h_align;
3511 int v_align = fimage.v_align;
3431 3512
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3513 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3514 h_scale, v_scale,
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3515 h_align, v_align);
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3516 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3517 }
3437 else 3518 else
3438 { 3519 {
3439 int changed = 0; 3520 bool changed = false;
3440 3521
3441 if (*str != ';') 3522 if (*str != ';')
3442 { 3523 {
3443 /* reset to default scaling :*/ 3524 try
3444 bgPixmap.unset_geometry (); 3525 {
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3526 fimage.set_file_geometry (this, str);
3446 changed++; 3527 changed = true;
3447 str = strchr (str, ';'); 3528 }
3448 if (str == NULL) 3529 catch (const class rxvt_failure_exception &e)
3449 bgPixmap.set_defaultGeometry (); 3530 {
3531 }
3450 } 3532 }
3451 3533 else
3452 while (str)
3453 { 3534 {
3454 str++; 3535 str++;
3455 if (bgPixmap.set_geometry (str)) 3536 if (fimage.set_geometry (str, true))
3456 changed++; 3537 changed = true;
3457 str = strchr (str, ';');
3458 } 3538 }
3459 3539
3460 if (changed) 3540 if (changed)
3541 {
3542 if (bg_window_position_sensitive ())
3543 {
3544 int x, y;
3545 get_window_origin (x, y);
3546 parent_x = x;
3547 parent_y = y;
3548 }
3461 update_background (); 3549 update_background ();
3550 }
3462 } 3551 }
3463 break; 3552 break;
3464#endif 3553#endif
3465 3554
3466 case XTerm_logfile: 3555 case XTerm_logfile:
… …
3553 * 's' = save 3642 * 's' = save
3554 * 'r' = restore 3643 * 'r' = restore
3555 * 't' = toggle 3644 * 't' = toggle
3556 * so no need for fancy checking 3645 * so no need for fancy checking
3557 */ 3646 */
3558int 3647int ecb_cold
3559rxvt_term::privcases (int mode, unsigned long bit) 3648rxvt_term::privcases (int mode, unsigned long bit)
3560{ 3649{
3561 int state; 3650 int state;
3562 3651
3563 if (mode == 's') 3652 if (mode == 's')
3564 { 3653 {
3565 SavedModes |= (priv_modes & bit); 3654 if (priv_modes & bit)
3655 SavedModes |= bit;
3656 else
3657 SavedModes &= ~bit;
3566 return -1; 3658 return -1;
3567 } 3659 }
3568 else 3660 else
3569 { 3661 {
3570 if (mode == 'r') 3662 if (mode == 'r')
3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3663 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3572 else 3664 else
3573 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3665 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3574 set_privmode (bit, state); 3666
3667 if (state)
3668 priv_modes |= bit;
3669 else
3670 priv_modes &= ~bit;
3575 } 3671 }
3576 3672
3577 return state; 3673 return state;
3578} 3674}
3579 3675
3580/* we're not using priv _yet_ */ 3676/* we're not using priv _yet_ */
3581void 3677void
3582rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3678rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3583{ 3679{
3584 unsigned int i, j; 3680 unsigned int i, j;
3585 int state; 3681 int state;
3586 3682
3587 static const struct 3683 static const struct
3588 { 3684 {
3589 const int argval; 3685 const int argval;
3590 const unsigned long bit; 3686 const unsigned long bit;
3591 } argtopriv[] = { 3687 } argtopriv[] = {
3592 { 1, PrivMode_aplCUR }, // DECCKM 3688 { 1, PrivMode_aplCUR }, // DECCKM
3593 { 2, PrivMode_vt52 }, 3689 { 2, PrivMode_vt52 }, // DECANM
3594 { 3, PrivMode_132 }, // DECCOLM 3690 { 3, PrivMode_132 }, // DECCOLM
3595 { 4, PrivMode_smoothScroll }, // DECSCLM 3691 { 4, PrivMode_smoothScroll }, // DECSCLM
3596 { 5, PrivMode_rVideo }, // DECSCNM 3692 { 5, PrivMode_rVideo }, // DECSCNM
3597 { 6, PrivMode_relOrigin }, // DECOM 3693 { 6, PrivMode_relOrigin }, // DECOM
3598 { 7, PrivMode_Autowrap }, // DECAWM 3694 { 7, PrivMode_Autowrap }, // DECAWM
3599 // 8, auto-repeat keys // DECARM 3695 // 8, auto-repeat keys // DECARM
3600 { 9, PrivMode_MouseX10 }, 3696 { 9, PrivMode_MouseX10 },
3601 // 18 end FF to printer after print screen 3697 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region 3698 // 19 Print screen prints full screen/scroll region
3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3699 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3604#ifdef scrollBar_esc 3700#ifdef scrollBar_esc
3605 { scrollBar_esc, PrivMode_scrollBar }, 3701 { scrollBar_esc, PrivMode_scrollBar },
3606#endif 3702#endif
3607 { 35, PrivMode_ShiftKeys }, // rxvt extension 3703 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK 3704 // 38, tektronix mode // DECTEK
3609 { 40, PrivMode_132OK }, 3705 { 40, PrivMode_132OK },
3610 // 41 xterm more fixes NYI 3706 // 41 xterm more fixes NYI
3611 // 45 margin bell NYI 3707 // 45 margin bell NYI
3612 // 46 start logging 3708 // 46 start logging
3613 { 47, PrivMode_Screen }, 3709 { 47, PrivMode_Screen },
3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3710 { 66, PrivMode_aplKP }, // DECNKM
3615#ifndef NO_BACKSPACE_KEY 3711#ifndef NO_BACKSPACE_KEY
3616 { 67, PrivMode_BackSpace }, // DECBKM 3712 { 67, PrivMode_BackSpace }, // DECBKM
3617#endif 3713#endif
3618 { 1000, PrivMode_MouseX11 }, 3714 { 1000, PrivMode_MouseX11 },
3619 { 1002, PrivMode_MouseBtnEvent }, 3715 { 1002, PrivMode_MouseBtnEvent },
3620 { 1003, PrivMode_MouseAnyEvent }, 3716 { 1003, PrivMode_MouseAnyEvent },
3717#if ENABLE_FRILLS
3718 { 1005, PrivMode_ExtModeMouse },
3719#endif
3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3720 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3622 { 1011, PrivMode_Keypress }, // rxvt extension 3721 { 1011, PrivMode_Keypress }, // rxvt extension
3722#if ENABLE_FRILLS
3723 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3724#endif
3623 // 1035 enable modifiers for alt, numlock NYI 3725 // 1035 enable modifiers for alt, numlock NYI
3624 // 1036 send ESC for meta keys NYI 3726 // 1036 send ESC for meta keys NYI
3625 // 1037 send DEL for keypad delete NYI 3727 // 1037 send DEL for keypad delete NYI
3626 { 1047, PrivMode_Screen }, 3728 { 1047, PrivMode_Screen },
3627 // 1048 save and restore cursor 3729 // 1048 save and restore cursor, implemented in code
3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3730 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3731 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste }, 3732 { 2004, PrivMode_BracketPaste },
3631 }; 3733 };
3632 3734
… …
3642 for (i = 0; i < nargs; i++) 3744 for (i = 0; i < nargs; i++)
3643 { 3745 {
3644 state = -1; 3746 state = -1;
3645 3747
3646 /* basic handling */ 3748 /* basic handling */
3647 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3749 for (j = 0; j < ecb_array_length (argtopriv); j++)
3648 if (argtopriv[j].argval == arg[i]) 3750 if (argtopriv[j].argval == arg[i])
3649 { 3751 {
3650 state = privcases (mode, argtopriv[j].bit); 3752 state = privcases (mode, argtopriv[j].bit);
3651 break; 3753 break;
3652 } 3754 }
… …
3660 3762
3661 scr_touch (true); 3763 scr_touch (true);
3662 break; 3764 break;
3663#endif 3765#endif
3664 case 1048: /* alternative cursor save */ 3766 case 1048: /* alternative cursor save */
3665 case 1049:
3666 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3768 if (mode == 0)
3668 scr_cursor (RESTORE); 3769 scr_cursor (RESTORE);
3669 else if (mode == 1) 3770 else if (mode == 1)
3670 scr_cursor (SAVE); 3771 scr_cursor (SAVE);
… …
3679 case 2: /* VT52 mode */ 3780 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset 3781 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from 3782 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode 3783 * within VT52 mode
3683 */ 3784 */
3684 set_privmode (PrivMode_vt52, 1); 3785 priv_modes |= PrivMode_vt52;
3685 break; 3786 break;
3686 case 3: /* 80/132 */ 3787 case 3: /* 80/132 */
3687 if (priv_modes & PrivMode_132OK) 3788 if (priv_modes & PrivMode_132OK)
3688 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3789 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3689 break; 3790 break;
… …
3704 if (state) /* orthogonal */ 3805 if (state) /* orthogonal */
3705 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3806 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3706 break; 3807 break;
3707#ifdef scrollBar_esc 3808#ifdef scrollBar_esc
3708 case scrollBar_esc: 3809 case scrollBar_esc:
3709 if (scrollBar.map (state)) 3810 scrollBar.map (state);
3710 {
3711 resize_all_windows (0, 0, 0); 3811 resize_all_windows (0, 0, 0);
3712 scr_touch (true); 3812 scr_touch (true);
3713 }
3714 break; 3813 break;
3715#endif 3814#endif
3716 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3717 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3718 break; 3817 break;
… …
3731 case 1003: 3830 case 1003:
3732 if (state) 3831 if (state)
3733 { 3832 {
3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3735 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3736 vt_emask_mouse = PointerMotionMask; 3836 vt_emask_mouse = PointerMotionMask;
3737 } 3837 }
3738 else 3838 else
3739 vt_emask_mouse = NoEventMask; 3839 vt_emask_mouse = NoEventMask;
3740 3840
… …
3746 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3747 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3748 break; 3848 break;
3749 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3750 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3751 if (current_screen != PRIMARY) 3851 if (!state)
3752 scr_erase_screen (2); 3852 scr_erase_screen (2);
3753 3853
3754 scr_change_screen (state); 3854 scr_change_screen (state);
3755 break; 3855 break;
3756 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3757 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3758 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 3864 if (state)
3760 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3761 break; 3868 break;
3762 default: 3869 default:
3763 break; 3870 break;
3764 } 3871 }
3765 } 3872 }
3766} 3873}
3767/*}}} */ 3874/*}}} */
3768 3875
3769/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3770void 3877void ecb_hot
3771rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3772{ 3879{
3773 unsigned int i; 3880 unsigned int i;
3774 short rendset; 3881 short rendset;
3775 int rendstyle; 3882 int rendstyle;
… …
3916 break; 4023 break;
3917#endif 4024#endif
3918 } 4025 }
3919 } 4026 }
3920} 4027}
3921/*}}} */
3922 4028
3923/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3924void 4029void
3925rxvt_term::process_graphics () 4030rxvt_term::set_cursor_style (int style)
3926{ 4031{
3927 unicode_t ch, cmd = cmd_getc (); 4032 if (!IN_RANGE_INC (style, 0, 4))
3928
3929 if (cmd == 'Q')
3930 {
3931 /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return; 4033 return;
3934 } 4034
3935 /* swallow other graphics sequences until terminating ':' */ 4035 set_option (Opt_cursorUnderline, style >= 3);
3936 do 4036
3937 ch = cmd_getc (); 4037#ifdef CURSOR_BLINK
3938 while (ch != ':'); 4038 set_option (Opt_cursorBlink, !style || (style & 1));
4039 cursor_blink_reset ();
4040#endif
4041
4042 want_refresh = 1;
3939} 4043}
3940/*}}} */ 4044/*}}} */
3941 4045
3942/* ------------------------------------------------------------------------- */ 4046/* ------------------------------------------------------------------------- */
3943 4047
… …
3959 4063
3960/* ---------------------------------------------------------------------- */ 4064/* ---------------------------------------------------------------------- */
3961/* Write data to the pty as typed by the user, pasted with the mouse, 4065/* Write data to the pty as typed by the user, pasted with the mouse,
3962 * or generated by us in response to a query ESC sequence. 4066 * or generated by us in response to a query ESC sequence.
3963 */ 4067 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4068static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965 4069
3966void 4070void
3967rxvt_term::tt_write (const char *data, unsigned int len) 4071rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4072{
3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3974 4078
3975 if (v_buflen == 0) 4079 if (v_buflen == 0)
3976 { 4080 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4081 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978 4082
4083 max_it (written, 0);
4084
3979 if ((unsigned int)written == len) 4085 if (written == len)
3980 return; 4086 return;
3981 4087
3982 data += written; 4088 data += written;
3983 len -= written; 4089 len -= written;
3984 } 4090 }
3985 4091
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4092 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4093
3988 memcpy (v_buffer + v_buflen, data, len); 4094 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4095 v_buflen += len;
3990 4096
3991 pty_ev.set (ev::READ | ev::WRITE); 4097 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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