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.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 400 break;
394 } 401 }
395 return param; 402 return param;
396} 403}
397 404
398void 405void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
400{ 407{
401 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
402 KeySym keysym; 409 KeySym keysym;
403 int valid_keysym; 410 int valid_keysym;
… …
416 */ 423 */
417 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
420 427
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 PrivMode ((!numlock_state), PrivMode_aplKP);
425 }
426
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
505#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 508#else
508 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
509#endif 510#endif
511 max_it (lnsppg, 1);
512
510 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
511 { 514 {
512 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
513 return; 516 return;
514 } 517 }
… …
567 selection_request (ev.time); 570 selection_request (ev.time);
568 return; 571 return;
569#if TODO 572#if TODO
570 /* rxvt extras */ 573 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 575 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 577 return;
577#endif 578#endif
578 } 579 }
579 } 580 }
580 } 581 }
581 582
582#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 584 // ISO 14755 support
584 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 586 {
586 int hv; 587 int hv;
587 588
588 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 620 scr_overlay_off ();
620# endif 621# endif
621 iso14755buf = 0; 622 iso14755buf = 0;
622 } 623 }
623 } 624 }
625 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
627 { 629 {
628 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 631# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
641 } 643 }
642#endif 644#endif
643 645
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 647 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 649 unsigned int newlen = 1;
648 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
649 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
650 { 772 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym); 773 int param = map_function_key (keysym);
767 if (param > 0) 774 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param); 775 sprintf (kbuf,"\033[%d~", param);
769 else 776 else
770 newlen = 0; 777 newlen = 0;
771 }
772 break;
773 } 778 }
779 break;
780 }
774 781
775 if (newlen) 782 if (newlen)
776 len = strlen (kbuf); 783 len = strlen (kbuf);
777 784
785 if (len > 0)
786 {
778 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
779 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
780 */ 801 */
781#ifdef META8_OPTION 802#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
784#endif 805#endif
806 }
785 807
786 } 808 }
787 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
788 { 810 {
789 len = 1; 811 len = 1;
… …
823 { 845 {
824 view_start = 0; 846 view_start = 0;
825 want_refresh = 1; 847 want_refresh = 1;
826 } 848 }
827 849
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */ 850 /* escape prefix */
843 if (meta 851 if (meta
844#ifdef META8_OPTION 852#ifdef META8_OPTION
845 && meta_char == C0_ESC 853 && meta_char == C0_ESC
846#endif 854#endif
… …
851 } 859 }
852 860
853 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
854} 862}
855 863
856void 864void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
858{ 866{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 868 KeySym keysym;
861 869
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
930#endif 938#endif
931} 939}
932 940
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 941void
967rxvt_term::flush () 942rxvt_term::flush ()
968{ 943{
969 flush_ev.stop (); 944 flush_ev.stop ();
970 945
971#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
973 { 948 {
974// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 950 scr_touch (false);
976 } 951 }
977#endif 952#endif
978 953
979 if (want_refresh) 954 if (want_refresh)
… …
1015 } 990 }
1016 while (row < end_row); 991 while (row < end_row);
1017 } 992 }
1018 993
1019 scr_refresh (); 994 scr_refresh ();
1020 scrollbar_show (1); 995 scrollBar.show (1);
1021#ifdef USE_XIM 996#if USE_XIM
1022 IMSendSpot (); 997 im_send_spot ();
1023#endif 998#endif
1024 } 999 }
1025 1000
1026 display->flush (); 1001 display->flush ();
1027} 1002}
1028 1003
1029/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1030void 1005void
1031rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1032{ 1007{
1033 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1019 refresh_count = 0;
1045 flush (); 1020 flush ();
1046} 1021}
1047 1022
1048#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1049void 1039void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1041{
1052 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1043 want_refresh = 1;
… …
1072 1062
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1064void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1066{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1069 {
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 refresh_check (); 1071 refresh_check ();
1082 } 1072 }
1083 else 1073 else
… …
1127 { 1117 {
1128 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1132 1125
1133 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1135 1128
1136 w.stop (); 1129 w.stop ();
1137 } 1130 }
1138 1131
… …
1141 { 1134 {
1142 } 1135 }
1143} event_handler; 1136} event_handler;
1144#endif 1137#endif
1145 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1146bool 1172bool
1147rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1148{ 1174{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1150 1176
1151 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1178
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1154 n = 0;
1155 } 1180 {
1156 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1160 1186
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1188
1163 if (r > 0) 1189 if (r > 0)
1164 { 1190 {
1165 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1166 return true; 1192 return true;
… …
1188{ 1214{
1189 make_current (); 1215 make_current ();
1190 1216
1191 if (revents & ev::READ) 1217 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1220 cmd_parse ();
1195 break;
1196 1221
1197 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1198 pty_write (); 1223 pty_write ();
1199 1224
1200 refresh_check (); 1225 refresh_check ();
1201} 1226}
1202 1227
1203void 1228void ecb_cold
1204rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1205{ 1230{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1232 recolour_cursor ();
1208 1233
… …
1213 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1214#endif 1239#endif
1215} 1240}
1216 1241
1217#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1218void 1243void ecb_cold
1219rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1220{ 1245{
1221 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1222 return; 1247 return;
1223 1248
… …
1225 XFlush (dpy); 1250 XFlush (dpy);
1226 1251
1227 hidden_pointer = 1; 1252 hidden_pointer = 1;
1228} 1253}
1229 1254
1230void 1255void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1257{
1233 make_current (); 1258 make_current ();
1234 1259
1235 pointer_blank (); 1260 pointer_blank ();
… …
1241{ 1266{
1242 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1243 int x, y; 1268 int x, y;
1244 int code = 32; 1269 int code = 32;
1245 1270
1246 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1248 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1249 { 1275 {
1250 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1251 return; 1277 return;
1278
1252 mouse_row = x; 1279 mouse_row = x;
1253 mouse_col = y; 1280 mouse_col = y;
1254 code += 32; 1281 code += 32;
1255 } 1282 }
1256 1283
… …
1259 else 1286 else
1260 { 1287 {
1261 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1290 if (button_number >= 3)
1264 button_number += (64 - 3); 1291 button_number += 64 - 3;
1265 } 1292 }
1266 1293
1267 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1268 { 1295 {
1269 /* 1296 /*
… …
1301 fputc ('A', stderr); 1328 fputc ('A', stderr);
1302 if (key_state & 32) 1329 if (key_state & 32)
1303 fputc ('2', stderr); 1330 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1332 button_number,
1306 x + 1, 1333 x,
1307 y + 1); 1334 y);
1308#endif 1335#endif
1309 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1310 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1351 code + button_number + key_state,
1312 (32 + x + 1), 1352 32 + x,
1313 (32 + y + 1)); 1353 32 + y);
1314} 1354}
1315 1355
1316/*{{{ process an X event */ 1356/*{{{ process an X event */
1317void 1357void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1319{ 1359{
1320 make_current (); 1360 make_current ();
1321 1361
1322 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1461 focus_out ();
1422 break; 1462 break;
1423 1463
1424 case ConfigureNotify: 1464 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1429 { 1466 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1432 1502
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1504 {
1435 seen_resize = 1; 1505 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1507 }
1438 else 1508 else
1439 { 1509 {
1440#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1511 if (moved)
1444 update_background (); 1512 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1513#endif
1449 } 1514 }
1450 1515
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1517 }
1453 break; 1518 break;
1454 1519
1455 case PropertyNotify: 1520 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1522 break;
1462 1523
1463 case SelectionClear: 1524 case SelectionClear:
1464 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1526 break;
1471 1527
1472 case SelectionRequest: 1528 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1474 break; 1530 break;
1475 1531
1476 case MapNotify: 1532 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1479 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1482 * reparenting. 1538 // events at startup when the window manager reparents the
1483 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1485 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1492#endif 1543#endif
1493 mapped = 1; 1544 mapped = 1;
1494#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1511 { 1562 {
1512 do 1563 do
1513 { 1564 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1567 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1569
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1571
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1573 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1576 }
1526 1577
1527 want_refresh = 1; 1578 want_refresh = 1;
1528 } 1579 }
1529 else 1580 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1587 ;
1537 1588
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1590 {
1540 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1541 scrollbar_show (0); 1592 scrollBar.show (0);
1542 } 1593 }
1543 } 1594 }
1544 break; 1595 break;
1545 1596
1546 case MotionNotify: 1597 case MotionNotify:
… …
1611 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1612 } 1663 }
1613 else 1664 else
1614 { 1665 {
1615 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1668 }
1618 1669
1619 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1672 + 1;
… …
1633#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1634 } 1685 }
1635#endif 1686#endif
1636 } 1687 }
1637 } 1688 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1690 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1642 ; 1693 ;
1643 1694
1644 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1699 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1701 scrollBar.size ());
1651 want_refresh = 1; 1702 want_refresh = 1;
1652 scrollbar_show (1); 1703 scrollBar.show (1);
1653 } 1704 }
1654 break; 1705 break;
1655 } 1706 }
1656 1707
1657#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1667 }
1668#endif 1711#endif
1669 1712
1670#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1715 {
… …
1682#endif 1725#endif
1683 1726
1684 refresh_check (); 1727 refresh_check ();
1685} 1728}
1686 1729
1687void 1730#if ENABLE_FRILLS
1731void ecb_cold
1732rxvt_term::set_urgency (bool enable)
1733{
1734 if (enable == urgency_hint)
1735 return;
1736
1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1738 {
1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1740 XSetWMHints (dpy, parent, h);
1741 urgency_hint = enable;
1742 XFree (h);
1743 }
1744}
1745#endif
1746
1747void ecb_cold
1688rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1689{ 1749{
1690 if (!focus) 1750 if (!focus)
1691 { 1751 {
1692 focus = 1; 1752 focus = 1;
1693 want_refresh = 1; 1753 want_refresh = 1;
1694 1754
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1755#if USE_XIM
1698 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1699 { 1757 {
1700 IMSetPosition (); 1758 im_set_position ();
1701 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1702 } 1760 }
1703#endif 1761#endif
1704#if CURSOR_BLINK 1762#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1770 scr_recolour ();
1713 } 1771 }
1714#endif 1772#endif
1715#if ENABLE_FRILLS 1773#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1774 if (option (Opt_urgentOnBell))
1717 { 1775 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1776#endif
1725 }
1726}
1727 1777
1728void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1729rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1730{ 1784{
1731 if (focus) 1785 if (focus)
1732 { 1786 {
1733 focus = 0; 1787 focus = 0;
1734 want_refresh = 1; 1788 want_refresh = 1;
1735 1789
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1737 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1738#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1795 if (iso14755buf)
1740 { 1796 {
1741 iso14755buf = 0; 1797 iso14755buf = 0;
1742# if ISO_14755 1798# if ISO_14755
… …
1759 { 1815 {
1760 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1817 scr_recolour ();
1762 } 1818 }
1763#endif 1819#endif
1764 }
1765}
1766 1820
1767void 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1768rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1769{ 1827{
1770#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1772 { 1830 {
… …
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 } 1834 }
1777#endif 1835#endif
1778} 1836}
1779 1837
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1839void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1841{
1784 make_current (); 1842 make_current ();
1785 1843
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return; 1846 return;
1789 1847
1790# if ENABLE_TRANSPARENCY
1791 switch (ev.type) 1848 switch (ev.type)
1792 { 1849 {
1793 case PropertyNotify: 1850 case PropertyNotify:
1794 /* 1851 /*
1795 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1796 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1797 */ 1854 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1857 {
1801 bgPixmap.set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1802 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1803 } 1866 }
1804 1867
1805 break; 1868 break;
1806 } 1869 }
1807# endif
1808 1870
1809 refresh_check (); 1871 refresh_check ();
1810} 1872}
1811#endif 1873#endif
1812 1874
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1849 { 1911 {
1850 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1851 MEvent.clicks++; 1913 MEvent.clicks++;
1852 1914
1853 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1854 { 1916 {
1855 /* only report double clicks */ 1917 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 1999 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 2001 direction = DN; /* down */
1940 2002
1941 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1942 /* 2004 /*
1943 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 2006 * move up if mouse is above slider
1945 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1946 * 2008 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2048#endif
1987 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
1988 { 2050 {
1989 if (direction == UP) 2051 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
1991 else 2053 else
1992 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
1993 } 2055 }
1994 } 2056 }
1995 else 2057 else
1996 switch (ev.button) 2058 switch (ev.button)
1997 { 2059 {
1998 case Button2: 2060 case Button2:
1999 switch (scrollBar.align) 2061 switch (scrollBar.align)
2000 { 2062 {
2001 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2002 csrO = 0; 2064 csrO = 0;
2003 break; 2065 break;
2004 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2068 break;
2007 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2071 break;
2010 } 2072 }
2011 2073
2012 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2078
2017 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2018 break; 2080 break;
2019 2081
2020 case Button1: 2082 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2024 2086
2025 case Button3: 2087 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2089 {
2028 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2031# else 2093# else
2032 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2033# endif 2095# endif
2034 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2037# else 2099# else
2038 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2039# endif 2101# endif
2040 else 2102 else
2041 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2042 } 2104 }
2043 else 2105 else
2044 { 2106 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2108 (nrow
2047 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2048 / scrollbar_size ())); 2110 / scrollBar.size ()));
2049 } 2111 }
2050 2112
2051 break; 2113 break;
2052 } 2114 }
2053 } 2115 }
… …
2063 2125
2064 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2127 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2129
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2131 {
2070 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2071 scrollbar_show (0); 2133 scrollBar.show (0);
2072 } 2134 }
2073 2135
2074#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2076#endif 2138#endif
… …
2125 case Button3: 2187 case Button3:
2126 selection_make (ev.time); 2188 selection_make (ev.time);
2127 break; 2189 break;
2128 2190
2129 case Button2: 2191 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2194 break;
2133 2195
2134#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2135 case Button4: 2197 case Button4:
2136 case Button5: 2198 case Button5:
… …
2159 } 2221 }
2160 else 2222 else
2161# endif 2223# endif
2162 { 2224 {
2163 scr_page (v, i); 2225 scr_page (v, i);
2164 scrollbar_show (1); 2226 scrollBar.show (1);
2165 } 2227 }
2166 } 2228 }
2167 break; 2229 break;
2168#endif 2230#endif
2169 } 2231 }
2170 } 2232 }
2171} 2233}
2172 2234
2173/*}}} */ 2235/*}}} */
2174 2236
2175bool 2237void ecb_hot
2176rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2177{ 2239{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2181 2242
2182 for (;;) 2243 for (;;)
2183 { 2244 {
2184 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2185 { 2246 {
2186 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2248 ch = next_char ();
2188 2249
2189 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2190 break; 2251 break;
2191 } 2252 }
2192 2253
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2255 {
2195 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2196 { 2257 {
2197 seen_input = 1; 2258 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2274 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2276
2216 for (;;) 2277 for (;;)
2217 { 2278 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2280 break;
2220 2281
2221 *str++ = ch; 2282 *str++ = ch;
2222 2283
2223 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2285 {
2225 if (ch == C0_LF) 2286 if (ch == C0_LF)
2226 nlines++; 2287 nlines++;
2227 2288
2228 refresh_count++; 2289 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2279 */ 2340 */
2280 if (refreshnow) 2341 if (refreshnow)
2281 { 2342 {
2282 flag = true;
2283 scr_refresh (); 2343 scr_refresh ();
2284 want_refresh = 1; 2344 want_refresh = 1;
2285 } 2345 }
2286
2287 } 2346 }
2288 else 2347 else
2289 { 2348 {
2290 try 2349 try
2291 { 2350 {
… …
2299 } 2358 }
2300 2359
2301 ch = NOCHAR; 2360 ch = NOCHAR;
2302 } 2361 }
2303 } 2362 }
2304
2305 return flag;
2306} 2363}
2307 2364
2308// read the next character 2365// read the next character
2309wchar_t 2366wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2311{ 2368{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2370 {
2314 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2317 2374
2318 wchar_t wc; 2375 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2377
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2382 break;
2326 } 2383 }
2327 2384
2328 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2330 2392
2331 // assume wchar == unicode 2393 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2334 } 2396 }
2335 2397
2336 return NOCHAR; 2398 return NOCHAR;
2337} 2399}
2338 2400
2339// read the next octet 2401// read the next octet
2340uint32_t 2402uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2342{ 2404{
2343 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2407 : NOCHAR;
2346} 2408}
2347 2409
2348static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2349 2411
2350/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2414{
2358 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2359 2416
2360 if (c == NOCHAR) 2417 if (c == NOCHAR)
2361 throw out_of_input; 2418 throw out_of_input;
2362 2419
2363 return c; 2420 return c;
2364} 2421}
2365 2422
2366uint32_t 2423uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2368{ 2425{
2369 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2370 2427
2371 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2375} 2432}
2376 2433
2377/*{{{ print pipe */ 2434/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2380FILE * 2437FILE * ecb_cold
2381rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2382{ 2439{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2441
2385 if (stream == NULL) 2442 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2444
2388 return stream; 2445 return stream;
2389} 2446}
2390 2447
2391int 2448int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2393{ 2450{
2394 fflush (stream); 2451 fflush (stream);
2395 return pclose (stream); 2452 return pclose (stream);
2396} 2453}
2397 2454
2398/* 2455/*
2399 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2400 */ 2457 */
2401void 2458void ecb_cold
2402rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2403{ 2460{
2404 int done; 2461 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2462
2407 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2408 return; 2464 return;
2409 2465
2410 /* 2466 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2468 * is received.
2413 */ 2469 */
2414 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2415 { 2471 {
2416 unsigned char buf[8]; 2472 unsigned char buf[8];
2417 unicode_t ch; 2473 unicode_t ch;
2418 unsigned int i, len; 2474 unsigned int i, len;
2419 2475
… …
2453 pclose_printer (fd); 2509 pclose_printer (fd);
2454} 2510}
2455#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2456/*}}} */ 2512/*}}} */
2457 2513
2458/* *INDENT-OFF* */
2459enum { 2514enum {
2460 C1_40 = 0x40, 2515 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2462 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2463 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2464 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2520};
2466/* *INDENT-ON* */
2467 2521
2468/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2469void 2523void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2525{
2472 switch (ch) 2526 switch (ch)
2473 { 2527 {
2474 case C0_ESC: 2528 case C0_ESC:
… …
2520} 2574}
2521/*}}} */ 2575/*}}} */
2522 2576
2523 2577
2524/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2525void 2579void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2581{
2528 int row, col; 2582 int row, col;
2529 2583
2530 switch (ch) 2584 switch (ch)
… …
2564 break; 2618 break;
2565 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2621 break;
2568 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
2570 break; 2624 break;
2571 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2573 /* unimplemented */ 2627 /* unimplemented */
2574 break; 2628 break;
… …
2580} 2634}
2581/*}}} */ 2635/*}}} */
2582 2636
2583 2637
2584/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2585void 2639void ecb_hot
2586rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2587{ 2641{
2588 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2589 2643
2590 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2647 return;
2594 } 2648 }
2595 2649
2596 switch (ch) 2650 switch (ch)
2597 { 2651 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2652 case '#':
2600 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2601 scr_E (); 2654 scr_E ();
2602 break; 2655 break;
2603 case '(': 2656 case '(':
… …
2626#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2627 case '9': 2680 case '9':
2628 scr_forwardindex (); 2681 scr_forwardindex ();
2629 break; 2682 break;
2630#endif 2683#endif
2684 // DECPAM/DECPNM
2631 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2632 case '>': 2688 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
2634 break; 2690 break;
2635 2691
2636 case C1_40: 2692 case C1_40:
2637 cmd_getc (); 2693 cmd_getc ();
2638 break; 2694 break;
… …
2642 2698
2643 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2645 { 2701 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2704 }
2649 break; 2705 break;
2650 2706
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
2653 process_graphics (); 2709 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q')
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2712 break;
2655 2713
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2716 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2663 scr_index (DN); 2721 scr_index (DN);
2664 break; 2722 break;
2665 2723
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2668 2726
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2671 2729
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2732 process_dcs_seq ();
2675 break; 2733 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2735 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2736 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2737 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2738 break; /* steal obsolete ESC [ c */
2681 2739
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2740 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2741 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2742 process_csi_seq ();
2685 break; 2743 break;
2686 2744
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2745 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2746 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2747 process_osc_seq ();
2690 break; 2748 break;
2691 2749
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2750 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2751 case 'c':
2694 mbstate.reset (); 2752 mbstate.reset ();
2695 scr_poweron (); 2753 scr_poweron ();
2696 scrollbar_show (1); 2754 scrollBar.show (1);
2697 break; 2755 break;
2698 2756
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2757 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2758 case 'n':
2701 scr_charset_choose (2); 2759 scr_charset_choose (2);
… …
2708 } 2766 }
2709} 2767}
2710/*}}} */ 2768/*}}} */
2711 2769
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2771enum {
2715 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2773 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2717 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2774 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2718 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2775 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2778 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2779 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2780 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2781};
2725 2782
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2783#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2784 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2785 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2786#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2787 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2788
2732const unsigned char csi_defaults[] = 2789static const unsigned char csi_defaults[] =
2733 { 2790 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2791 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2792 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2793 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2794 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2738 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2795 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2739 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2740 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2741 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2799 };
2743/* *INDENT-ON* */
2744 2800
2745void 2801void ecb_hot
2746rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2747{ 2803{
2748 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2749 unsigned int nargs, p; 2805 unsigned int nargs, p;
2750 int n, ndef; 2806 int n, ndef;
2751 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2752 2808
2753 nargs = 0; 2809 nargs = 0;
2754 2810
2755 priv = 0; 2811 priv = 0;
2756 ch = cmd_getc (); 2812 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2813 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2814 {
2759 /* '<' '=' '>' '?' */ 2815 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2816 priv = ch;
2761 ch = cmd_getc (); 2817 ch = cmd_getc ();
2762 } 2818 }
2763 2819
2820 prev_ch = 0;
2764 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2765 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2766 { 2823 {
2767 if (isdigit (ch)) 2824 if (isdigit (ch))
2768 { 2825 {
… …
2778 n = -1; 2835 n = -1;
2779 } 2836 }
2780 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2781 process_nonprinting (ch); 2838 process_nonprinting (ch);
2782 2839
2840 prev_ch = ch;
2783 ch = cmd_getc (); 2841 ch = cmd_getc ();
2784 } 2842 }
2785 2843
2786 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2787 return; 2845 return;
… …
2818 2876
2819 case '?': 2877 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2893 }
2894 break;
2895 }
2896
2824 return; 2897 return;
2825 } 2898 }
2826 2899
2827 switch (ch) 2900 switch (ch)
2828 { 2901 {
… …
2842 } 2915 }
2843 break; 2916 break;
2844#endif 2917#endif
2845 2918
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2926 break;
2854 2927
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3006 scr_insert_mode (1); 3079 scr_insert_mode (1);
3007 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3008 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3009 break; 3082 break;
3010 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3011 /* 3089 /*
3012 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3013 */ 3091 */
3014 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3015 if (nargs == 1) 3093 if (nargs == 1)
… …
3043 } 3121 }
3044} 3122}
3045/*}}} */ 3123/*}}} */
3046 3124
3047#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3126void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3128{
3052 int x, y; 3129 int x, y;
3053 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
… …
3062 { 3139 {
3063 /* 3140 /*
3064 * commands 3141 * commands
3065 */ 3142 */
3066 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3068 break; 3145 break;
3069 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3148 break;
3072 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3151 break;
3075 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3154 break;
3078 case 5: /* raise window */ 3155 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3080 break; 3157 break;
3081 case 6: /* lower window */ 3158 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3083 break; 3160 break;
3084 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3085 scr_touch (true); 3162 scr_touch (true);
3086 break; 3163 break;
3087 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
… …
3090 break; 3167 break;
3091 3168
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3170 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3097 break; 3174 break;
3098 3175
3099 /* 3176 /*
3100 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3101 */ 3178 */
3102 case 11: /* report window state */ 3179 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3182 break;
3106 case 13: /* report window position */ 3183 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3189 break;
3113 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3193 break;
3117 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3196 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3199 break;
3123 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3124 { 3201 {
3125 char *s; 3202 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3205 XFree (s);
3129 } 3206 }
3130 break; 3207 break;
3131 case 21: /* report window title */ 3208 case 21: /* report window title */
3132 { 3209 {
3133 char *s; 3210 char *s;
3134 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3212 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3213 XFree (s);
3137 } 3214 }
3138 break; 3215 break;
3139 } 3216 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3272 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3273 */
3197void 3274void
3198rxvt_term::process_dcs_seq () 3275rxvt_term::process_dcs_seq ()
3199{ 3276{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3277 /*
3204 * Not handled yet 3278 * Not handled yet
3205 */ 3279 */
3280
3281 unicode_t eh;
3206 s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3207 if (s) 3283 if (s)
3208 free (s); 3284 free (s);
3209 3285
3210 return; 3286 return;
3211} 3287}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3291 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3292 */
3217void 3293void
3218rxvt_term::process_osc_seq () 3294rxvt_term::process_osc_seq ()
3219{ 3295{
3220 unicode_t ch, eh;
3221 int arg; 3296 int arg;
3222 3297
3223 ch = cmd_getc (); 3298 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3299 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3300 arg = arg * 10 + (ch - '0');
3226 3301
3227 if (ch == ';') 3302 if (ch == ';')
3228 { 3303 {
3304 unicode_t eh;
3229 char *s = get_to_st (eh); 3305 char *s = get_to_st (eh);
3230 3306
3231 if (s) 3307 if (s)
3232 { 3308 {
3233 process_xterm_seq (arg, s, eh); 3309 process_xterm_seq (arg, s, eh);
… …
3257 3333
3258/* 3334/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3335 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3336 */
3261void 3337void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3338rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3339{
3264 int color; 3340 int color;
3265 char *buf, *name; 3341 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3342 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3343 int saveop = op;
… …
3294 unsigned long bytes_after; 3370 unsigned long bytes_after;
3295 unsigned char *value = 0; 3371 unsigned char *value = 0;
3296 const char *str = ""; 3372 const char *str = "";
3297 3373
3298 if (prop 3374 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3379 && actual_type != None
3304 && actual_format == 8) 3380 && actual_format == 8)
… …
3308 3384
3309 XFree (value); 3385 XFree (value);
3310 } 3386 }
3311 else 3387 else
3312 { 3388 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3389 char *eq = strchr (str, '=');
3314 3390
3315 if (eq) 3391 if (eq)
3316 { 3392 {
3317 *eq = 0; 3393 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3319 } 3395 }
3320 else 3396 else
3321 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3398 display->atom (str));
3323 } 3399 }
3324 break; 3400 break;
3325 3401
3326 case XTerm_Color: 3402 case XTerm_Color:
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3434 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3435 break;
3360 case XTerm_Color_pointer_bg: 3436 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3437 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3438 break;
3439#ifdef OPTION_HC
3440 case XTerm_Color_HC:
3441 process_color_seq (op, Color_HC, str, resp);
3442 break;
3443 case XTerm_Color_HTC:
3444 process_color_seq (op, Color_HTC, str, resp);
3445 break;
3446#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3447#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3448 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3449 process_color_seq (op, Color_BD, str, resp);
3370 break; 3450 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3451 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3452 process_color_seq (op, Color_UL, str, resp);
3374 break; 3453 break;
3375 case URxvt_Color_IT: 3454 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3455 process_color_seq (op, Color_IT, str, resp);
3377 break; 3456 break;
3378#endif 3457#endif
3379#if ENABLE_TRANSPARENCY 3458 case URxvt_Color_border:
3459 process_color_seq (op, Color_border, str, resp);
3460 break;
3461
3462#if BG_IMAGE_FROM_ROOT
3380 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3382 { 3465 {
3383 bool changed = false; 3466 bool changed = false;
3384 3467
3385 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3470
3390 if (changed) 3471 if (changed)
3391 update_background (); 3472 update_background ();
3392 } 3473 }
3393 3474
… …
3397#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3398 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3400 { 3481 {
3401 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3402 3487
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3488 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3489 h_scale, v_scale,
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3490 h_align, v_align);
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3492 }
3408 else 3493 else
3409 { 3494 {
3410 int changed = 0; 3495 bool changed = false;
3411 3496
3412 if (*str != ';') 3497 if (*str != ';')
3413 { 3498 {
3414 /* reset to default scaling :*/ 3499 try
3415 bgPixmap.unset_geometry (); 3500 {
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3501 fimage.set_file_geometry (this, str);
3417 changed++; 3502 changed = true;
3418 str = strchr (str, ';'); 3503 }
3419 if (str == NULL) 3504 catch (const class rxvt_failure_exception &e)
3420 bgPixmap.set_defaultGeometry (); 3505 {
3506 }
3421 } 3507 }
3422 3508 else
3423 while (str)
3424 { 3509 {
3425 str++; 3510 str++;
3426 if (bgPixmap.set_geometry (str)) 3511 if (fimage.set_geometry (str, true))
3427 changed++; 3512 changed = true;
3428 str = strchr (str, ';');
3429 } 3513 }
3430 3514
3431 if (changed) 3515 if (changed)
3516 {
3517 if (bg_window_position_sensitive ())
3518 {
3519 int x, y;
3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3432 update_background (); 3524 update_background ();
3525 }
3433 } 3526 }
3434 break; 3527 break;
3435#endif 3528#endif
3436 3529
3437 case XTerm_logfile: 3530 case XTerm_logfile:
… …
3507 break; 3600 break;
3508#endif 3601#endif
3509 3602
3510#if ENABLE_PERL 3603#if ENABLE_PERL
3511 case URxvt_perl: 3604 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3606 break;
3515#endif 3607#endif
3516 } 3608 }
3517} 3609}
3518/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3617 * 's' = save
3526 * 'r' = restore 3618 * 'r' = restore
3527 * 't' = toggle 3619 * 't' = toggle
3528 * so no need for fancy checking 3620 * so no need for fancy checking
3529 */ 3621 */
3530int 3622int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3624{
3533 int state; 3625 int state;
3534 3626
3535 if (mode == 's') 3627 if (mode == 's')
3536 { 3628 {
3537 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3538 return -1; 3633 return -1;
3539 } 3634 }
3540 else 3635 else
3541 { 3636 {
3542 if (mode == 'r') 3637 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3639 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3547 } 3646 }
3548 3647
3549 return state; 3648 return state;
3550} 3649}
3551 3650
3552/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3553void 3652void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3654{
3556 unsigned int i, j; 3655 unsigned int i, j;
3557 int state; 3656 int state;
3558 3657
3559 static const struct 3658 static const struct
3560 { 3659 {
3561 const int argval; 3660 const int argval;
3562 const unsigned long bit; 3661 const unsigned long bit;
3563 } argtopriv[] = { 3662 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3663 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3665 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3667 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3668 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3669 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3670 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3672 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3677#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3679 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3682 // 45 margin bell NYI
3582 // 46 start logging 3683 // 46 start logging
3583 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3685 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3687 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3688#endif
3588 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3691 { 1003, PrivMode_MouseAnyEvent },
3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3707 { 2004, PrivMode_BracketPaste },
3601 }; 3708 };
3602 3709
… …
3612 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3613 { 3720 {
3614 state = -1; 3721 state = -1;
3615 3722
3616 /* basic handling */ 3723 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3619 { 3726 {
3620 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3621 break; 3728 break;
3622 } 3729 }
… …
3630 3737
3631 scr_touch (true); 3738 scr_touch (true);
3632 break; 3739 break;
3633#endif 3740#endif
3634 case 1048: /* alternative cursor save */ 3741 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3743 if (mode == 0)
3638 scr_cursor (RESTORE); 3744 scr_cursor (RESTORE);
3639 else if (mode == 1) 3745 else if (mode == 1)
3640 scr_cursor (SAVE); 3746 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3758 * within VT52 mode
3653 */ 3759 */
3654 PrivMode (1, PrivMode_vt52); 3760 priv_modes |= PrivMode_vt52;
3655 break; 3761 break;
3656 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3765 break;
3663 case 4: /* smooth scrolling */ 3766 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3767 set_option (Opt_jumpScroll, !state);
3665 break; 3768 break;
3666 case 5: /* reverse video */ 3769 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3782 break;
3680#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3681 case scrollBar_esc: 3784 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3785 scrollBar.map (state);
3683 {
3684 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3787 scr_touch (true);
3686 }
3687 break; 3788 break;
3688#endif 3789#endif
3689 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3690 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3691 break; 3792 break;
… …
3704 case 1003: 3805 case 1003:
3705 if (state) 3806 if (state)
3706 { 3807 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3709 vt_emask_mouse = PointerMotionMask; 3811 vt_emask_mouse = PointerMotionMask;
3710 } 3812 }
3711 else 3813 else
3712 vt_emask_mouse = NoEventMask; 3814 vt_emask_mouse = NoEventMask;
3815
3713 vt_select_input (); 3816 vt_select_input ();
3714 break; 3817 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3818 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3819 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3820 break;
3718 case 1011: /* scroll to bottom on key press */ 3821 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3822 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3823 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3824 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3826 if (!state)
3724 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828
3725 scr_change_screen (state); 3829 scr_change_screen (state);
3726 break; 3830 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3831 case 1049: /* secondary screen w/ clearing first */
3832 if (option (Opt_secondaryScreen))
3833 if (state)
3834 scr_cursor (SAVE);
3835
3728 scr_change_screen (state); 3836 scr_change_screen (state);
3837
3729 if (option (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3839 if (state)
3731 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841 else
3842 scr_cursor (RESTORE);
3732 break; 3843 break;
3733 default: 3844 default:
3734 break; 3845 break;
3735 } 3846 }
3736 } 3847 }
3737} 3848}
3738/*}}} */ 3849/*}}} */
3739 3850
3740/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3741void 3852void ecb_hot
3742rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3743{ 3854{
3744 unsigned int i; 3855 unsigned int i;
3745 short rendset; 3856 short rendset;
3746 int rendstyle; 3857 int rendstyle;
… …
3887 break; 3998 break;
3888#endif 3999#endif
3889 } 4000 }
3890 } 4001 }
3891} 4002}
3892/*}}} */
3893 4003
3894/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3895void 4004void
3896rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
3897{ 4006{
3898 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
3899
3900 if (cmd == 'Q')
3901 {
3902 /* query graphics */
3903 tt_printf ("\033G0\012"); /* no graphics */
3904 return; 4008 return;
3905 } 4009
3906 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
3907 do 4011
3908 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
3909 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
3910} 4018}
3911/*}}} */ 4019/*}}} */
3912 4020
3913/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3914 4022
… …
3930 4038
3931/* ---------------------------------------------------------------------- */ 4039/* ---------------------------------------------------------------------- */
3932/* Write data to the pty as typed by the user, pasted with the mouse, 4040/* Write data to the pty as typed by the user, pasted with the mouse,
3933 * or generated by us in response to a query ESC sequence. 4041 * or generated by us in response to a query ESC sequence.
3934 */ 4042 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 4044
3937void 4045void
3938rxvt_term::tt_write (const char *data, unsigned int len) 4046rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 4047{
3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3945 4053
3946 if (v_buflen == 0) 4054 if (v_buflen == 0)
3947 { 4055 {
3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4056 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3949 4057
4058 max_it (written, 0);
4059
3950 if ((unsigned int)written == len) 4060 if (written == len)
3951 return; 4061 return;
3952 4062
3953 data += written; 4063 data += written;
3954 len -= written; 4064 len -= written;
3955 } 4065 }
3956 4066
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4067 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4068
3959 memcpy (v_buffer + v_buflen, data, len); 4069 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4070 v_buflen += len;
3961 4071
3962 pty_ev.set (ev::READ | ev::WRITE); 4072 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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