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.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.598 by sf-exg, Sun Sep 18 20:32:17 2022 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[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 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
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 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)
489 { 704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
554 769
555 if (shft) 770 if (shft)
556 { 771 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 773 {
565 switch (keysym) 774 switch (keysym)
566 { 775 {
567 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 778 selection_request (ev.time);
570 return; 779 return;
571#if TODO 780#if TODO
572 /* rxvt extras */ 781 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 783 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 785 return;
579#endif 786#endif
580 } 787 }
581 } 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;
582 } 804 }
583 805
584#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 807 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 863 {
642 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
643 return; 865 return;
644 } 866 }
645#endif 867#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 868 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 869
826 if (len <= 0) 870 if (len <= 0)
827 return; /* not mapped */ 871 return; /* not mapped */
828 872
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 880 KeySym keysym;
869 881
… …
941void 953void
942rxvt_term::flush () 954rxvt_term::flush ()
943{ 955{
944 flush_ev.stop (); 956 flush_ev.stop ();
945 957
946#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
948 { 960 {
949 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
950 scr_touch (false); 962 scr_touch (false);
951 } 963 }
… …
991 while (row < end_row); 1003 while (row < end_row);
992 } 1004 }
993 1005
994 scr_refresh (); 1006 scr_refresh ();
995 scrollBar.show (1); 1007 scrollBar.show (1);
996#ifdef USE_XIM 1008#if USE_XIM
997 IMSendSpot (); 1009 im_send_spot ();
998#endif 1010#endif
999 } 1011 }
1000 1012
1001 display->flush (); 1013 display->flush ();
1002} 1014}
… …
1020 flush (); 1032 flush ();
1021} 1033}
1022 1034
1023#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1024void 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
1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026{ 1056{
1027 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1028 want_refresh = 1; 1058 want_refresh = 1;
1029 refresh_check (); 1059 refresh_check ();
… …
1047 1077
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1079void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1081{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1084 {
1055 want_refresh = 1; 1085 want_refresh = 1;
1056 refresh_check (); 1086 refresh_check ();
1057 } 1087 }
1058 else 1088 else
… …
1062 1092
1063#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1064void 1094void
1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1096{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1068 { 1098 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1100 want_refresh = 1;
1071 refresh_check (); 1101 refresh_check ();
1072 } 1102 }
… …
1077 1107
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1109void
1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1111{
1082 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1083 { 1113 {
1084 want_refresh = 1; 1114 want_refresh = 1;
1085 refresh_check (); 1115 refresh_check ();
1086 } 1116 }
1087 1117
… …
1208 pty_write (); 1238 pty_write ();
1209 1239
1210 refresh_check (); 1240 refresh_check ();
1211} 1241}
1212 1242
1213void 1243void ecb_cold
1214rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1215{ 1245{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1247 recolor_cursor ();
1218 1248
1219#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1220 hidden_pointer = 0; 1250 hidden_pointer = 0;
1221 1251
1222 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1223 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1224#endif 1254#endif
1225} 1255}
1226 1256
1227#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1228void 1258void ecb_cold
1229rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1230{ 1260{
1231 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1232 return; 1262 return;
1233 1263
… …
1235 XFlush (dpy); 1265 XFlush (dpy);
1236 1266
1237 hidden_pointer = 1; 1267 hidden_pointer = 1;
1238} 1268}
1239 1269
1240void 1270void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1272{
1243 make_current (); 1273 make_current ();
1244 1274
1245 pointer_blank (); 1275 pointer_blank ();
… …
1247#endif 1277#endif
1248 1278
1249void 1279void
1250rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1251{ 1281{
1252 int button_number, key_state = 0; 1282 int button_number, state = 0;
1253 int x, y; 1283 int x, y;
1254 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1255 1285
1256 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1258 1288
1259 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1261 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1262 return; 1292 return;
1263 1293
1264 mouse_row = x; 1294 mouse_row = x;
1265 mouse_col = y; 1295 mouse_col = y;
1266 code += 32; 1296 state += 32;
1267 }
1268
1269 if (MEvent.button == AnyButton)
1270 button_number = 3;
1271 else
1272 { 1297 }
1298
1273 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1274 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1275 if (button_number >= 3) 1301 if (button_number >= 3)
1276 button_number += 64 - 3; 1302 button_number += 64 - 3;
1277 }
1278 1303
1279 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1280 { 1305 {
1281 /* 1306 /*
1282 * do not report ButtonRelease 1307 * do not report ButtonRelease
1283 * no state info allowed 1308 * no state info allowed
1284 */ 1309 */
1285 key_state = 0; 1310 if (release)
1286 if (button_number == 3)
1287 return; 1311 return;
1288 } 1312 }
1289 else 1313 else
1290 { 1314 {
1291 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1293 * 8 = Meta 1317 * 8 = Meta
1294 * 16 = Control 1318 * 16 = Control
1295 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1296 * 32 = Double Click 1320 * 32 = Double Click
1297 */ 1321 */
1298 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1299 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1300 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1301#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1302 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1303#endif 1327#endif
1304 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1305 1331
1306#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1307 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1308 if (key_state & 16) 1334 if (state & 16)
1309 fputc ('C', stderr); 1335 fputc ('C', stderr);
1310 if (key_state & 4) 1336 if (state & 4)
1311 fputc ('S', stderr); 1337 fputc ('S', stderr);
1312 if (key_state & 8) 1338 if (state & 8)
1313 fputc ('A', stderr); 1339 fputc ('A', stderr);
1314 if (key_state & 32) 1340 if (state & 32)
1315 fputc ('2', stderr); 1341 fputc ('2', stderr);
1316 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1317 button_number, 1343 button_number,
1318 x, 1344 x,
1319 y); 1345 y);
1320#endif 1346#endif
1321 1347
1322#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1323 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)
1324 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state, 1357 code,
1326 x, 1358 x,
1327 y); 1359 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1329 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state, 1362 code,
1331 wint_t (32 + x), 1363 wint_t (32 + x),
1332 wint_t (32 + y)); 1364 wint_t (32 + y));
1333 else 1365 else
1334#endif 1366#endif
1335 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1336 code + button_number + key_state, 1368 code,
1337 32 + x, 1369 32 + x,
1338 32 + y); 1370 32 + y);
1339} 1371}
1340 1372
1341/*{{{ process an X event */ 1373/*{{{ process an X event */
1342void 1374void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1344{ 1376{
1345 make_current (); 1377 make_current ();
1346 1378
1347 dLocal (Display *, dpy); 1379 dLocal (Display *, dpy);
… …
1450 if (ev.xconfigure.window == parent) 1482 if (ev.xconfigure.window == parent)
1451 { 1483 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1485 ;
1454 1486
1455#ifdef HAVE_BG_PIXMAP 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1456 bool moved = false; 1488
1457 if (bg_window_position_sensitive ()) 1489 if (want_position_change)
1458 { 1490 {
1459 int x, y; 1491 int x, y;
1492
1460 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
1461 { 1494 {
1462 x = ev.xconfigure.x; 1495 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1496 y = ev.xconfigure.y;
1464 } 1497 }
1465 else 1498 else
1466 get_window_origin (x, y); 1499 get_window_origin (x, y);
1467 1500
1468 if (bg_set_position (x, y) 1501 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1502 {
1470 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 }
1471 } 1507 }
1472#endif
1473 1508
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1510 {
1476 seen_resize = 1; 1511 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1513 }
1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif
1490 }
1491 1514
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1516 }
1494 break; 1517 break;
1495 1518
… …
1504 case SelectionRequest: 1527 case SelectionRequest:
1505 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1506 break; 1529 break;
1507 1530
1508 case MapNotify: 1531 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1525 mapped = 1; 1532 mapped = 1;
1526#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1527 text_blink_ev.start (); 1534 text_blink_ev.start ();
1528#endif 1535#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1575 ;
1569 1576
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1577 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1578 {
1572 scrollBar.state = STATE_IDLE; 1579 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1580 scrollBar.show (0);
1574 } 1581 }
1575 } 1582 }
1576 break; 1583 break;
1577 1584
1578 case MotionNotify: 1585 case MotionNotify:
1579#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1587 if (hidden_pointer)
1581 pointer_unblank (); 1588 pointer_unblank ();
1582#endif 1589#endif
1590 if (!bypass_keystate
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1585 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1587 break; 1595 break;
1588 1596
1589 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1601 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1602 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1603 &ev.xbutton.state); 1611 &ev.xbutton.state);
1604#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1605 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1606 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1607 { 1616 {
1608#endif
1609#if ISO_14755 1617#if ISO_14755
1610 // 5.4 1618 // 5.4
1611 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1612 { 1620 {
1613 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1619 1627
1620#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1621 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1622 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1623 { 1631 {
1632 page_dirn scroll_selection_dir;
1624 int dist; 1633 int dist;
1625 1634
1626 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1627 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1628 */ 1637 */
… …
1643 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1644 } 1653 }
1645 else 1654 else
1646 { 1655 {
1647 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1658 }
1650 1659
1651 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1662 + 1;
1654 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1655 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1656 } 1666 }
1657 else 1667 else
1658 { 1668 {
1659 /* we are within the text window, so we 1669 /* we are within the text window, so we
1660 * shouldn't be scrolling 1670 * shouldn't be scrolling
1661 */ 1671 */
1662 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1663 } 1673 }
1664#endif 1674#endif
1665#ifdef MOUSE_THRESHOLD
1666 } 1675 }
1667#endif
1668 } 1676 }
1669 } 1677 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1679 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1674 ; 1682 ;
1675 1683
1676 XQueryPointer (dpy, scrollBar.win, 1684 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1688 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1690 scrollBar.size ());
1683 want_refresh = 1; 1691 want_refresh = 1;
1684 scrollBar.show (1); 1692 scrollBar.show (1);
1685 } 1693 }
1686 break; 1694 break;
1687 } 1695 }
1688 1696
1689#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1699 cursor_blink_reset ();
1699 }
1700#endif 1700#endif
1701 1701
1702#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1704 {
… …
1715 1715
1716 refresh_check (); 1716 refresh_check ();
1717} 1717}
1718 1718
1719#if ENABLE_FRILLS 1719#if ENABLE_FRILLS
1720void 1720void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1722{ 1722{
1723 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1724 return; 1724 return;
1725 1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent)) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h); 1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1730 urgency_hint = enable;
1731 XFree (h);
1731 } 1732 }
1732} 1733}
1733#endif 1734#endif
1734 1735
1735void 1736void ecb_cold
1736rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1737{ 1738{
1738 if (!focus) 1739 if (!focus)
1739 { 1740 {
1740 focus = 1; 1741 focus = 1;
1741 want_refresh = 1; 1742 want_refresh = 1;
1742 1743
1743#if USE_XIM 1744#if USE_XIM
1744 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1745 { 1746 {
1746 IMSetPosition (); 1747 im_set_position ();
1747 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1748 } 1749 }
1749#endif 1750#endif
1750#if CURSOR_BLINK 1751#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
… …
1753#endif 1754#endif
1754#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1756 { 1757 {
1757 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1758 scr_recolour (); 1759 scr_recolor ();
1759 } 1760 }
1760#endif 1761#endif
1761#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1762 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1763 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1764#endif 1768#endif
1765 1769
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1771 }
1768} 1772}
1769 1773
1770void 1774void ecb_cold
1771rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1772{ 1776{
1773 if (focus) 1777 if (focus)
1774 { 1778 {
1775 focus = 0; 1779 focus = 0;
1776 want_refresh = 1; 1780 want_refresh = 1;
1777 1781
1778#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1779 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1780 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1781#endif 1788#endif
1782#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1783 if (iso14755buf) 1790 if (iso14755buf)
1784 { 1791 {
1785 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1800#endif 1807#endif
1801#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1802 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1803 { 1810 {
1804 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1805 scr_recolour (); 1812 scr_recolor ();
1806 } 1813 }
1807#endif 1814#endif
1808 1815
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1817 }
1811} 1818}
1812 1819
1813void 1820void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1815{ 1822{
1816#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1818 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1819 rgba c; 1829 rgba c;
1820 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1821 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);
1822 } 1832 }
1823#endif 1833#endif
1824} 1834}
1825 1835
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1836#if ENABLE_PERL
1827void 1837void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1839{
1830 make_current (); 1840 make_current ();
1831 1841
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1844 return;
1835 1845
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1846 switch (ev.type)
1838 { 1847 {
1839 case PropertyNotify: 1848 case PropertyNotify:
1840 /* 1849 /*
1841 * 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,
1842 * 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.
1843 */ 1852 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1855 {
1847 bg_set_root_pixmap (); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848 update_background ();
1849 } 1857 }
1850 1858
1851 break; 1859 break;
1852 } 1860 }
1853# endif
1854 1861
1855 refresh_check (); 1862 refresh_check ();
1856} 1863}
1857#endif 1864#endif
1858 1865
… …
1881 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1882 return; 1889 return;
1883 } 1890 }
1884#endif 1891#endif
1885 1892
1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1887 1894
1888 if (reportmode) 1895 if (reportmode)
1889 { 1896 {
1890 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1891 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
… …
1982 if (scrollBar.upButton (ev.y)) 1989 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 1990 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 1991 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 1992 direction = DN; /* down */
1986 1993
1987 scrollBar.state = STATE_IDLE; 1994 scrollBar.state = SB_STATE_IDLE;
1988 /* 1995 /*
1989 * Rxvt-style scrollbar: 1996 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 1997 * move up if mouse is above slider
1991 * move dn if mouse is below slider 1998 * move dn if mouse is below slider
1992 * 1999 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2038 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2039#endif
2033 if (scr_page (direction, 1)) 2040 if (scr_page (direction, 1))
2034 { 2041 {
2035 if (direction == UP) 2042 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2043 scrollBar.state = SB_STATE_UP;
2037 else 2044 else
2038 scrollBar.state = STATE_DOWN; 2045 scrollBar.state = SB_STATE_DOWN;
2039 } 2046 }
2040 } 2047 }
2041 else 2048 else
2042 switch (ev.button) 2049 switch (ev.button)
2043 { 2050 {
2044 case Button2: 2051 case Button2:
2045 switch (scrollBar.align) 2052 switch (scrollBar.align)
2046 { 2053 {
2047 case R_SB_ALIGN_TOP: 2054 case SB_ALIGN_TOP:
2048 csrO = 0; 2055 csrO = 0;
2049 break; 2056 break;
2050 case R_SB_ALIGN_CENTRE: 2057 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2058 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2059 break;
2053 case R_SB_ALIGN_BOTTOM: 2060 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2061 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2062 break;
2056 } 2063 }
2057 2064
2058 if (scrollBar.style == R_SB_XTERM 2065 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2066 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2067 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2068 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2069
2063 scrollBar.state = STATE_MOTION; 2070 scrollBar.state = SB_STATE_MOTION;
2064 break; 2071 break;
2065 2072
2066 case Button1: 2073 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2074 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2075 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2076 /* FALLTHROUGH */
2070 2077
2071 case Button3: 2078 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2079 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2080 {
2074 if (scrollbar_above_slider (ev.y)) 2081 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2083 scr_page (UP, nrow - 1);
2077# else 2084# else
2078 scr_page (UP, nrow / 4); 2085 scr_page (UP, nrow / 4);
2079# endif 2086# endif
2080 else if (scrollbar_below_slider (ev.y)) 2087 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2089 scr_page (DN, nrow - 1);
2083# else 2090# else
2084 scr_page (DN, nrow / 4); 2091 scr_page (DN, nrow / 4);
2085# endif 2092# endif
2086 else 2093 else
2087 scrollBar.state = STATE_MOTION; 2094 scrollBar.state = SB_STATE_MOTION;
2088 } 2095 }
2089 else 2096 else
2090 { 2097 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2098 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2099 (nrow
2093 * scrollbar_position (ev.y) 2100 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2101 / scrollBar.size ()));
2095 } 2102 }
2096 2103
2097 break; 2104 break;
2098 } 2105 }
… …
2109 2116
2110 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2118 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2120
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2121 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2122 {
2116 scrollBar.state = STATE_IDLE; 2123 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2124 scrollBar.show (0);
2118 } 2125 }
2119 2126
2120#ifdef SELECTION_SCROLLING 2127#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2128 sel_scroll_ev.stop();
… …
2141#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2142 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2143 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2144 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2145 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2146 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2147 { 2154 {
2148 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2149 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2150 mouse_report (ev); 2157 mouse_report (ev);
2151 } 2158 }
2152#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2153 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2154 mouse_report (ev); 2161 mouse_report (ev);
2155#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2156 return; 2163 return;
2157 } 2164 }
2158 2165
… …
2171 case Button3: 2178 case Button3:
2172 selection_make (ev.time); 2179 selection_make (ev.time);
2173 break; 2180 break;
2174 2181
2175 case Button2: 2182 case Button2:
2176 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?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2185 break;
2179 2186
2180#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2181 case Button4: 2188 case Button4:
2182 case Button5: 2189 case Button5:
2183 { 2190 {
2184 int i; 2191 int lines;
2185 page_dirn v; 2192 page_dirn dirn;
2186 2193
2187 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2188 2195
2189 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2190 i = 1; 2197 lines = 1;
2191 else if (option (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2192 i = nrow - 1; 2199 lines = nrow - 1;
2193 else 2200 else
2194 i = 5; 2201 lines = 5;
2195 2202
2196# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2197 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2198 { 2205 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2208
2203 if (!slip_wheel_ev.is_active ()) 2209 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205 } 2211 }
2206 else 2212 else
2207# endif 2213# endif
2208 { 2214 {
2209 scr_page (v, i); 2215 scr_page (dirn, lines);
2210 scrollBar.show (1); 2216 scrollBar.show (1);
2211 } 2217 }
2212 } 2218 }
2213 break; 2219 break;
2214#endif 2220#endif
… …
2216 } 2222 }
2217} 2223}
2218 2224
2219/*}}} */ 2225/*}}} */
2220 2226
2221void 2227void ecb_hot
2222rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2223{ 2229{
2224 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2226 2232
2227 for (;;) 2233 for (;;)
2228 { 2234 {
2229 if (expect_false (ch == NOCHAR)) 2235 if (ecb_unlikely (ch == NOCHAR))
2230 { 2236 {
2231 seq_begin = cmdbuf_ptr; 2237 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2238 ch = next_char ();
2233 2239
2234 if (ch == NOCHAR) 2240 if (ch == NOCHAR)
2235 break; 2241 break;
2236 } 2242 }
2237 2243
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2244 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2245 {
2240 if (expect_false (!seen_input)) 2246 if (ecb_unlikely (!seen_input))
2241 { 2247 {
2242 seen_input = 1; 2248 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2249 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2250 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2251 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2264 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2265 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2266
2261 for (;;) 2267 for (;;)
2262 { 2268 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2269 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2270 break;
2265 2271
2266 *str++ = ch; 2272 *str++ = ch;
2267 2273
2268 if (expect_false (ch == C0_LF || str >= eol)) 2274 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2275 {
2270 if (ch == C0_LF) 2276 if (ch == C0_LF)
2271 nlines++; 2277 nlines++;
2272 2278
2273 refresh_count++; 2279 refresh_count++;
… …
2345 } 2351 }
2346 } 2352 }
2347} 2353}
2348 2354
2349// read the next character 2355// read the next character
2350wchar_t 2356wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2352{ 2358{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2360 {
2355 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2357 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2358 2364
2359 wchar_t wc; 2365 wchar_t wc;
2360 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);
2361 2367
… …
2367 } 2373 }
2368 2374
2369 if (len == (size_t)-1) 2375 if (len == (size_t)-1)
2370 { 2376 {
2371 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.
2372 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
2373 } 2381 }
2374 2382
2375 // assume wchar == unicode 2383 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
… …
2379 2387
2380 return NOCHAR; 2388 return NOCHAR;
2381} 2389}
2382 2390
2383// read the next octet 2391// read the next octet
2384uint32_t 2392uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2386{ 2394{
2387 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2397 : NOCHAR;
2390} 2398}
2391 2399
2392static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2393 2401
2394wchar_t 2402wchar_t ecb_hot
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2396{ 2404{
2397 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2398 2406
2399 if (c == NOCHAR) 2407 if (c == NOCHAR)
2400 throw out_of_input; 2408 throw out_of_input;
2401 2409
2402 return c; 2410 return c;
2403} 2411}
2404 2412
2405uint32_t 2413uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2407{ 2415{
2408 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2409 2417
2410 if (c == NOCHAR) 2418 if (c == NOCHAR)
2411 throw out_of_input; 2419 throw out_of_input;
… …
2414} 2422}
2415 2423
2416/*{{{ print pipe */ 2424/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2419FILE * 2427FILE * ecb_cold
2420rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2421{ 2429{
2422 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");
2423 2431
2424 if (stream == NULL) 2432 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2434
2427 return stream; 2435 return stream;
2428} 2436}
2429 2437
2430int 2438int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2432{ 2440{
2433 fflush (stream); 2441 fflush (stream);
2434 return pclose (stream); 2442 return pclose (stream);
2435} 2443}
2436 2444
2437/* 2445/*
2438 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2439 */ 2447 */
2440void 2448void ecb_cold
2441rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2442{ 2450{
2443 FILE *fd = popen_printer (); 2451 FILE *fd = popen_printer ();
2444 2452
2445 if (!fd) 2453 if (!fd)
… …
2491 pclose_printer (fd); 2499 pclose_printer (fd);
2492} 2500}
2493#endif /* PRINTPIPE */ 2501#endif /* PRINTPIPE */
2494/*}}} */ 2502/*}}} */
2495 2503
2496/* *INDENT-OFF* */
2497enum { 2504enum {
2498 C1_40 = 0x40, 2505 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2506 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2507 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 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,
2502 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,
2503}; 2510};
2504/* *INDENT-ON* */
2505 2511
2506/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2507void 2513void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2515{
2510 switch (ch) 2516 switch (ch)
2511 { 2517 {
2512 case C0_ESC: 2518 case C0_ESC:
… …
2542 scr_charset_choose (0); 2548 scr_charset_choose (0);
2543 break; 2549 break;
2544 2550
2545#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2546 // 8-bit controls 2552 // 8-bit controls
2547 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2548 process_dcs_seq (); 2554 process_dcs_seq ();
2549 break; 2555 break;
2550 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2551 process_csi_seq (); 2557 process_csi_seq ();
2552 break; 2558 break;
2553 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2554 process_osc_seq (); 2560 process_osc_seq ();
2555 break; 2561 break;
2556#endif 2562#endif
2557 } 2563 }
2558} 2564}
2559/*}}} */ 2565/*}}} */
2560 2566
2561 2567
2562/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
2563void 2569void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2571{
2566 int row, col; 2572 int row, col;
2567 2573
2568 switch (ch) 2574 switch (ch)
… …
2602 break; 2608 break;
2603 case 'Z': /* identify the terminal type */ 2609 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2610 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2611 break;
2606 case '<': /* turn off VT52 mode */ 2612 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2613 priv_modes &= ~PrivMode_vt52;
2608 break; 2614 break;
2609 case 'F': /* use special graphics character set */ 2615 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2616 case 'G': /* use regular character set */
2611 /* unimplemented */ 2617 /* unimplemented */
2612 break; 2618 break;
… …
2618} 2624}
2619/*}}} */ 2625/*}}} */
2620 2626
2621 2627
2622/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
2623void 2629void ecb_hot
2624rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
2625{ 2631{
2626 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
2627 2633
2628 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2637 return;
2632 } 2638 }
2633 2639
2634 switch (ch) 2640 switch (ch)
2635 { 2641 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2642 case '#':
2638 if (cmd_getc () == '8') 2643 if (cmd_getc () == '8')
2639 scr_E (); 2644 scr_E ();
2640 break; 2645 break;
2641 case '(': 2646 case '(':
… …
2664#if !ENABLE_MINIMAL 2669#if !ENABLE_MINIMAL
2665 case '9': 2670 case '9':
2666 scr_forwardindex (); 2671 scr_forwardindex ();
2667 break; 2672 break;
2668#endif 2673#endif
2674 // DECPAM/DECPNM
2669 case '=': 2675 case '=':
2676 priv_modes |= PrivMode_aplKP;
2677 break;
2670 case '>': 2678 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2679 priv_modes &= ~PrivMode_aplKP;
2672 break; 2680 break;
2673 2681
2674 case C1_40: 2682 case C1_40:
2675 cmd_getc (); 2683 cmd_getc ();
2676 break; 2684 break;
… …
2680 2688
2681 /* 8.3.87: NEXT LINE */ 2689 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2690 case C1_NEL: /* ESC E */
2683 { 2691 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2694 }
2687 break; 2695 break;
2688 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2691 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2694 break; 2703 break;
2704#endif
2695 2705
2696 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2697 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2698 scr_set_tab (1); 2708 scr_set_tab (1);
2699 break; 2709 break;
… …
2702 case C1_RI: /* ESC M */ 2712 case C1_RI: /* ESC M */
2703 scr_index (DN); 2713 scr_index (DN);
2704 break; 2714 break;
2705 2715
2706 /* 8.3.142: SINGLE-SHIFT TWO */ 2716 /* 8.3.142: SINGLE-SHIFT TWO */
2707 /*case C1_SS2: scr_single_shift (2); break; */ 2717 /* case C1_SS2: break; */
2708 2718
2709 /* 8.3.143: SINGLE-SHIFT THREE */ 2719 /* 8.3.143: SINGLE-SHIFT THREE */
2710 /*case C1_SS3: scr_single_shift (3); break; */ 2720 /* case C1_SS3: break; */
2711 2721
2712 /* 8.3.27: DEVICE CONTROL STRING */ 2722 /* 8.3.27: DEVICE CONTROL STRING */
2713 case C1_DCS: /* ESC P */ 2723 case C1_DCS: /* ESC P */
2714 process_dcs_seq (); 2724 process_dcs_seq ();
2715 break; 2725 break;
… …
2748 } 2758 }
2749} 2759}
2750/*}}} */ 2760/*}}} */
2751 2761
2752/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2762/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2753/* *INDENT-OFF* */
2754enum { 2763enum {
2755 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
2756 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2757 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2758 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2778 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2779 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, */
2780 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, */
2781 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, {, |, }, ~, */
2782 }; 2791 };
2783/* *INDENT-ON* */
2784 2792
2785void 2793void ecb_hot
2786rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
2787{ 2795{
2788 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
2789 unsigned int nargs, p; 2797 unsigned int nargs, p;
2790 int n, ndef; 2798 int n, ndef;
2791 int arg[ESC_ARGS] = { }; 2799 int arg[ESC_ARGS] = { };
2792 2800
2793 nargs = 0; 2801 nargs = 0;
… …
2799 /* '<' '=' '>' '?' '!' */ 2807 /* '<' '=' '>' '?' '!' */
2800 priv = ch; 2808 priv = ch;
2801 ch = cmd_getc (); 2809 ch = cmd_getc ();
2802 } 2810 }
2803 2811
2812 prev_ch = 0;
2804 /* read any numerical arguments */ 2813 /* read any numerical arguments */
2805 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
2806 { 2815 {
2807 if (isdigit (ch)) 2816 if (isdigit (ch))
2808 { 2817 {
… …
2818 n = -1; 2827 n = -1;
2819 } 2828 }
2820 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
2821 process_nonprinting (ch); 2830 process_nonprinting (ch);
2822 2831
2832 prev_ch = ch;
2823 ch = cmd_getc (); 2833 ch = cmd_getc ();
2824 } 2834 }
2825 2835
2826 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
2827 return; 2837 return;
… …
2857 break; 2867 break;
2858 2868
2859 case '?': 2869 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 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);
2862 break; 2874 break;
2863 2875
2864 case '!': 2876 case '!':
2865 if (ch == CSI_70) 2877 if (ch == CSI_70)
2866 { 2878 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset (); 2880 scr_soft_reset ();
2869 2881
2870 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2871 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 };
2872 2884
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875 } 2887 }
2876 break; 2888 break;
2877 } 2889 }
2878 2890
2879 return; 2891 return;
… …
2897 } 2909 }
2898 break; 2910 break;
2899#endif 2911#endif
2900 2912
2901 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2902 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2903 arg[0] = -arg[0]; 2915 arg[0] = -arg[0];
2904 /* FALLTHROUGH */ 2916 /* FALLTHROUGH */
2905 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2906 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2907 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2908 break; 2920 break;
2909 2921
2910 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2911 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2912#ifdef ISO6429 2924#ifdef ISO6429
2913 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2914#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2915 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2916#endif 2928#endif
… …
3007 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3008 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3009 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3010 break; 3022 break;
3011 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3012 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
3013 break; 3025 break;
3014 } 3026 }
3015 break; 3027 break;
3016 3028
3017 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3061 scr_insert_mode (1); 3073 scr_insert_mode (1);
3062 else if (arg[0] == 20) 3074 else if (arg[0] == 20)
3063 priv_modes |= PrivMode_LFNL; 3075 priv_modes |= PrivMode_LFNL;
3064 break; 3076 break;
3065 3077
3078 case CSI_71: // DECSCUSR: set cursor style
3079 if (prev_ch == ' ')
3080 set_cursor_style (arg[0]);
3081 break;
3082
3066 /* 3083 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3084 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3085 */
3069 case CSI_72: /* DECSTBM: set top and bottom margins */ 3086 case CSI_72: /* DECSTBM: set top and bottom margins */
3070 if (nargs == 1) 3087 if (nargs == 1)
… …
3098 } 3115 }
3099} 3116}
3100/*}}} */ 3117/*}}} */
3101 3118
3102#if !ENABLE_MINIMAL 3119#if !ENABLE_MINIMAL
3103/* ARGSUSED */
3104void 3120void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3121rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3122{
3107 int x, y; 3123 int x, y;
3108 XWindowAttributes wattr; 3124 XWindowAttributes wattr;
… …
3145 break; 3161 break;
3146 3162
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3163 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3164 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3165 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)width, 3166 set_widthheight ((unsigned int)vt_width,
3151 (unsigned int) (args[1] * fheight)); 3167 (unsigned int) (args[1] * fheight));
3152 break; 3168 break;
3153 3169
3154 /* 3170 /*
3155 * reports - some output format copied from XTerm 3171 * reports - some output format copied from XTerm
… …
3204rxvt_term::get_to_st (unicode_t &ends_how) 3220rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3221{
3206 unicode_t ch; 3222 unicode_t ch;
3207 bool seen_esc = false; 3223 bool seen_esc = false;
3208 unsigned int n = 0; 3224 unsigned int n = 0;
3209 wchar_t string[STRING_MAX]; 3225 wchar_t string[CBUFSIZ];
3210 3226
3211 while ((ch = cmd_getc ()) != NOCHAR) 3227 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3228 {
3213 if (seen_esc) 3229 if (seen_esc)
3214 { 3230 {
… …
3229 else if (ch < 0x20) 3245 else if (ch < 0x20)
3230 return NULL; /* other control character - exit */ 3246 return NULL; /* other control character - exit */
3231 3247
3232 seen_esc = false; 3248 seen_esc = false;
3233 3249
3234 if (n >= STRING_MAX - 1) 3250 if (n >= sizeof (string) - 1)
3235 // stop at some sane length 3251 // stop at some sane length
3236 return NULL; 3252 return NULL;
3237 3253
3238 string[n++] = ch; 3254 string[n++] = ch;
3239 } 3255 }
… …
3288 free (s); 3304 free (s);
3289 } 3305 }
3290 } 3306 }
3291} 3307}
3292 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 #if 0
3340 static const unsigned char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, 4,
3343 0, 4, 4,
3344 4, 4, 0,
3345 4, 0, 4,
3346 0, 4, 0,
3347 4, 0, 0,
3348 };
3349 #else
3350 // silly compressed verlapping triplets version of above
3351 static const unsigned char dxyz[] = {
3352 0, 0, 0, 4, 4, 0, 4, 0, 0,
3353 };
3354 #endif
3355
3356 static const unsigned char color_level[8][32] = {
3357 // neighbour index
3358 {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},
3359 {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},
3360 {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},
3361 {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},
3362 // Red_levels/Green_levels/Blue_levels index
3363 {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},
3364 {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},
3365 {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},
3366 {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},
3367 };
3368
3369 unsigned int idx;
3370
3371 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3372 {
3373 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3374 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3375 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3376 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3377
3378 if (n == 0)
3379 idx = index;
3380
3381 if (rgb24_color[index] == color)
3382 {
3383 rgb24_seqno[index] = ++rgb24_sequence;
3384 return index + minTermCOLOR24;
3385 }
3386
3387 // minor issue: could update index 0 few more times
3388 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3389 {
3390 idx = index;
3391 goto update;
3392 }
3393
3394 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3395 // but also handles wrap around values well enough
3396 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3397 idx = index;
3398 }
3399
3400update:
3401 rgb24_color[idx] = color;
3402 rgb24_seqno[idx] = ++rgb24_sequence;
3403
3404 idx += minTermCOLOR24;
3405 pix_colors_focused [idx].free (this);
3406 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3407 update_fade_color (idx, false);
3408
3409 return idx;
3410}
3411
3293void 3412void
3294rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3413rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3295{ 3414{
3296 if (str[0] == '?' && !str[1]) 3415 if (str[0] == '?' && !str[1])
3297 { 3416 {
3298 rgba c; 3417 rgba c;
3299 pix_colors_focused[color].get (c); 3418 pix_colors_focused[color].get (c);
3419 char rgba_str[32];
3300 3420
3301#if XFT 3421#if XFT
3302 if (c.a != rgba::MAX_CC) 3422 if (c.a != rgba::MAX_CC)
3303 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3423 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3304 else 3424 else
3305#endif 3425#endif
3306 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3426 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3427
3428 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3429 tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp);
3430 else
3431 tt_printf ("\033]%d;%s%c", report, rgba_str, resp);
3307 } 3432 }
3308 else 3433 else
3309 set_window_color (color, str); 3434 set_window_color (color, str);
3310} 3435}
3311 3436
… …
3356 &nitems, &bytes_after, &value) == Success 3481 &nitems, &bytes_after, &value) == Success
3357 && actual_type != None 3482 && actual_type != None
3358 && actual_format == 8) 3483 && actual_format == 8)
3359 str = (const char *)(value); 3484 str = (const char *)(value);
3360 3485
3361 tt_printf ("\033]%d;%s%c", op, str, resp); 3486 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3362 3487
3363 XFree (value); 3488 XFree (value);
3364 } 3489 }
3365 else 3490 else
3366 { 3491 {
… …
3434 break; 3559 break;
3435#endif 3560#endif
3436 case URxvt_Color_border: 3561 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp); 3562 process_color_seq (op, Color_border, str, resp);
3438 break; 3563 break;
3439#if ENABLE_TRANSPARENCY
3440 case URxvt_Color_tint:
3441 process_color_seq (op, Color_tint, str, resp);
3442 {
3443 bool changed = false;
3444
3445 if (ISSET_PIXCOLOR (Color_tint))
3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3447
3448 if (changed)
3449 update_background ();
3450 }
3451
3452 break;
3453#endif
3454
3455#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3458 {
3459 char str[256];
3460
3461 sprintf (str, "[%dx%d+%d+%d]",
3462 min (h_scale, 32767), min (v_scale, 32767),
3463 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 }
3466 else
3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3471 {
3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3481 }
3482 else
3483 {
3484 str++;
3485 if (bg_set_geometry (str, true))
3486 changed++;
3487 }
3488
3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3497 update_background ();
3498 }
3499 }
3500 break;
3501#endif
3502 3564
3503 case XTerm_logfile: 3565 case XTerm_logfile:
3504 // TODO, when secure mode? 3566 // TODO, when secure mode?
3505 break; 3567 break;
3506 3568
… …
3546 rs[Rs_name], VERSION[0], VERSION[2], 3608 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp); 3609 resp);
3548 break; 3610 break;
3549 3611
3550#if !ENABLE_MINIMAL 3612#if !ENABLE_MINIMAL
3613 case URxvt_cellinfo:
3614 if (query)
3615 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3616 fwidth, fheight, fbase,
3617 resp);
3618 break;
3619
3551 case URxvt_locale: 3620 case URxvt_locale:
3552 if (query) 3621 if (query)
3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3622 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3554 else 3623 else
3555 { 3624 {
… …
3590 * 's' = save 3659 * 's' = save
3591 * 'r' = restore 3660 * 'r' = restore
3592 * 't' = toggle 3661 * 't' = toggle
3593 * so no need for fancy checking 3662 * so no need for fancy checking
3594 */ 3663 */
3595int 3664int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3665rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3666{
3598 int state; 3667 int state;
3599 3668
3600 if (mode == 's') 3669 if (mode == 's')
3601 { 3670 {
3602 SavedModes |= (priv_modes & bit); 3671 if (priv_modes & bit)
3672 SavedModes |= bit;
3673 else
3674 SavedModes &= ~bit;
3603 return -1; 3675 return -1;
3604 } 3676 }
3605 else 3677 else
3606 { 3678 {
3607 if (mode == 'r') 3679 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3680 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3681 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3682 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3683
3612 set_privmode (bit, state); 3684 if (state)
3685 priv_modes |= bit;
3686 else
3687 priv_modes &= ~bit;
3613 } 3688 }
3614 3689
3615 return state; 3690 return state;
3616} 3691}
3617 3692
3618/* we're not using priv _yet_ */ 3693/* we're not using priv _yet_ */
3619void 3694void
3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3695rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621{ 3696{
3622 unsigned int i, j; 3697 unsigned int i, j;
3623 int state; 3698 int state;
3624 3699
3625 static const struct 3700 static const struct
3626 { 3701 {
3627 const int argval; 3702 const int argval;
3628 const unsigned long bit; 3703 const unsigned long bit;
3629 } argtopriv[] = { 3704 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3705 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3706 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3707 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3708 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3709 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3710 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3711 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3712 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3713 { 9, PrivMode_MouseX10 },
3714 { 12, PrivMode_BlinkingCursor },
3639 // 18 end FF to printer after print screen 3715 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3716 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3717 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3719 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3720#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3721 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3722 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3723 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3724 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3725 // 45 margin bell NYI
3650 // 46 start logging 3726 // 46 start logging
3651 { 47, PrivMode_Screen }, 3727 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3728 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3729#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3730 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3731#endif
3656 { 1000, PrivMode_MouseX11 }, 3732 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3733 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3734 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS 3735#if ENABLE_FRILLS
3736 { 1004, PrivMode_FocusEvent },
3660 { 1005, PrivMode_ExtModeMouse }, 3737 { 1005, PrivMode_ExtMouseUTF8 },
3738 { 1006, PrivMode_ExtMouseSGR },
3661#endif 3739#endif
3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3740 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3663 { 1011, PrivMode_Keypress }, // rxvt extension 3741 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS 3742#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3743 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3666#endif 3744#endif
3667 // 1035 enable modifiers for alt, numlock NYI 3745 // 1035 enable modifiers for alt, numlock NYI
3668 // 1036 send ESC for meta keys NYI 3746 // 1036 send ESC for meta keys NYI
3669 // 1037 send DEL for keypad delete NYI 3747 // 1037 send DEL for keypad delete NYI
3670 { 1047, PrivMode_Screen }, 3748 { 1047, PrivMode_Screen },
3671 // 1048 save and restore cursor, implemented in code 3749 // 1048 save and restore cursor, implemented in code
3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3750 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3751 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3752#if ENABLE_FRILLS
3674 { 2004, PrivMode_BracketPaste }, 3753 { 2004, PrivMode_BracketPaste },
3754#endif
3675 }; 3755 };
3676 3756
3677 if (nargs == 0) 3757 if (nargs == 0)
3678 return; 3758 return;
3759
3760 // DECRQM
3761 if (mode == 'p')
3762 {
3763 int status = 0;
3764 if (nargs != 1)
3765 return;
3766
3767 for (j = 0; j < ecb_array_length (argtopriv); j++)
3768 if (argtopriv[j].argval == arg[0])
3769 {
3770 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3771 break;
3772 }
3773
3774 tt_printf ("\33[?%d;%d$y", arg[0], status);
3775 return;
3776 }
3679 3777
3680 /* make lo/hi boolean */ 3778 /* make lo/hi boolean */
3681 if (mode == 'l') 3779 if (mode == 'l')
3682 mode = 0; /* reset */ 3780 mode = 0; /* reset */
3683 else if (mode == 'h') 3781 else if (mode == 'h')
… …
3686 for (i = 0; i < nargs; i++) 3784 for (i = 0; i < nargs; i++)
3687 { 3785 {
3688 state = -1; 3786 state = -1;
3689 3787
3690 /* basic handling */ 3788 /* basic handling */
3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3789 for (j = 0; j < ecb_array_length (argtopriv); j++)
3692 if (argtopriv[j].argval == arg[i]) 3790 if (argtopriv[j].argval == arg[i])
3693 { 3791 {
3694 state = privcases (mode, argtopriv[j].bit); 3792 state = privcases (mode, argtopriv[j].bit);
3695 break; 3793 break;
3696 } 3794 }
… …
3722 case 2: /* VT52 mode */ 3820 case 2: /* VT52 mode */
3723 /* oddball mode. should be set regardless of set/reset 3821 /* oddball mode. should be set regardless of set/reset
3724 * parameter. Return from VT52 mode with an ESC < from 3822 * parameter. Return from VT52 mode with an ESC < from
3725 * within VT52 mode 3823 * within VT52 mode
3726 */ 3824 */
3727 set_privmode (PrivMode_vt52, 1); 3825 priv_modes |= PrivMode_vt52;
3728 break; 3826 break;
3729 case 3: /* 80/132 */ 3827 case 3: /* 80/132 */
3730 if (priv_modes & PrivMode_132OK) 3828 if (priv_modes & PrivMode_132OK)
3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3829 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3732 break; 3830 break;
… …
3747 if (state) /* orthogonal */ 3845 if (state) /* orthogonal */
3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3846 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3847 break;
3750#ifdef scrollBar_esc 3848#ifdef scrollBar_esc
3751 case scrollBar_esc: 3849 case scrollBar_esc:
3752 if (scrollBar.map (state)) 3850 scrollBar.map (state);
3753 {
3754 resize_all_windows (0, 0, 0); 3851 resize_all_windows (0, 0, 0);
3755 scr_touch (true); 3852 scr_touch (true);
3756 } 3853 break;
3854#endif
3855#ifdef CURSOR_BLINK
3856 case 12:
3857 cursor_blink_reset ();
3757 break; 3858 break;
3758#endif 3859#endif
3759 case 25: /* visible/invisible cursor */ 3860 case 25: /* visible/invisible cursor */
3760 scr_cursor_visible (state); 3861 scr_cursor_visible (state);
3761 break; 3862 break;
… …
3816 } 3917 }
3817} 3918}
3818/*}}} */ 3919/*}}} */
3819 3920
3820/*{{{ process sgr sequences */ 3921/*{{{ process sgr sequences */
3821void 3922void ecb_hot
3822rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3923rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3823{ 3924{
3824 unsigned int i; 3925 unsigned int i;
3825 short rendset; 3926 short rendset;
3826 int rendstyle; 3927 int rendstyle;
… …
3868 //case 19: // ninth alt font 3969 //case 19: // ninth alt font
3869 //case 20: // gothic 3970 //case 20: // gothic
3870 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3971 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3871 rendset = 0, rendstyle = RS_Bold; 3972 rendset = 0, rendstyle = RS_Bold;
3872 break; 3973 break;
3873 case 22: // normal intensity 3974 case 22: // bold off (vt220)
3874 rendset = 0, rendstyle = RS_Bold; 3975 rendset = 0, rendstyle = RS_Bold;
3875 break; 3976 break;
3876 case 23: // disable italic 3977 case 23: // disable italic
3877 rendset = 0, rendstyle = RS_Italic; 3978 rendset = 0, rendstyle = RS_Italic;
3878 break; 3979 break;
3879 case 24: 3980 case 24: // underline off (vt220)
3880 rendset = 0, rendstyle = RS_Uline; 3981 rendset = 0, rendstyle = RS_Uline;
3881 break; 3982 break;
3882 case 25: 3983 case 25: // blink off (vt220)
3883 rendset = 0, rendstyle = RS_Blink; 3984 rendset = 0, rendstyle = RS_Blink;
3884 break; 3985 break;
3885 case 26: // variable spacing (iso 8613) 3986 case 26: // variable spacing (iso 8613)
3886 rendset = 0, rendstyle = RS_Blink; 3987 rendset = 0, rendstyle = RS_Blink;
3887 break; 3988 break;
3888 case 27: 3989 case 27: // reverse off (vt220)
3889 rendset = 0, rendstyle = RS_RVid; 3990 rendset = 0, rendstyle = RS_RVid;
3890 break; 3991 break;
3891 //case 28: // visible. NYI 3992 //case 28: // visible. NYI
3892 //case 29: // not crossed-out 3993 //case 29: // not crossed-out
3893 } 3994 }
… …
3908 case 35: 4009 case 35:
3909 case 36: 4010 case 36:
3910 case 37: 4011 case 37:
3911 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4012 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3912 break; 4013 break;
3913 case 38: // set fg color, ISO 8613-6
3914 if (nargs > i + 2 && arg[i + 1] == 5)
3915 {
3916 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3917 i += 2;
3918 }
3919 break;
3920 case 39: /* default fg */ 4014 case 39: /* default fg */
3921 scr_color (Color_fg, Color_fg); 4015 scr_color (Color_fg, Color_fg);
3922 break; 4016 break;
3923 4017
3924 case 40: 4018 case 40:
… …
3929 case 45: 4023 case 45:
3930 case 46: 4024 case 46:
3931 case 47: 4025 case 47:
3932 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4026 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3933 break; 4027 break;
3934 case 48: // set bg color, ISO 8613-6
3935 if (nargs > i + 2 && arg[i + 1] == 5)
3936 {
3937 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3938 i += 2;
3939 }
3940 break;
3941 case 49: /* default bg */ 4028 case 49: /* default bg */
3942 scr_color (Color_bg, Color_bg); 4029 scr_color (Color_bg, Color_bg);
4030 break;
4031
4032 case 38: // set fg color, ISO 8613-6
4033 case 48: // set bg color, ISO 8613-6
4034 {
4035 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4036 unsigned int idx;
4037
4038 if (nargs > i + 2 && arg[i + 1] == 5)
4039 {
4040 idx = minCOLOR + arg[i + 2];
4041 i += 2;
4042
4043 scr_color (idx, fgbg);
4044 }
4045 else if (nargs > i + 4 && arg[i + 1] == 2)
4046 {
4047 unsigned int r = arg[i + 2];
4048 unsigned int g = arg[i + 3];
4049 unsigned int b = arg[i + 4];
4050 unsigned int a = 0xff;
4051
4052 idx = map_rgb24_color (r, g, b, a);
4053
4054 i += 4;
4055
4056 scr_color (idx, fgbg);
4057 }
4058 }
3943 break; 4059 break;
3944 4060
3945 //case 50: // not variable spacing 4061 //case 50: // not variable spacing
3946 4062
3947#if !ENABLE_MINIMAL 4063#if !ENABLE_MINIMAL
… …
3967 break; 4083 break;
3968#endif 4084#endif
3969 } 4085 }
3970 } 4086 }
3971} 4087}
4088
4089void
4090rxvt_term::set_cursor_style (int style)
4091{
4092 if (!IN_RANGE_INC (style, 0, 6))
4093 return;
4094
4095 if (style == 0)
4096 style = 1;
4097
4098 cursor_type = (style - 1) / 2;
4099 set_option (Opt_cursorUnderline, cursor_type == 1);
4100
4101#ifdef CURSOR_BLINK
4102 set_option (Opt_cursorBlink, style & 1);
4103 cursor_blink_reset ();
4104#endif
4105
4106 want_refresh = 1;
4107}
3972/*}}} */ 4108/*}}} */
3973 4109
3974/* ------------------------------------------------------------------------- */ 4110/* ---------------------------------------------------------------------- */
4111/* Write data to the pty as typed by the user, pasted with the mouse,
4112 * or generated by us in response to a query ESC sequence.
4113 */
3975 4114
3976/* 4115/*
3977 * Send printf () formatted output to the command. 4116 * Send printf () formatted output to the command.
3978 * Only use for small amounts of data. 4117 * Only use for small amounts of data.
3979 */ 4118 */
… …
3987 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4126 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3988 va_end (arg_ptr); 4127 va_end (arg_ptr);
3989 tt_write (buf, strlen (buf)); 4128 tt_write (buf, strlen (buf));
3990} 4129}
3991 4130
3992/* ---------------------------------------------------------------------- */
3993/* Write data to the pty as typed by the user, pasted with the mouse, 4131/* Write data to the pty as typed by the user. */
3994 * or generated by us in response to a query ESC sequence. 4132void
3995 */ 4133rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4134{
4135 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4136 return;
4137
4138 if (option (Opt_scrollTtyKeypress))
4139 if (view_start)
4140 {
4141 view_start = 0;
4142 want_refresh = 1;
4143 }
4144
4145 tt_write_ (data, len);
4146}
3997 4147
3998void 4148void
3999rxvt_term::tt_write (const char *data, unsigned int len) 4149rxvt_term::tt_write (const char *data, unsigned int len)
4000{ 4150{
4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4151 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4002 return; 4152 return;
4003 4153
4154 tt_write_ (data, len);
4155}
4156
4157static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4158
4159void
4160rxvt_term::tt_write_ (const char *data, unsigned int len)
4161{
4004 if (pty->pty < 0) 4162 if (pty->pty < 0)
4005 return; 4163 return;
4006 4164
4007 if (v_buflen == 0) 4165 if (v_buflen == 0)
4008 { 4166 {

Diff Legend

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