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.501 by sf-exg, Fri Nov 25 09:00:40 2011 UTC vs.
Revision 1.596 by root, Sun Nov 21 23:36:36 2021 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-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 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 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
325 }; 324 };
326 325
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 336# endif
338#endif 337#endif
339 return keysym; 338 return keysym;
340} 339}
341 340
342static inline int 341static inline int ecb_cold
343map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
344{ 343{
345 int param = 0; 344 int param = 0;
346 345
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 371 param = 3;
373 break; 372 break;
374 case XK_Select: 373 case XK_Select:
375 param = 4; 374 param = 4;
376 break; 375 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 376 case XK_Prior:
379 param = 5; 377 param = 5;
380 break; 378 break;
381 case XK_Next: 379 case XK_Next:
382 param = 6; 380 param = 6;
… …
385 param = 7; 383 param = 7;
386 break; 384 break;
387 case XK_End: 385 case XK_End:
388 param = 8; 386 param = 8;
389 break; 387 break;
390#endif
391 case XK_Help: 388 case XK_Help:
392 param = 28; 389 param = 28;
393 break; 390 break;
394 case XK_Menu: 391 case XK_Menu:
395 param = 29; 392 param = 29;
396 break; 393 break;
397 } 394 }
398 return param; 395 return param;
399} 396}
400 397
401void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
403{ 409{
404 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
405 KeySym keysym; 411 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
408 414
409#if ISO_14755 415#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
411 return; 417 return;
412#endif 418#endif
… …
421 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
423 429
424 kbuf[0] = 0; 430 kbuf[0] = 0;
425 431
426#ifdef USE_XIM 432#if USE_XIM
427 if (Input_Context) 433 if (Input_Context)
428 { 434 {
429 Status status_return; 435 Status status_return;
430 436
431#if 0 437#if 0
… …
469 } 475 }
470 } 476 }
471 else 477 else
472 len = 0; 478 len = 0;
473 } 479 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 480 }
478 else 481 else
479#endif 482#endif
480 { 483 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
483 } 488 {
489 KeySym orig_keysym = keysym;
484 490
485 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
486 { 704 {
487#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 707 return;
490#endif 708#endif
491 709
492 if (saveLines) 710 if (saveLines)
493 { 711 {
… …
506#endif 724#endif
507 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
508 726
509 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
510 { 728 {
511 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
512 return; 730 return;
513 } 731 }
514 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
515 { 733 {
516 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
517 return; 735 return;
518 } 736 }
519 } 737 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
522 { 740 {
523 if (keysym == XK_Up) 741 if (keysym == XK_Up)
524 { 742 {
525 scr_page (UP, 1); 743 scr_page (1);
526 return; 744 return;
527 } 745 }
528 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
529 { 747 {
530 scr_page (DN, 1); 748 scr_page (-1);
531 return; 749 return;
532 } 750 }
533 } 751 }
534#endif 752#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
537 { 755 {
538 if (keysym == XK_Home) 756 if (keysym == XK_Home)
539 { 757 {
540 scr_move_to (0, 1); 758 scr_changeview (top_row);
541 return; 759 return;
542 } 760 }
543 else if (keysym == XK_End) 761 else if (keysym == XK_End)
544 { 762 {
545 scr_move_to (1, 1); 763 scr_changeview (0);
546 return; 764 return;
547 } 765 }
548 } 766 }
549#endif 767#endif
550 } 768 }
551 769
552 if (shft) 770 if (shft)
553 { 771 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 773 {
562 switch (keysym) 774 switch (keysym)
563 { 775 {
564 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 785 return;
574#endif 786#endif
575 } 787 }
576 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
577 } 804 }
578 805
579#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 807 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 863 {
637 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
638 return; 865 return;
639 } 866 }
640#endif 867#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80;
801#endif
802 }
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /* escape prefix */
847 if (meta
848#ifdef META8_OPTION
849 && meta_char == C0_ESC
850#endif
851 )
852 {
853 const char ch = C0_ESC;
854 tt_write (&ch, 1);
855 }
856
857 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
858} 874}
859 875
860void 876void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
862{ 878{
863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
864 KeySym keysym; 880 KeySym keysym;
865 881
… …
937void 953void
938rxvt_term::flush () 954rxvt_term::flush ()
939{ 955{
940 flush_ev.stop (); 956 flush_ev.stop ();
941 957
942#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
944 { 960 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 962 scr_touch (false);
947 } 963 }
… …
987 while (row < end_row); 1003 while (row < end_row);
988 } 1004 }
989 1005
990 scr_refresh (); 1006 scr_refresh ();
991 scrollBar.show (1); 1007 scrollBar.show (1);
992#ifdef USE_XIM 1008#if USE_XIM
993 im_send_spot (); 1009 im_send_spot ();
994#endif 1010#endif
995 } 1011 }
996 1012
997 display->flush (); 1013 display->flush ();
… …
1016 flush (); 1032 flush ();
1017} 1033}
1018 1034
1019#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1020void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1022{ 1056{
1023 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1024 want_refresh = 1; 1058 want_refresh = 1;
1025 refresh_check (); 1059 refresh_check ();
… …
1058 1092
1059#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1060void 1094void
1061rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1062{ 1096{
1063 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1064 { 1098 {
1065 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1066 want_refresh = 1; 1100 want_refresh = 1;
1067 refresh_check (); 1101 refresh_check ();
1068 } 1102 }
… …
1073 1107
1074#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1075void 1109void
1076rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1077{ 1111{
1078 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1079 { 1113 {
1080 want_refresh = 1; 1114 want_refresh = 1;
1081 refresh_check (); 1115 refresh_check ();
1082 } 1116 }
1083 1117
… …
1204 pty_write (); 1238 pty_write ();
1205 1239
1206 refresh_check (); 1240 refresh_check ();
1207} 1241}
1208 1242
1209void 1243void ecb_cold
1210rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1211{ 1245{
1212 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1213 recolour_cursor (); 1247 recolor_cursor ();
1214 1248
1215#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1216 hidden_pointer = 0; 1250 hidden_pointer = 0;
1217 1251
1218 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1219 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1220#endif 1254#endif
1221} 1255}
1222 1256
1223#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1224void 1258void ecb_cold
1225rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1226{ 1260{
1227 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1228 return; 1262 return;
1229 1263
… …
1231 XFlush (dpy); 1265 XFlush (dpy);
1232 1266
1233 hidden_pointer = 1; 1267 hidden_pointer = 1;
1234} 1268}
1235 1269
1236void 1270void ecb_cold
1237rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1238{ 1272{
1239 make_current (); 1273 make_current ();
1240 1274
1241 pointer_blank (); 1275 pointer_blank ();
… …
1243#endif 1277#endif
1244 1278
1245void 1279void
1246rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1247{ 1281{
1248 int button_number, key_state = 0; 1282 int button_number, state = 0;
1249 int x, y; 1283 int x, y;
1250 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1251 1285
1252 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1253 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1254 1288
1255 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1257 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1258 return; 1292 return;
1259 1293
1260 mouse_row = x; 1294 mouse_row = x;
1261 mouse_col = y; 1295 mouse_col = y;
1262 code += 32; 1296 state += 32;
1263 }
1264
1265 if (MEvent.button == AnyButton)
1266 button_number = 3;
1267 else
1268 { 1297 }
1298
1269 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1301 if (button_number >= 3)
1272 button_number += 64 - 3; 1302 button_number += 64 - 3;
1273 }
1274 1303
1275 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1276 { 1305 {
1277 /* 1306 /*
1278 * do not report ButtonRelease 1307 * do not report ButtonRelease
1279 * no state info allowed 1308 * no state info allowed
1280 */ 1309 */
1281 key_state = 0; 1310 if (release)
1282 if (button_number == 3)
1283 return; 1311 return;
1284 } 1312 }
1285 else 1313 else
1286 { 1314 {
1287 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1289 * 8 = Meta 1317 * 8 = Meta
1290 * 16 = Control 1318 * 16 = Control
1291 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1292 * 32 = Double Click 1320 * 32 = Double Click
1293 */ 1321 */
1294 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1295 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1296 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1297#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1298 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1299#endif 1327#endif
1300 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1301 1331
1302#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1303 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1304 if (key_state & 16) 1334 if (state & 16)
1305 fputc ('C', stderr); 1335 fputc ('C', stderr);
1306 if (key_state & 4) 1336 if (state & 4)
1307 fputc ('S', stderr); 1337 fputc ('S', stderr);
1308 if (key_state & 8) 1338 if (state & 8)
1309 fputc ('A', stderr); 1339 fputc ('A', stderr);
1310 if (key_state & 32) 1340 if (state & 32)
1311 fputc ('2', stderr); 1341 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1343 button_number,
1314 x, 1344 x,
1315 y); 1345 y);
1316#endif 1346#endif
1317 1347
1318#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1320 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state, 1357 code,
1322 x, 1358 x,
1323 y); 1359 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1325 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state, 1362 code,
1327 wint_t (32 + x), 1363 wint_t (32 + x),
1328 wint_t (32 + y)); 1364 wint_t (32 + y));
1329 else 1365 else
1330#endif 1366#endif
1331 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1332 code + button_number + key_state, 1368 code,
1333 32 + x, 1369 32 + x,
1334 32 + y); 1370 32 + y);
1335} 1371}
1336 1372
1337/*{{{ process an X event */ 1373/*{{{ process an X event */
1338void 1374void ecb_hot
1339rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1340{ 1376{
1341 make_current (); 1377 make_current ();
1342 1378
1343 dLocal (Display *, dpy); 1379 dLocal (Display *, dpy);
… …
1446 if (ev.xconfigure.window == parent) 1482 if (ev.xconfigure.window == parent)
1447 { 1483 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1485 ;
1450 1486
1451#ifdef HAVE_BG_PIXMAP 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1452 bool moved = false; 1488
1453 if (bg_window_position_sensitive ()) 1489 if (want_position_change)
1454 { 1490 {
1455 int x, y; 1491 int x, y;
1492
1456 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
1457 { 1494 {
1458 x = ev.xconfigure.x; 1495 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y; 1496 y = ev.xconfigure.y;
1460 } 1497 }
1461 else 1498 else
1462 get_window_origin (x, y); 1499 get_window_origin (x, y);
1463 1500
1464 if (bg_set_position (x, y) 1501 if (x != parent_x || y != parent_y)
1465 || !(bg_flags & BG_IS_VALID)) 1502 {
1466 moved = true; 1503 parent_x = x;
1504 parent_y = y;
1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1506 }
1467 } 1507 }
1468#endif
1469 1508
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1510 {
1472 seen_resize = 1; 1511 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1513 }
1475 else
1476 {
1477#ifdef HAVE_BG_PIXMAP
1478 if (moved)
1479 update_background ();
1480#endif
1481 }
1482 1514
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 } 1516 }
1485 break; 1517 break;
1486 1518
… …
1495 case SelectionRequest: 1527 case SelectionRequest:
1496 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1497 break; 1529 break;
1498 1530
1499 case MapNotify: 1531 case MapNotify:
1500#ifdef HAVE_BG_PIXMAP
1501 /* This is needed specifically to fix the case of no window manager or a
1502 * non-reparenting window manager. In those cases we never get first
1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1505 * reparenting.
1506 * We should not render background immediately, as there could be several
1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1508 * by scheduling background redraw as soon as we can, but giving a short
1509 * bit of time for ConfigureNotifies to arrive.
1510 * We should render background PRIOR to drawing any text, but AFTER all
1511 * of ConfigureNotifys for the best results.
1512 */
1513 if (!(bg_flags & BG_IS_VALID))
1514 update_background_ev.start (0.025);
1515#endif
1516 mapped = 1; 1532 mapped = 1;
1517#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1518 text_blink_ev.start (); 1534 text_blink_ev.start ();
1519#endif 1535#endif
1520 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1569 case MotionNotify: 1585 case MotionNotify:
1570#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1571 if (hidden_pointer) 1587 if (hidden_pointer)
1572 pointer_unblank (); 1588 pointer_unblank ();
1573#endif 1589#endif
1590 if (!bypass_keystate
1574 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1575 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1576 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1577 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1578 break; 1595 break;
1579 1596
1580 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1592 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1593 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1594 &ev.xbutton.state); 1611 &ev.xbutton.state);
1595#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1596 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1597 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1598 { 1616 {
1599#endif
1600#if ISO_14755 1617#if ISO_14755
1601 // 5.4 1618 // 5.4
1602 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1603 { 1620 {
1604 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1610 1627
1611#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1612 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1613 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1614 { 1631 {
1632 page_dirn scroll_selection_dir;
1615 int dist; 1633 int dist;
1616 1634
1617 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1618 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1619 */ 1637 */
… …
1634 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1635 } 1653 }
1636 else 1654 else
1637 { 1655 {
1638 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1639 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1640 } 1658 }
1641 1659
1642 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1643 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1644 + 1; 1662 + 1;
1645 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1646 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1647 } 1666 }
1648 else 1667 else
1649 { 1668 {
1650 /* we are within the text window, so we 1669 /* we are within the text window, so we
1651 * shouldn't be scrolling 1670 * shouldn't be scrolling
1652 */ 1671 */
1653 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1654 } 1673 }
1655#endif 1674#endif
1656#ifdef MOUSE_THRESHOLD
1657 } 1675 }
1658#endif
1659 } 1676 }
1660 } 1677 }
1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1662 { 1679 {
1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1676 } 1693 }
1677 break; 1694 break;
1678 } 1695 }
1679 1696
1680#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1681 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.again (); 1699 cursor_blink_reset ();
1690 }
1691#endif 1700#endif
1692 1701
1693#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1694 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1704 {
… …
1706 1715
1707 refresh_check (); 1716 refresh_check ();
1708} 1717}
1709 1718
1710#if ENABLE_FRILLS 1719#if ENABLE_FRILLS
1711void 1720void ecb_cold
1712rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1713{ 1722{
1714 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1715 return; 1724 return;
1716 1725
… …
1722 XFree (h); 1731 XFree (h);
1723 } 1732 }
1724} 1733}
1725#endif 1734#endif
1726 1735
1727void 1736void ecb_cold
1728rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1729{ 1738{
1730 if (!focus) 1739 if (!focus)
1731 { 1740 {
1732 focus = 1; 1741 focus = 1;
… …
1745#endif 1754#endif
1746#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1748 { 1757 {
1749 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1750 scr_recolour (); 1759 scr_recolor ();
1751 } 1760 }
1752#endif 1761#endif
1753#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1755 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1756#endif 1768#endif
1757 1769
1758 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 } 1771 }
1760} 1772}
1761 1773
1762void 1774void ecb_cold
1763rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1764{ 1776{
1765 if (focus) 1777 if (focus)
1766 { 1778 {
1767 focus = 0; 1779 focus = 0;
1768 want_refresh = 1; 1780 want_refresh = 1;
1769 1781
1770#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1771 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1772 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1773#endif 1788#endif
1774#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1775 if (iso14755buf) 1790 if (iso14755buf)
1776 { 1791 {
1777 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1792#endif 1807#endif
1793#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1795 { 1810 {
1796 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1812 scr_recolor ();
1798 } 1813 }
1799#endif 1814#endif
1800 1815
1801 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1802 } 1817 }
1803} 1818}
1804 1819
1805void 1820void ecb_cold
1806rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1807{ 1822{
1808#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1810 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1811 rgba c; 1829 rgba c;
1812 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1813 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1814 } 1832 }
1815#endif 1833#endif
1816} 1834}
1817 1835
1818#if ENABLE_TRANSPARENCY || ENABLE_PERL 1836#if ENABLE_PERL
1819void 1837void ecb_hot
1820rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1839{
1822 make_current (); 1840 make_current ();
1823 1841
1824 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1825 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1826 return; 1844 return;
1827 1845
1828# if ENABLE_TRANSPARENCY
1829 switch (ev.type) 1846 switch (ev.type)
1830 { 1847 {
1831 case PropertyNotify: 1848 case PropertyNotify:
1832 /* 1849 /*
1833 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1834 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1835 */ 1852 */
1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1838 { 1855 {
1839 bg_set_root_pixmap (); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1840 update_background ();
1841 } 1857 }
1842 1858
1843 break; 1859 break;
1844 } 1860 }
1845# endif
1846 1861
1847 refresh_check (); 1862 refresh_check ();
1848} 1863}
1849#endif 1864#endif
1850 1865
… …
1873 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1874 return; 1889 return;
1875 } 1890 }
1876#endif 1891#endif
1877 1892
1878 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1879 1894
1880 if (reportmode) 1895 if (reportmode)
1881 { 1896 {
1882 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1883 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
… …
2133#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2134 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2135 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2136 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2137 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2138 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2139 { 2154 {
2140 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2141 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2142 mouse_report (ev); 2157 mouse_report (ev);
2143 } 2158 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2146 mouse_report (ev); 2161 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2163 return;
2149 } 2164 }
2150 2165
… …
2163 case Button3: 2178 case Button3:
2164 selection_make (ev.time); 2179 selection_make (ev.time);
2165 break; 2180 break;
2166 2181
2167 case Button2: 2182 case Button2:
2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2183 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2185 break;
2171 2186
2172#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2173 case Button4: 2188 case Button4:
2174 case Button5: 2189 case Button5:
2175 { 2190 {
2176 int i; 2191 int lines;
2177 page_dirn v; 2192 page_dirn dirn;
2178 2193
2179 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2180 2195
2181 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2182 i = 1; 2197 lines = 1;
2183 else if (option (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2199 lines = nrow - 1;
2185 else 2200 else
2186 i = 5; 2201 lines = 5;
2187 2202
2188# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2189 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2190 { 2205 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2208
2195 if (!slip_wheel_ev.is_active ()) 2209 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197 } 2211 }
2198 else 2212 else
2199# endif 2213# endif
2200 { 2214 {
2201 scr_page (v, i); 2215 scr_page (dirn, lines);
2202 scrollBar.show (1); 2216 scrollBar.show (1);
2203 } 2217 }
2204 } 2218 }
2205 break; 2219 break;
2206#endif 2220#endif
… …
2208 } 2222 }
2209} 2223}
2210 2224
2211/*}}} */ 2225/*}}} */
2212 2226
2213void 2227void ecb_hot
2214rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2215{ 2229{
2216 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2217 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2218 2232
… …
2337 } 2351 }
2338 } 2352 }
2339} 2353}
2340 2354
2341// read the next character 2355// read the next character
2342wchar_t 2356wchar_t ecb_hot
2343rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2344{ 2358{
2345 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2346 { 2360 {
2347 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2349 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2350 2364
2351 wchar_t wc; 2365 wchar_t wc;
2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2353 2367
… …
2359 } 2373 }
2360 2374
2361 if (len == (size_t)-1) 2375 if (len == (size_t)-1)
2362 { 2376 {
2363 mbstate.reset (); // reset now undefined conversion state 2377 mbstate.reset (); // reset now undefined conversion state
2378 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2379 // in which case we "erroneously" return the next byte which might be valid.
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2380 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365 } 2381 }
2366 2382
2367 // assume wchar == unicode 2383 // assume wchar == unicode
2368 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
… …
2371 2387
2372 return NOCHAR; 2388 return NOCHAR;
2373} 2389}
2374 2390
2375// read the next octet 2391// read the next octet
2376uint32_t 2392uint32_t ecb_hot
2377rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2378{ 2394{
2379 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2380 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2381 : NOCHAR; 2397 : NOCHAR;
2382} 2398}
2383 2399
2384static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2385 2401
2386wchar_t 2402wchar_t ecb_hot
2387rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2388{ 2404{
2389 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2390 2406
2391 if (c == NOCHAR) 2407 if (c == NOCHAR)
2392 throw out_of_input; 2408 throw out_of_input;
2393 2409
2394 return c; 2410 return c;
2395} 2411}
2396 2412
2397uint32_t 2413uint32_t ecb_hot
2398rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2399{ 2415{
2400 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2401 2417
2402 if (c == NOCHAR) 2418 if (c == NOCHAR)
2403 throw out_of_input; 2419 throw out_of_input;
… …
2406} 2422}
2407 2423
2408/*{{{ print pipe */ 2424/*{{{ print pipe */
2409/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2410#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2411FILE * 2427FILE * ecb_cold
2412rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2413{ 2429{
2414 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2430 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2415 2431
2416 if (stream == NULL) 2432 if (stream == NULL)
2417 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2418 2434
2419 return stream; 2435 return stream;
2420} 2436}
2421 2437
2422int 2438int ecb_cold
2423rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2424{ 2440{
2425 fflush (stream); 2441 fflush (stream);
2426 return pclose (stream); 2442 return pclose (stream);
2427} 2443}
2428 2444
2429/* 2445/*
2430 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2431 */ 2447 */
2432void 2448void ecb_cold
2433rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2434{ 2450{
2435 FILE *fd = popen_printer (); 2451 FILE *fd = popen_printer ();
2436 2452
2437 if (!fd) 2453 if (!fd)
… …
2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2508 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2509 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2494}; 2510};
2495 2511
2496/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2497void 2513void ecb_hot
2498rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2499{ 2515{
2500 switch (ch) 2516 switch (ch)
2501 { 2517 {
2502 case C0_ESC: 2518 case C0_ESC:
… …
2532 scr_charset_choose (0); 2548 scr_charset_choose (0);
2533 break; 2549 break;
2534 2550
2535#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2536 // 8-bit controls 2552 // 8-bit controls
2537 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2538 process_dcs_seq (); 2554 process_dcs_seq ();
2539 break; 2555 break;
2540 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2541 process_csi_seq (); 2557 process_csi_seq ();
2542 break; 2558 break;
2543 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2544 process_osc_seq (); 2560 process_osc_seq ();
2545 break; 2561 break;
2546#endif 2562#endif
2547 } 2563 }
2548} 2564}
2549/*}}} */ 2565/*}}} */
2550 2566
2551 2567
2552/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
2553void 2569void ecb_cold
2554rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
2555{ 2571{
2556 int row, col; 2572 int row, col;
2557 2573
2558 switch (ch) 2574 switch (ch)
… …
2608} 2624}
2609/*}}} */ 2625/*}}} */
2610 2626
2611 2627
2612/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
2613void 2629void ecb_hot
2614rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
2615{ 2631{
2616 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
2617 2633
2618 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
2676 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678 } 2694 }
2679 break; 2695 break;
2680 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2681 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2682 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2683 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2686 break; 2703 break;
2704#endif
2687 2705
2688 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2689 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2690 scr_set_tab (1); 2708 scr_set_tab (1);
2691 break; 2709 break;
… …
2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773 }; 2791 };
2774 2792
2775void 2793void ecb_hot
2776rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
2777{ 2795{
2778 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
2779 unsigned int nargs, p; 2797 unsigned int nargs, p;
2780 int n, ndef; 2798 int n, ndef;
2781 int arg[ESC_ARGS] = { }; 2799 int arg[ESC_ARGS] = { };
2782 2800
2783 nargs = 0; 2801 nargs = 0;
… …
2789 /* '<' '=' '>' '?' '!' */ 2807 /* '<' '=' '>' '?' '!' */
2790 priv = ch; 2808 priv = ch;
2791 ch = cmd_getc (); 2809 ch = cmd_getc ();
2792 } 2810 }
2793 2811
2812 prev_ch = 0;
2794 /* read any numerical arguments */ 2813 /* read any numerical arguments */
2795 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
2796 { 2815 {
2797 if (isdigit (ch)) 2816 if (isdigit (ch))
2798 { 2817 {
… …
2808 n = -1; 2827 n = -1;
2809 } 2828 }
2810 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
2811 process_nonprinting (ch); 2830 process_nonprinting (ch);
2812 2831
2832 prev_ch = ch;
2813 ch = cmd_getc (); 2833 ch = cmd_getc ();
2814 } 2834 }
2815 2835
2816 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
2817 return; 2837 return;
… …
2847 break; 2867 break;
2848 2868
2849 case '?': 2869 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2874 break;
2853 2875
2854 case '!': 2876 case '!':
2855 if (ch == CSI_70) 2877 if (ch == CSI_70)
2856 { 2878 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset (); 2880 scr_soft_reset ();
2859 2881
2860 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2862 2884
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865 } 2887 }
2866 break; 2888 break;
… …
2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2898 break; 2920 break;
2899 2921
2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2902#ifdef ISO6429 2924#ifdef ISO6429
2903 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2904#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2905 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2906#endif 2928#endif
… …
2997 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
2998 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
2999 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3000 break; 3022 break;
3001 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3002 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
3003 break; 3025 break;
3004 } 3026 }
3005 break; 3027 break;
3006 3028
3007 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3051 scr_insert_mode (1); 3073 scr_insert_mode (1);
3052 else if (arg[0] == 20) 3074 else if (arg[0] == 20)
3053 priv_modes |= PrivMode_LFNL; 3075 priv_modes |= PrivMode_LFNL;
3054 break; 3076 break;
3055 3077
3078 case CSI_71: // DECSCUSR: set cursor style
3079 if (prev_ch == ' ')
3080 set_cursor_style (arg[0]);
3081 break;
3082
3056 /* 3083 /*
3057 * PRIVATE USE beyond this point. All CSI_7? sequences here 3084 * PRIVATE USE beyond this point. All CSI_7? sequences here
3058 */ 3085 */
3059 case CSI_72: /* DECSTBM: set top and bottom margins */ 3086 case CSI_72: /* DECSTBM: set top and bottom margins */
3060 if (nargs == 1) 3087 if (nargs == 1)
… …
3134 break; 3161 break;
3135 3162
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3163 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3164 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3165 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3166 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3167 (unsigned int) (args[1] * fheight));
3141 break; 3168 break;
3142 3169
3143 /* 3170 /*
3144 * reports - some output format copied from XTerm 3171 * reports - some output format copied from XTerm
… …
3193rxvt_term::get_to_st (unicode_t &ends_how) 3220rxvt_term::get_to_st (unicode_t &ends_how)
3194{ 3221{
3195 unicode_t ch; 3222 unicode_t ch;
3196 bool seen_esc = false; 3223 bool seen_esc = false;
3197 unsigned int n = 0; 3224 unsigned int n = 0;
3198 wchar_t string[STRING_MAX]; 3225 wchar_t string[CBUFSIZ];
3199 3226
3200 while ((ch = cmd_getc ()) != NOCHAR) 3227 while ((ch = cmd_getc ()) != NOCHAR)
3201 { 3228 {
3202 if (seen_esc) 3229 if (seen_esc)
3203 { 3230 {
… …
3218 else if (ch < 0x20) 3245 else if (ch < 0x20)
3219 return NULL; /* other control character - exit */ 3246 return NULL; /* other control character - exit */
3220 3247
3221 seen_esc = false; 3248 seen_esc = false;
3222 3249
3223 if (n >= STRING_MAX - 1) 3250 if (n >= sizeof (string) - 1)
3224 // stop at some sane length 3251 // stop at some sane length
3225 return NULL; 3252 return NULL;
3226 3253
3227 string[n++] = ch; 3254 string[n++] = ch;
3228 } 3255 }
… …
3277 free (s); 3304 free (s);
3278 } 3305 }
3279 } 3306 }
3280} 3307}
3281 3308
3309static unsigned int
3310colorcube_index (unsigned int idx_r,
3311 unsigned int idx_g,
3312 unsigned int idx_b)
3313{
3314 assert (idx_r < Red_levels);
3315 assert (idx_g < Green_levels);
3316 assert (idx_b < Blue_levels);
3317
3318 return idx_r * Blue_levels * Green_levels +
3319 idx_g * Blue_levels +
3320 idx_b;
3321}
3322
3323/*
3324 * Find the nearest color slot in the hidden color cube,
3325 * adapt its value to the 32bit RGBA color.
3326 */
3327unsigned int
3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3329{
3330 r &= 0xff;
3331 g &= 0xff;
3332 b &= 0xff;
3333 a &= 0xff;
3334
3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3336
3337 /* we allow one of the 6 closest neighbouring colours */
3338 /* to replace the current color, if they not used recently */
3339 static const signed char dxyz[][3] = {
3340 0, 0, 0,
3341 0, 0, 4,
3342 0, 4, 0,
3343 4, 0, 0,
3344 0, 4, 4,
3345 4, 4, 0,
3346 4, 0, 4,
3347 };
3348
3349 static const unsigned char color_level[8][32] = {
3350 // neighbour index
3351 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3352 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3353 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3354 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3355 // Red_levels/Green_levels/Blue_levels index
3356 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3357 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3358 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3359 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3360 };
3361
3362 unsigned int idx;
3363
3364 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3365 {
3366 unsigned int idx_r = color_level[ Red_levels - dxyz[n][0]][r / 8];
3367 unsigned int idx_g = color_level[Green_levels - dxyz[n][1]][g / 8];
3368 unsigned int idx_b = color_level[ Blue_levels - dxyz[n][2]][b / 8];
3369 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3370
3371 if (n == 0)
3372 idx = index;
3373
3374 if (rgb24_color[index] == color)
3375 {
3376 rgb24_seqno[index] = ++rgb24_sequence;
3377 return index + minTermCOLOR24;
3378 }
3379
3380 // minor issue: could update index 0 few more times
3381 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3382 {
3383 idx = index;
3384 goto update;
3385 }
3386
3387 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3388 // but also handles wrap around values good enough
3389 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3390 idx = index;
3391 }
3392
3393update:
3394 rgb24_color[idx] = color;
3395 rgb24_seqno[idx] = ++rgb24_sequence;
3396
3397 idx += minTermCOLOR24;
3398 pix_colors_focused [idx].free (this);
3399 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3400 update_fade_color (idx, false);
3401
3402 return idx;
3403}
3404
3282void 3405void
3283rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3406rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3284{ 3407{
3285 if (str[0] == '?' && !str[1]) 3408 if (str[0] == '?' && !str[1])
3286 { 3409 {
3410 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3411 return;
3412
3287 rgba c; 3413 rgba c;
3288 pix_colors_focused[color].get (c); 3414 pix_colors_focused[color].get (c);
3415 color -= minCOLOR;
3289 3416
3290#if XFT 3417#if XFT
3291 if (c.a != rgba::MAX_CC) 3418 if (c.a != rgba::MAX_CC)
3292 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3419 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3293 else 3420 else
3294#endif 3421#endif
3295 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3422 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3296 } 3423 }
3297 else 3424 else
3298 set_window_color (color, str); 3425 set_window_color (color, str);
3299} 3426}
3300 3427
… …
3345 &nitems, &bytes_after, &value) == Success 3472 &nitems, &bytes_after, &value) == Success
3346 && actual_type != None 3473 && actual_type != None
3347 && actual_format == 8) 3474 && actual_format == 8)
3348 str = (const char *)(value); 3475 str = (const char *)(value);
3349 3476
3350 tt_printf ("\033]%d;%s%c", op, str, resp); 3477 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3351 3478
3352 XFree (value); 3479 XFree (value);
3353 } 3480 }
3354 else 3481 else
3355 { 3482 {
… …
3423 break; 3550 break;
3424#endif 3551#endif
3425 case URxvt_Color_border: 3552 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp); 3553 process_color_seq (op, Color_border, str, resp);
3427 break; 3554 break;
3428#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3433
3434 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3436
3437 if (changed)
3438 update_background ();
3439 }
3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?"))
3447 {
3448 char str[256];
3449
3450 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767),
3452 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 }
3455 else
3456 {
3457 bool changed = false;
3458
3459 if (*str != ';')
3460 {
3461 if (bg_set_file (str)) /* change pixmap */
3462 changed = true;
3463 }
3464 else
3465 {
3466 str++;
3467 if (bg_set_geometry (str, true))
3468 changed = true;
3469 }
3470
3471 if (changed)
3472 {
3473 if (bg_window_position_sensitive ())
3474 {
3475 int x, y;
3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3479 update_background ();
3480 }
3481 }
3482 break;
3483#endif
3484 3555
3485 case XTerm_logfile: 3556 case XTerm_logfile:
3486 // TODO, when secure mode? 3557 // TODO, when secure mode?
3487 break; 3558 break;
3488 3559
… …
3528 rs[Rs_name], VERSION[0], VERSION[2], 3599 rs[Rs_name], VERSION[0], VERSION[2],
3529 resp); 3600 resp);
3530 break; 3601 break;
3531 3602
3532#if !ENABLE_MINIMAL 3603#if !ENABLE_MINIMAL
3604 case URxvt_cellinfo:
3605 if (query)
3606 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3607 fwidth, fheight, fbase,
3608 resp);
3609 break;
3610
3533 case URxvt_locale: 3611 case URxvt_locale:
3534 if (query) 3612 if (query)
3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3613 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3536 else 3614 else
3537 { 3615 {
… …
3572 * 's' = save 3650 * 's' = save
3573 * 'r' = restore 3651 * 'r' = restore
3574 * 't' = toggle 3652 * 't' = toggle
3575 * so no need for fancy checking 3653 * so no need for fancy checking
3576 */ 3654 */
3577int 3655int ecb_cold
3578rxvt_term::privcases (int mode, unsigned long bit) 3656rxvt_term::privcases (int mode, unsigned long bit)
3579{ 3657{
3580 int state; 3658 int state;
3581 3659
3582 if (mode == 's') 3660 if (mode == 's')
3583 { 3661 {
3584 SavedModes |= (priv_modes & bit); 3662 if (priv_modes & bit)
3663 SavedModes |= bit;
3664 else
3665 SavedModes &= ~bit;
3585 return -1; 3666 return -1;
3586 } 3667 }
3587 else 3668 else
3588 { 3669 {
3589 if (mode == 'r') 3670 if (mode == 'r')
… …
3619 { 5, PrivMode_rVideo }, // DECSCNM 3700 { 5, PrivMode_rVideo }, // DECSCNM
3620 { 6, PrivMode_relOrigin }, // DECOM 3701 { 6, PrivMode_relOrigin }, // DECOM
3621 { 7, PrivMode_Autowrap }, // DECAWM 3702 { 7, PrivMode_Autowrap }, // DECAWM
3622 // 8, auto-repeat keys // DECARM 3703 // 8, auto-repeat keys // DECARM
3623 { 9, PrivMode_MouseX10 }, 3704 { 9, PrivMode_MouseX10 },
3705 { 12, PrivMode_BlinkingCursor },
3624 // 18 end FF to printer after print screen 3706 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region 3707 // 19 Print screen prints full screen/scroll region
3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3708 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3627#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3628 { scrollBar_esc, PrivMode_scrollBar }, 3710 { scrollBar_esc, PrivMode_scrollBar },
… …
3640#endif 3722#endif
3641 { 1000, PrivMode_MouseX11 }, 3723 { 1000, PrivMode_MouseX11 },
3642 { 1002, PrivMode_MouseBtnEvent }, 3724 { 1002, PrivMode_MouseBtnEvent },
3643 { 1003, PrivMode_MouseAnyEvent }, 3725 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS 3726#if ENABLE_FRILLS
3727 { 1004, PrivMode_FocusEvent },
3645 { 1005, PrivMode_ExtModeMouse }, 3728 { 1005, PrivMode_ExtMouseUTF8 },
3729 { 1006, PrivMode_ExtMouseSGR },
3646#endif 3730#endif
3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3731 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 { 1011, PrivMode_Keypress }, // rxvt extension 3732 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS 3733#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3734 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3651#endif 3735#endif
3652 // 1035 enable modifiers for alt, numlock NYI 3736 // 1035 enable modifiers for alt, numlock NYI
3653 // 1036 send ESC for meta keys NYI 3737 // 1036 send ESC for meta keys NYI
3654 // 1037 send DEL for keypad delete NYI 3738 // 1037 send DEL for keypad delete NYI
3655 { 1047, PrivMode_Screen }, 3739 { 1047, PrivMode_Screen },
3656 // 1048 save and restore cursor, implemented in code 3740 // 1048 save and restore cursor, implemented in code
3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3741 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3742 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3743#if ENABLE_FRILLS
3659 { 2004, PrivMode_BracketPaste }, 3744 { 2004, PrivMode_BracketPaste },
3745#endif
3660 }; 3746 };
3661 3747
3662 if (nargs == 0) 3748 if (nargs == 0)
3663 return; 3749 return;
3750
3751 // DECRQM
3752 if (mode == 'p')
3753 {
3754 int status = 0;
3755 if (nargs != 1)
3756 return;
3757
3758 for (j = 0; j < ecb_array_length (argtopriv); j++)
3759 if (argtopriv[j].argval == arg[0])
3760 {
3761 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3762 break;
3763 }
3764
3765 tt_printf ("\33[?%d;%d$y", arg[0], status);
3766 return;
3767 }
3664 3768
3665 /* make lo/hi boolean */ 3769 /* make lo/hi boolean */
3666 if (mode == 'l') 3770 if (mode == 'l')
3667 mode = 0; /* reset */ 3771 mode = 0; /* reset */
3668 else if (mode == 'h') 3772 else if (mode == 'h')
… …
3737 scrollBar.map (state); 3841 scrollBar.map (state);
3738 resize_all_windows (0, 0, 0); 3842 resize_all_windows (0, 0, 0);
3739 scr_touch (true); 3843 scr_touch (true);
3740 break; 3844 break;
3741#endif 3845#endif
3846#ifdef CURSOR_BLINK
3847 case 12:
3848 cursor_blink_reset ();
3849 break;
3850#endif
3742 case 25: /* visible/invisible cursor */ 3851 case 25: /* visible/invisible cursor */
3743 scr_cursor_visible (state); 3852 scr_cursor_visible (state);
3744 break; 3853 break;
3745 /* case 35: - shift keys */ 3854 /* case 35: - shift keys */
3746 /* case 40: - 80 <--> 132 mode */ 3855 /* case 40: - 80 <--> 132 mode */
… …
3799 } 3908 }
3800} 3909}
3801/*}}} */ 3910/*}}} */
3802 3911
3803/*{{{ process sgr sequences */ 3912/*{{{ process sgr sequences */
3804void 3913void ecb_hot
3805rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3914rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3806{ 3915{
3807 unsigned int i; 3916 unsigned int i;
3808 short rendset; 3917 short rendset;
3809 int rendstyle; 3918 int rendstyle;
… …
3851 //case 19: // ninth alt font 3960 //case 19: // ninth alt font
3852 //case 20: // gothic 3961 //case 20: // gothic
3853 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3962 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3854 rendset = 0, rendstyle = RS_Bold; 3963 rendset = 0, rendstyle = RS_Bold;
3855 break; 3964 break;
3856 case 22: // normal intensity 3965 case 22: // bold off (vt220)
3857 rendset = 0, rendstyle = RS_Bold; 3966 rendset = 0, rendstyle = RS_Bold;
3858 break; 3967 break;
3859 case 23: // disable italic 3968 case 23: // disable italic
3860 rendset = 0, rendstyle = RS_Italic; 3969 rendset = 0, rendstyle = RS_Italic;
3861 break; 3970 break;
3862 case 24: 3971 case 24: // underline off (vt220)
3863 rendset = 0, rendstyle = RS_Uline; 3972 rendset = 0, rendstyle = RS_Uline;
3864 break; 3973 break;
3865 case 25: 3974 case 25: // blink off (vt220)
3866 rendset = 0, rendstyle = RS_Blink; 3975 rendset = 0, rendstyle = RS_Blink;
3867 break; 3976 break;
3868 case 26: // variable spacing (iso 8613) 3977 case 26: // variable spacing (iso 8613)
3869 rendset = 0, rendstyle = RS_Blink; 3978 rendset = 0, rendstyle = RS_Blink;
3870 break; 3979 break;
3871 case 27: 3980 case 27: // reverse off (vt220)
3872 rendset = 0, rendstyle = RS_RVid; 3981 rendset = 0, rendstyle = RS_RVid;
3873 break; 3982 break;
3874 //case 28: // visible. NYI 3983 //case 28: // visible. NYI
3875 //case 29: // not crossed-out 3984 //case 29: // not crossed-out
3876 } 3985 }
… …
3891 case 35: 4000 case 35:
3892 case 36: 4001 case 36:
3893 case 37: 4002 case 37:
3894 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4003 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3895 break; 4004 break;
3896 case 38: // set fg color, ISO 8613-6
3897 if (nargs > i + 2 && arg[i + 1] == 5)
3898 {
3899 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3900 i += 2;
3901 }
3902 break;
3903 case 39: /* default fg */ 4005 case 39: /* default fg */
3904 scr_color (Color_fg, Color_fg); 4006 scr_color (Color_fg, Color_fg);
3905 break; 4007 break;
3906 4008
3907 case 40: 4009 case 40:
… …
3912 case 45: 4014 case 45:
3913 case 46: 4015 case 46:
3914 case 47: 4016 case 47:
3915 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3916 break; 4018 break;
3917 case 48: // set bg color, ISO 8613-6
3918 if (nargs > i + 2 && arg[i + 1] == 5)
3919 {
3920 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3921 i += 2;
3922 }
3923 break;
3924 case 49: /* default bg */ 4019 case 49: /* default bg */
3925 scr_color (Color_bg, Color_bg); 4020 scr_color (Color_bg, Color_bg);
4021 break;
4022
4023 case 38: // set fg color, ISO 8613-6
4024 case 48: // set bg color, ISO 8613-6
4025 {
4026 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4027 unsigned int idx;
4028
4029 if (nargs > i + 2 && arg[i + 1] == 5)
4030 {
4031 idx = minCOLOR + arg[i + 2];
4032 i += 2;
4033
4034 scr_color (idx, fgbg);
4035 }
4036 else if (nargs > i + 4 && arg[i + 1] == 2)
4037 {
4038 unsigned int r = arg[i + 2];
4039 unsigned int g = arg[i + 3];
4040 unsigned int b = arg[i + 4];
4041 unsigned int a = 0xff;
4042
4043 idx = map_rgb24_color (r, g, b, a);
4044
4045 i += 4;
4046
4047 scr_color (idx, fgbg);
4048 }
4049 }
3926 break; 4050 break;
3927 4051
3928 //case 50: // not variable spacing 4052 //case 50: // not variable spacing
3929 4053
3930#if !ENABLE_MINIMAL 4054#if !ENABLE_MINIMAL
… …
3950 break; 4074 break;
3951#endif 4075#endif
3952 } 4076 }
3953 } 4077 }
3954} 4078}
4079
4080void
4081rxvt_term::set_cursor_style (int style)
4082{
4083 if (!IN_RANGE_INC (style, 0, 6))
4084 return;
4085
4086 if (style == 0)
4087 style = 1;
4088
4089 cursor_type = (style - 1) / 2;
4090 set_option (Opt_cursorUnderline, cursor_type == 1);
4091
4092#ifdef CURSOR_BLINK
4093 set_option (Opt_cursorBlink, style & 1);
4094 cursor_blink_reset ();
4095#endif
4096
4097 want_refresh = 1;
4098}
3955/*}}} */ 4099/*}}} */
3956 4100
3957/* ------------------------------------------------------------------------- */ 4101/* ---------------------------------------------------------------------- */
4102/* Write data to the pty as typed by the user, pasted with the mouse,
4103 * or generated by us in response to a query ESC sequence.
4104 */
3958 4105
3959/* 4106/*
3960 * Send printf () formatted output to the command. 4107 * Send printf () formatted output to the command.
3961 * Only use for small amounts of data. 4108 * Only use for small amounts of data.
3962 */ 4109 */
… …
3970 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4117 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3971 va_end (arg_ptr); 4118 va_end (arg_ptr);
3972 tt_write (buf, strlen (buf)); 4119 tt_write (buf, strlen (buf));
3973} 4120}
3974 4121
3975/* ---------------------------------------------------------------------- */
3976/* Write data to the pty as typed by the user, pasted with the mouse, 4122/* Write data to the pty as typed by the user. */
3977 * or generated by us in response to a query ESC sequence. 4123void
3978 */ 4124rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4125{
4126 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4127 return;
4128
4129 if (option (Opt_scrollTtyKeypress))
4130 if (view_start)
4131 {
4132 view_start = 0;
4133 want_refresh = 1;
4134 }
4135
4136 tt_write_ (data, len);
4137}
3980 4138
3981void 4139void
3982rxvt_term::tt_write (const char *data, unsigned int len) 4140rxvt_term::tt_write (const char *data, unsigned int len)
3983{ 4141{
3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4142 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3985 return; 4143 return;
3986 4144
4145 tt_write_ (data, len);
4146}
4147
4148static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4149
4150void
4151rxvt_term::tt_write_ (const char *data, unsigned int len)
4152{
3987 if (pty->pty < 0) 4153 if (pty->pty < 0)
3988 return; 4154 return;
3989 4155
3990 if (v_buflen == 0) 4156 if (v_buflen == 0)
3991 { 4157 {

Diff Legend

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