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.464 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.602 by sf-exg, Sat May 6 08:01:35 2023 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-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
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
938#endif 950#endif
939} 951}
940 952
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 953void
975rxvt_term::flush () 954rxvt_term::flush ()
976{ 955{
977 flush_ev.stop (); 956 flush_ev.stop ();
978 957
979#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 959 if (bg_flags & BG_NEEDS_REFRESH)
981 { 960 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 961 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 962 scr_touch (false);
985 } 963 }
986#endif 964#endif
987 965
988 if (want_refresh) 966 if (want_refresh)
… …
1025 while (row < end_row); 1003 while (row < end_row);
1026 } 1004 }
1027 1005
1028 scr_refresh (); 1006 scr_refresh ();
1029 scrollBar.show (1); 1007 scrollBar.show (1);
1030#ifdef USE_XIM 1008#if USE_XIM
1031 IMSendSpot (); 1009 im_send_spot ();
1032#endif 1010#endif
1033 } 1011 }
1034 1012
1035 display->flush (); 1013 display->flush ();
1036} 1014}
… …
1038/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1039void 1017void
1040rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1041{ 1019{
1042 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1044 1022
1045 display->flush (); 1023 display->flush ();
1046} 1024}
1047 1025
1048void 1026void
… …
1053 refresh_count = 0; 1031 refresh_count = 0;
1054 flush (); 1032 flush ();
1055} 1033}
1056 1034
1057#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
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
1058void 1054void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1056{
1061 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1058 want_refresh = 1;
… …
1081 1077
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1079void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1081{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1084 {
1089 want_refresh = 1; 1085 want_refresh = 1;
1090 refresh_check (); 1086 refresh_check ();
1091 } 1087 }
1092 else 1088 else
… …
1096 1092
1097#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1098void 1094void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1096{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1102 { 1098 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1100 want_refresh = 1;
1105 refresh_check (); 1101 refresh_check ();
1106 } 1102 }
… …
1111 1107
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1109void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1111{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1117 { 1113 {
1118 want_refresh = 1; 1114 want_refresh = 1;
1119 refresh_check (); 1115 refresh_check ();
1120 } 1116 }
1121 1117
… …
1153 { 1149 {
1154 } 1150 }
1155} event_handler; 1151} event_handler;
1156#endif 1152#endif
1157 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1158bool 1187bool
1159rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1160{ 1189{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1162 1191
1163 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1193
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1166 n = 0;
1167 } 1195 {
1168 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1172 1201
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1203
1175 if (r > 0) 1204 if (r > 0)
1176 { 1205 {
1177 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1178 return true; 1207 return true;
… …
1209 pty_write (); 1238 pty_write ();
1210 1239
1211 refresh_check (); 1240 refresh_check ();
1212} 1241}
1213 1242
1214void 1243void ecb_cold
1215rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1216{ 1245{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1247 recolor_cursor ();
1219 1248
1220#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1221 hidden_pointer = 0; 1250 hidden_pointer = 0;
1222 1251
1223 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1224 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1225#endif 1254#endif
1226} 1255}
1227 1256
1228#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1229void 1258void ecb_cold
1230rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1231{ 1260{
1232 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1233 return; 1262 return;
1234 1263
… …
1236 XFlush (dpy); 1265 XFlush (dpy);
1237 1266
1238 hidden_pointer = 1; 1267 hidden_pointer = 1;
1239} 1268}
1240 1269
1241void 1270void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1272{
1244 make_current (); 1273 make_current ();
1245 1274
1246 pointer_blank (); 1275 pointer_blank ();
… …
1248#endif 1277#endif
1249 1278
1250void 1279void
1251rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1252{ 1281{
1253 int button_number, key_state = 0; 1282 int button_number, state = 0;
1254 int x, y; 1283 int x, y;
1255 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1256 1285
1257 x = Pixel2Col (ev.x) + 1; 1286 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1258 y = Pixel2Row (ev.y) + 1; 1287 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1259 1288
1260 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1261 { 1290 {
1262 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1263 return; 1292 return;
1264 1293
1265 mouse_row = x; 1294 mouse_row = x;
1266 mouse_col = y; 1295 mouse_col = y;
1267 code += 32; 1296 state += 32;
1268 }
1269
1270 if (MEvent.button == AnyButton)
1271 button_number = 3;
1272 else
1273 { 1297 }
1298
1274 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1275 /* add 0x3D for wheel events, like xterm does */ 1300 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1276 if (button_number >= 3) 1304 else if (button_number >= 3)
1277 button_number += 64 - 3; 1305 button_number += 64 - 3;
1278 }
1279 1306
1280 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1281 { 1308 {
1282 /* 1309 /*
1283 * do not report ButtonRelease 1310 * do not report ButtonRelease
1284 * no state info allowed 1311 * no state info allowed
1285 */ 1312 */
1286 key_state = 0; 1313 if (release)
1287 if (button_number == 3)
1288 return; 1314 return;
1289 } 1315 }
1290 else 1316 else
1291 { 1317 {
1292 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1294 * 8 = Meta 1320 * 8 = Meta
1295 * 16 = Control 1321 * 16 = Control
1296 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1297 * 32 = Double Click 1323 * 32 = Double Click
1298 */ 1324 */
1299 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1300 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1301 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1302#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1303 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1304#endif 1330#endif
1305 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1306 1334
1307#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1308 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1309 if (key_state & 16) 1337 if (state & 16)
1310 fputc ('C', stderr); 1338 fputc ('C', stderr);
1311 if (key_state & 4) 1339 if (state & 4)
1312 fputc ('S', stderr); 1340 fputc ('S', stderr);
1313 if (key_state & 8) 1341 if (state & 8)
1314 fputc ('A', stderr); 1342 fputc ('A', stderr);
1315 if (key_state & 32) 1343 if (state & 32)
1316 fputc ('2', stderr); 1344 fputc ('2', stderr);
1317 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1318 button_number, 1346 button_number,
1319 x, 1347 x,
1320 y); 1348 y);
1321#endif 1349#endif
1322 1350
1323#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight) 1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1325 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state, 1360 code,
1327 x, 1361 x,
1328 y); 1362 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1330 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state, 1366 code,
1332 wint_t (32 + x), 1367 wint_t (32 + x),
1333 wint_t (32 + y)); 1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1334 else 1375 else
1335#endif 1376#endif
1336 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1337 code + button_number + key_state, 1378 code,
1338 32 + x, 1379 32 + x,
1339 32 + y); 1380 32 + y);
1340} 1381}
1341 1382
1342/*{{{ process an X event */ 1383/*{{{ process an X event */
1343void 1384void ecb_hot
1344rxvt_term::x_cb (XEvent &ev) 1385rxvt_term::x_cb (XEvent &ev)
1345{ 1386{
1346 make_current (); 1387 make_current ();
1347 1388
1348 dLocal (Display *, dpy); 1389 dLocal (Display *, dpy);
… …
1446 && ev.xfocus.mode != NotifyGrab) 1487 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1488 focus_out ();
1448 break; 1489 break;
1449 1490
1450 case ConfigureNotify: 1491 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1492 if (ev.xconfigure.window == parent)
1452 { 1493 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1495 ;
1455 1496
1456#ifdef HAVE_BG_PIXMAP 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1457 bool moved = false; 1498
1458 if (bgPixmap.window_position_sensitive ()) 1499 if (want_position_change)
1459 { 1500 {
1460 int x, y; 1501 int x, y;
1502
1461 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
1462 { 1504 {
1463 x = ev.xconfigure.x; 1505 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1506 y = ev.xconfigure.y;
1465 } 1507 }
1466 else 1508 else
1467 get_window_origin (x, y); 1509 get_window_origin (x, y);
1468 1510
1469 if (bgPixmap.set_position (x, y) 1511 if (x != parent_x || y != parent_y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1512 {
1471 moved = true; 1513 parent_x = x;
1514 parent_y = y;
1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1516 }
1472 } 1517 }
1473#endif
1474 1518
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1476 { 1520 {
1477 seen_resize = 1; 1521 seen_resize = 1;
1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1479 } 1523 }
1480 else
1481 {
1482#ifdef HAVE_BG_PIXMAP
1483 if (moved)
1484 {
1485 if (mapped)
1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif
1491 }
1492 1524
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1526 }
1495 break; 1527 break;
1496 1528
1497 case PropertyNotify: 1529 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1530 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1531 break;
1504 1532
1505 case SelectionClear: 1533 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1534 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break; 1535 break;
1508 1536
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break;
1513
1514 case SelectionRequest: 1537 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1516 break; 1539 break;
1517 1540
1518 case MapNotify: 1541 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1535 mapped = 1; 1542 mapped = 1;
1536#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1544 text_blink_ev.start ();
1538#endif 1545#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1552 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1553 { 1560 {
1554 do 1561 do
1555 { 1562 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1565 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1567
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1569
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1571 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1574 }
1568 1575
1569 want_refresh = 1; 1576 want_refresh = 1;
1570 } 1577 }
1571 else 1578 else
… …
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1585 ;
1579 1586
1580 if (scrollBar.state && ev.xany.window == scrollBar.win) 1587 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1588 {
1582 scrollBar.state = STATE_IDLE; 1589 scrollBar.state = SB_STATE_IDLE;
1583 scrollBar.show (0); 1590 scrollBar.show (0);
1584 } 1591 }
1585 } 1592 }
1586 break; 1593 break;
1587 1594
1588 case MotionNotify: 1595 case MotionNotify:
1589#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1590 if (hidden_pointer) 1597 if (hidden_pointer)
1591 pointer_unblank (); 1598 pointer_unblank ();
1592#endif 1599#endif
1600 if (!bypass_keystate
1593 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1594 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1595 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1605 break;
1598 1606
1599 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1611 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1612 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1613 &ev.xbutton.state); 1621 &ev.xbutton.state);
1614#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1615 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1616 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1617 { 1626 {
1618#endif
1619#if ISO_14755 1627#if ISO_14755
1620 // 5.4 1628 // 5.4
1621 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1622 { 1630 {
1623 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1629 1637
1630#ifdef SELECTION_SCROLLING 1638#ifdef SELECTION_SCROLLING
1631 if (ev.xbutton.y < int_bwidth 1639 if (ev.xbutton.y < int_bwidth
1632 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1640 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1633 { 1641 {
1642 page_dirn scroll_selection_dir;
1634 int dist; 1643 int dist;
1635 1644
1636 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1637 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1638 */ 1647 */
… …
1653 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1654 } 1663 }
1655 else 1664 else
1656 { 1665 {
1657 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1658 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1659 } 1668 }
1660 1669
1661 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1662 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1663 + 1; 1672 + 1;
1664 min_it (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1665 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1675 scroll_selection_lines *= scroll_selection_dir;
1666 } 1676 }
1667 else 1677 else
1668 { 1678 {
1669 /* we are within the text window, so we 1679 /* we are within the text window, so we
1670 * shouldn't be scrolling 1680 * shouldn't be scrolling
1671 */ 1681 */
1672 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1673 } 1683 }
1674#endif 1684#endif
1675#ifdef MOUSE_THRESHOLD
1676 } 1685 }
1677#endif
1678 } 1686 }
1679 } 1687 }
1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1681 { 1689 {
1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683 MotionNotify, &ev)) 1691 MotionNotify, &ev))
1684 ; 1692 ;
1685 1693
1686 XQueryPointer (dpy, scrollBar.win, 1694 XQueryPointer (dpy, scrollBar.win,
1687 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1688 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1689 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1690 &unused_mask); 1698 &unused_mask);
1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692 scrollBar.size ()); 1700 scrollBar.size ());
1693 want_refresh = 1; 1701 want_refresh = 1;
1694 scrollBar.show (1); 1702 scrollBar.show (1);
1695 } 1703 }
1696 break; 1704 break;
1697 } 1705 }
1698 1706
1699#if defined(CURSOR_BLINK) 1707#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1708 if (ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.again (); 1709 cursor_blink_reset ();
1709 }
1710#endif 1710#endif
1711 1711
1712#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 { 1714 {
… …
1725 1725
1726 refresh_check (); 1726 refresh_check ();
1727} 1727}
1728 1728
1729#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1730void 1730void ecb_cold
1731rxvt_term::set_urgency (bool enable) 1731rxvt_term::set_urgency (bool enable)
1732{ 1732{
1733 if (enable == urgency_hint) 1733 if (enable == urgency_hint)
1734 return; 1734 return;
1735 1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1736 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1739 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1740 urgency_hint = enable;
1741 XFree (h);
1741 } 1742 }
1742} 1743}
1743#endif 1744#endif
1744 1745
1745void 1746void ecb_cold
1746rxvt_term::focus_in () 1747rxvt_term::focus_in ()
1747{ 1748{
1748 if (!focus) 1749 if (!focus)
1749 { 1750 {
1750 focus = 1; 1751 focus = 1;
1751 want_refresh = 1; 1752 want_refresh = 1;
1752 1753
1753#if USE_XIM 1754#if USE_XIM
1754 if (Input_Context != NULL) 1755 if (Input_Context != NULL)
1755 { 1756 {
1756 IMSetPosition (); 1757 im_set_position ();
1757 XSetICFocus (Input_Context); 1758 XSetICFocus (Input_Context);
1758 } 1759 }
1759#endif 1760#endif
1760#if CURSOR_BLINK 1761#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1762 if (option (Opt_cursorBlink))
… …
1763#endif 1764#endif
1764#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1766 { 1767 {
1767 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1768 scr_recolour (); 1769 scr_recolor ();
1769 } 1770 }
1770#endif 1771#endif
1771#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1772 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1773 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1774#endif 1778#endif
1775 1779
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1777 } 1781 }
1778} 1782}
1779 1783
1780void 1784void ecb_cold
1781rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1782{ 1786{
1783 if (focus) 1787 if (focus)
1784 { 1788 {
1785 focus = 0; 1789 focus = 0;
1786 want_refresh = 1; 1790 want_refresh = 1;
1787 1791
1788#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1789 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1790 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1791#endif 1798#endif
1792#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1800 if (iso14755buf)
1794 { 1801 {
1795 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1810#endif 1817#endif
1811#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1813 { 1820 {
1814 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1815 scr_recolour (); 1822 scr_recolor ();
1816 } 1823 }
1817#endif 1824#endif
1818 1825
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 } 1827 }
1821} 1828}
1822 1829
1823void 1830void ecb_cold
1824rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1825{ 1832{
1826#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1828 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1829 rgba c; 1839 rgba c;
1830 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1832 } 1842 }
1833#endif 1843#endif
1834} 1844}
1835 1845
1836#if ENABLE_TRANSPARENCY || ENABLE_PERL 1846#if ENABLE_PERL
1837void 1847void ecb_hot
1838rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1839{ 1849{
1840 make_current (); 1850 make_current ();
1841 1851
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1852 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1853 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return; 1854 return;
1845 1855
1846# if ENABLE_TRANSPARENCY
1847 switch (ev.type) 1856 switch (ev.type)
1848 { 1857 {
1849 case PropertyNotify: 1858 case PropertyNotify:
1850 /* 1859 /*
1851 * if user used some Esetroot compatible prog to set the root bg, 1860 * if user used some Esetroot compatible prog to set the root bg,
1852 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1853 */ 1862 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1865 {
1857 bgPixmap.set_root_pixmap (); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1858 update_background ();
1859 } 1867 }
1860 1868
1861 break; 1869 break;
1862 } 1870 }
1863# endif
1864 1871
1865 refresh_check (); 1872 refresh_check ();
1866} 1873}
1867#endif 1874#endif
1868 1875
… …
1891 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1892 return; 1899 return;
1893 } 1900 }
1894#endif 1901#endif
1895 1902
1896 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1897 1904
1898 if (reportmode) 1905 if (reportmode)
1899 { 1906 {
1900 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1901 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
1992 if (scrollBar.upButton (ev.y)) 1999 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */ 2000 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y)) 2001 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */ 2002 direction = DN; /* down */
1996 2003
1997 scrollBar.state = STATE_IDLE; 2004 scrollBar.state = SB_STATE_IDLE;
1998 /* 2005 /*
1999 * Rxvt-style scrollbar: 2006 * Rxvt-style scrollbar:
2000 * move up if mouse is above slider 2007 * move up if mouse is above slider
2001 * move dn if mouse is below slider 2008 * move dn if mouse is below slider
2002 * 2009 *
… …
2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2048 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042#endif 2049#endif
2043 if (scr_page (direction, 1)) 2050 if (scr_page (direction, 1))
2044 { 2051 {
2045 if (direction == UP) 2052 if (direction == UP)
2046 scrollBar.state = STATE_UP; 2053 scrollBar.state = SB_STATE_UP;
2047 else 2054 else
2048 scrollBar.state = STATE_DOWN; 2055 scrollBar.state = SB_STATE_DOWN;
2049 } 2056 }
2050 } 2057 }
2051 else 2058 else
2052 switch (ev.button) 2059 switch (ev.button)
2053 { 2060 {
2054 case Button2: 2061 case Button2:
2055 switch (scrollBar.align) 2062 switch (scrollBar.align)
2056 { 2063 {
2057 case R_SB_ALIGN_TOP: 2064 case SB_ALIGN_TOP:
2058 csrO = 0; 2065 csrO = 0;
2059 break; 2066 break;
2060 case R_SB_ALIGN_CENTRE: 2067 case SB_ALIGN_CENTRE:
2061 csrO = (scrollBar.bot - scrollBar.top) / 2; 2068 csrO = (scrollBar.bot - scrollBar.top) / 2;
2062 break; 2069 break;
2063 case R_SB_ALIGN_BOTTOM: 2070 case SB_ALIGN_BOTTOM:
2064 csrO = scrollBar.bot - scrollBar.top; 2071 csrO = scrollBar.bot - scrollBar.top;
2065 break; 2072 break;
2066 } 2073 }
2067 2074
2068 if (scrollBar.style == R_SB_XTERM 2075 if (scrollBar.style == SB_STYLE_XTERM
2069 || scrollbar_above_slider (ev.y) 2076 || scrollBar.above_slider (ev.y)
2070 || scrollbar_below_slider (ev.y)) 2077 || scrollBar.below_slider (ev.y))
2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2078 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072 2079
2073 scrollBar.state = STATE_MOTION; 2080 scrollBar.state = SB_STATE_MOTION;
2074 break; 2081 break;
2075 2082
2076 case Button1: 2083 case Button1:
2077 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2084 if (scrollBar.align == SB_ALIGN_CENTRE)
2078 csrO = ev.y - scrollBar.top; 2085 csrO = ev.y - scrollBar.top;
2079 /* FALLTHROUGH */ 2086 /* FALLTHROUGH */
2080 2087
2081 case Button3: 2088 case Button3:
2082 if (scrollBar.style != R_SB_XTERM) 2089 if (scrollBar.style != SB_STYLE_XTERM)
2083 { 2090 {
2084 if (scrollbar_above_slider (ev.y)) 2091 if (scrollBar.above_slider (ev.y))
2085# ifdef RXVT_SCROLL_FULL 2092# ifdef RXVT_SCROLL_FULL
2086 scr_page (UP, nrow - 1); 2093 scr_page (UP, nrow - 1);
2087# else 2094# else
2088 scr_page (UP, nrow / 4); 2095 scr_page (UP, nrow / 4);
2089# endif 2096# endif
2090 else if (scrollbar_below_slider (ev.y)) 2097 else if (scrollBar.below_slider (ev.y))
2091# ifdef RXVT_SCROLL_FULL 2098# ifdef RXVT_SCROLL_FULL
2092 scr_page (DN, nrow - 1); 2099 scr_page (DN, nrow - 1);
2093# else 2100# else
2094 scr_page (DN, nrow / 4); 2101 scr_page (DN, nrow / 4);
2095# endif 2102# endif
2096 else 2103 else
2097 scrollBar.state = STATE_MOTION; 2104 scrollBar.state = SB_STATE_MOTION;
2098 } 2105 }
2099 else 2106 else
2100 { 2107 {
2101 scr_page ((ev.button == Button1 ? DN : UP), 2108 scr_page ((ev.button == Button1 ? DN : UP),
2102 (nrow 2109 (nrow
2103 * scrollbar_position (ev.y) 2110 * scrollBar.position (ev.y)
2104 / scrollBar.size ())); 2111 / scrollBar.size ()));
2105 } 2112 }
2106 2113
2107 break; 2114 break;
2108 } 2115 }
… …
2119 2126
2120 csrO = 0; /* reset csr Offset */ 2127 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2128 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2129 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2130
2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2131 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2125 { 2132 {
2126 scrollBar.state = STATE_IDLE; 2133 scrollBar.state = SB_STATE_IDLE;
2127 scrollBar.show (0); 2134 scrollBar.show (0);
2128 } 2135 }
2129 2136
2130#ifdef SELECTION_SCROLLING 2137#ifdef SELECTION_SCROLLING
2131 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
… …
2144 2151
2145 if (reportmode) 2152 if (reportmode)
2146 { 2153 {
2147 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2150 return; 2157 return;
2151#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2152 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2153 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2154 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2155 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2156 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2157 { 2164 {
2158 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2159 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2160 mouse_report (ev); 2167 mouse_report (ev);
2161 } 2168 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2164 mouse_report (ev); 2171 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2173 return;
2167 } 2174 }
2168 2175
… …
2181 case Button3: 2188 case Button3:
2182 selection_make (ev.time); 2189 selection_make (ev.time);
2183 break; 2190 break;
2184 2191
2185 case Button2: 2192 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2194 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2195 break;
2189 2196
2190#ifdef MOUSE_WHEEL 2197#ifdef MOUSE_WHEEL
2191 case Button4: 2198 case Button4:
2192 case Button5: 2199 case Button5:
2193 { 2200 {
2194 int i; 2201 int lines;
2195 page_dirn v; 2202 page_dirn dirn;
2196 2203
2197 v = ev.button == Button4 ? UP : DN; 2204 dirn = ev.button == Button4 ? UP : DN;
2198 2205
2199 if (ev.state & ShiftMask) 2206 if (ev.state & ShiftMask)
2200 i = 1; 2207 lines = 1;
2201 else if (option (Opt_mouseWheelScrollPage)) 2208 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2209 lines = nrow - 1;
2203 else 2210 else
2204 i = 5; 2211 lines = 5;
2205 2212
2206# ifdef MOUSE_SLIP_WHEELING 2213# ifdef MOUSE_SLIP_WHEELING
2207 if (ev.state & ControlMask) 2214 if (ev.state & ControlMask)
2208 { 2215 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2216 mouse_slip_wheel_speed += dirn;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2217 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2218
2213 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215 } 2221 }
2216 else 2222 else
2217# endif 2223# endif
2218 { 2224 {
2219 scr_page (v, i); 2225 scr_page (dirn, lines);
2220 scrollBar.show (1); 2226 scrollBar.show (1);
2221 } 2227 }
2222 } 2228 }
2223 break; 2229 break;
2224#endif 2230#endif
… …
2226 } 2232 }
2227} 2233}
2228 2234
2229/*}}} */ 2235/*}}} */
2230 2236
2231void 2237void ecb_hot
2232rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2233{ 2239{
2234 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2236 2242
2237 for (;;) 2243 for (;;)
2238 { 2244 {
2239 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2240 { 2246 {
2241 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2248 ch = next_char ();
2243 2249
2244 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2245 break; 2251 break;
2246 } 2252 }
2247 2253
2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2249 { 2255 {
2250 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2251 { 2257 {
2252 seen_input = 1; 2258 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2274 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2276
2271 for (;;) 2277 for (;;)
2272 { 2278 {
2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2274 break; 2280 break;
2275 2281
2276 *str++ = ch; 2282 *str++ = ch;
2277 2283
2278 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2285 {
2280 if (ch == C0_LF) 2286 if (ch == C0_LF)
2281 nlines++; 2287 nlines++;
2282 2288
2283 refresh_count++; 2289 refresh_count++;
… …
2355 } 2361 }
2356 } 2362 }
2357} 2363}
2358 2364
2359// read the next character 2365// read the next character
2360wchar_t 2366wchar_t ecb_hot
2361rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2362{ 2368{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2370 {
2365 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2367 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2368 2374
2369 wchar_t wc; 2375 wchar_t wc;
2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2371 2377
… …
2377 } 2383 }
2378 2384
2379 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2380 { 2386 {
2381 mbstate.reset (); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 } 2391 }
2384 2392
2385 // assume wchar == unicode 2393 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
… …
2389 2397
2390 return NOCHAR; 2398 return NOCHAR;
2391} 2399}
2392 2400
2393// read the next octet 2401// read the next octet
2394uint32_t 2402uint32_t ecb_hot
2395rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2396{ 2404{
2397 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR; 2407 : NOCHAR;
2400} 2408}
2401 2409
2402static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2403 2411
2404/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2405/* 2413rxvt_term::cmd_getc ()
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2414{
2412 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2413 2416
2414 if (c == NOCHAR) 2417 if (c == NOCHAR)
2415 throw out_of_input; 2418 throw out_of_input;
2416 2419
2417 return c; 2420 return c;
2418} 2421}
2419 2422
2420uint32_t 2423uint32_t ecb_hot
2421rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2422{ 2425{
2423 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2424 2427
2425 if (c == NOCHAR) 2428 if (c == NOCHAR)
2426 throw out_of_input; 2429 throw out_of_input;
… …
2429} 2432}
2430 2433
2431/*{{{ print pipe */ 2434/*{{{ print pipe */
2432/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2434FILE * 2437FILE * ecb_cold
2435rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2436{ 2439{
2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2438 2441
2439 if (stream == NULL) 2442 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2444
2442 return stream; 2445 return stream;
2443} 2446}
2444 2447
2445int 2448int ecb_cold
2446rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2447{ 2450{
2448 fflush (stream); 2451 fflush (stream);
2449 return pclose (stream); 2452 return pclose (stream);
2450} 2453}
2451 2454
2452/* 2455/*
2453 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2454 */ 2457 */
2455void 2458void ecb_cold
2456rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2457{ 2460{
2458 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2459 2462
2460 if (!fd) 2463 if (!fd)
… …
2506 pclose_printer (fd); 2509 pclose_printer (fd);
2507} 2510}
2508#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2509/*}}} */ 2512/*}}} */
2510 2513
2511/* *INDENT-OFF* */
2512enum { 2514enum {
2513 C1_40 = 0x40, 2515 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2520};
2519/* *INDENT-ON* */
2520 2521
2521/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2522void 2523void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2525{
2525 switch (ch) 2526 switch (ch)
2526 { 2527 {
2527 case C0_ESC: 2528 case C0_ESC:
… …
2557 scr_charset_choose (0); 2558 scr_charset_choose (0);
2558 break; 2559 break;
2559 2560
2560#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2561 // 8-bit controls 2562 // 8-bit controls
2562 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2563 process_dcs_seq (); 2564 process_dcs_seq ();
2564 break; 2565 break;
2565 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2566 process_csi_seq (); 2567 process_csi_seq ();
2567 break; 2568 break;
2568 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2569 process_osc_seq (); 2570 process_osc_seq ();
2570 break; 2571 break;
2571#endif 2572#endif
2572 } 2573 }
2573} 2574}
2574/*}}} */ 2575/*}}} */
2575 2576
2576 2577
2577/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2578void 2579void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2581{
2581 int row, col; 2582 int row, col;
2582 2583
2583 switch (ch) 2584 switch (ch)
… …
2617 break; 2618 break;
2618 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2621 break;
2621 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2622 set_privmode (PrivMode_vt52, 0); 2623 priv_modes &= ~PrivMode_vt52;
2623 break; 2624 break;
2624 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2626 /* unimplemented */ 2627 /* unimplemented */
2627 break; 2628 break;
… …
2633} 2634}
2634/*}}} */ 2635/*}}} */
2635 2636
2636 2637
2637/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2638void 2639void ecb_hot
2639rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2640{ 2641{
2641 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2642 2643
2643 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2647 return;
2647 } 2648 }
2648 2649
2649 switch (ch) 2650 switch (ch)
2650 { 2651 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2652 case '#':
2653 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2654 scr_E (); 2654 scr_E ();
2655 break; 2655 break;
2656 case '(': 2656 case '(':
… …
2679#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2680 case '9': 2680 case '9':
2681 scr_forwardindex (); 2681 scr_forwardindex ();
2682 break; 2682 break;
2683#endif 2683#endif
2684 // DECPAM/DECPNM
2684 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2685 case '>': 2688 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2689 priv_modes &= ~PrivMode_aplKP;
2687 break; 2690 break;
2688 2691
2689 case C1_40: 2692 case C1_40:
2690 cmd_getc (); 2693 cmd_getc ();
2691 break; 2694 break;
… …
2695 2698
2696 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2698 { 2701 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2704 }
2702 break; 2705 break;
2703 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2706 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2713 break;
2714#endif
2708 2715
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2718 scr_set_tab (1);
2712 break; 2719 break;
… …
2715 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2716 scr_index (DN); 2723 scr_index (DN);
2717 break; 2724 break;
2718 2725
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2721 2728
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2724 2731
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2734 process_dcs_seq ();
2728 break; 2735 break;
… …
2761 } 2768 }
2762} 2769}
2763/*}}} */ 2770/*}}} */
2764 2771
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2773enum {
2768 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2776 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2777 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2780 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2781 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2783};
2778 2784
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2790
2785static const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2786 { 2792 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2794 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
… …
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2797 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2801 };
2796/* *INDENT-ON* */
2797 2802
2798void 2803void ecb_hot
2799rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2800{ 2805{
2801 unicode_t ch, priv, i; 2806 unicode_t ch, priv, prev_ch, i;
2802 unsigned int nargs, p; 2807 unsigned int nargs, p;
2803 int n, ndef; 2808 int n, ndef;
2804 int arg[ESC_ARGS] = { }; 2809 int arg[ESC_ARGS] = { };
2805 2810
2806 nargs = 0; 2811 nargs = 0;
… …
2812 /* '<' '=' '>' '?' '!' */ 2817 /* '<' '=' '>' '?' '!' */
2813 priv = ch; 2818 priv = ch;
2814 ch = cmd_getc (); 2819 ch = cmd_getc ();
2815 } 2820 }
2816 2821
2822 prev_ch = 0;
2817 /* read any numerical arguments */ 2823 /* read any numerical arguments */
2818 for (n = -1; ch < CSI_ICH; ) 2824 for (n = -1; ch < CSI_ICH; )
2819 { 2825 {
2820 if (isdigit (ch)) 2826 if (isdigit (ch))
2821 { 2827 {
… …
2831 n = -1; 2837 n = -1;
2832 } 2838 }
2833 else if (IS_CONTROL (ch)) 2839 else if (IS_CONTROL (ch))
2834 process_nonprinting (ch); 2840 process_nonprinting (ch);
2835 2841
2842 prev_ch = ch;
2836 ch = cmd_getc (); 2843 ch = cmd_getc ();
2837 } 2844 }
2838 2845
2839 if (ch > CSI_7F) 2846 if (ch > CSI_7F)
2840 return; 2847 return;
… …
2870 break; 2877 break;
2871 2878
2872 case '?': 2879 case '?':
2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2874 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2875 break; 2884 break;
2876 2885
2877 case '!': 2886 case '!':
2878 if (ch == CSI_70) 2887 if (ch == CSI_70)
2879 { 2888 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset (); 2890 scr_soft_reset ();
2882 2891
2883 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2885 2894
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2897 }
2889 break; 2898 break;
2890 } 2899 }
2891 2900
2892 return; 2901 return;
… …
2910 } 2919 }
2911 break; 2920 break;
2912#endif 2921#endif
2913 2922
2914 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2923 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2915 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2924 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2916 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2917 /* FALLTHROUGH */ 2926 /* FALLTHROUGH */
2918 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2927 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2920 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2921 break; 2930 break;
2922 2931
2923 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2924 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2925#ifdef ISO6429 2934#ifdef ISO6429
2926 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2927#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2928 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2929#endif 2938#endif
… …
3020 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3021 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3022 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3023 break; 3032 break;
3024 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3025 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3026 break; 3039 break;
3040 }
3027 } 3041 }
3028 break; 3042 break;
3029 3043
3030 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3031 switch (arg[0]) 3045 switch (arg[0])
… …
3074 scr_insert_mode (1); 3088 scr_insert_mode (1);
3075 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3076 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3077 break; 3091 break;
3078 3092
3093 case CSI_71: // DECSCUSR: set cursor style
3094 if (prev_ch == ' ')
3095 set_cursor_style (arg[0]);
3096 break;
3097
3079 /* 3098 /*
3080 * PRIVATE USE beyond this point. All CSI_7? sequences here 3099 * PRIVATE USE beyond this point. All CSI_7? sequences here
3081 */ 3100 */
3082 case CSI_72: /* DECSTBM: set top and bottom margins */ 3101 case CSI_72: /* DECSTBM: set top and bottom margins */
3083 if (nargs == 1) 3102 if (nargs == 1)
… …
3111 } 3130 }
3112} 3131}
3113/*}}} */ 3132/*}}} */
3114 3133
3115#if !ENABLE_MINIMAL 3134#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3135void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3136rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3137{
3120 int x, y; 3138 int x, y;
3121 XWindowAttributes wattr; 3139 XWindowAttributes wattr;
… …
3130 { 3148 {
3131 /* 3149 /*
3132 * commands 3150 * commands
3133 */ 3151 */
3134 case 1: /* deiconify window */ 3152 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3153 XMapWindow (dpy, parent);
3136 break; 3154 break;
3137 case 2: /* iconify window */ 3155 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3156 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3157 break;
3140 case 3: /* set position (pixels) */ 3158 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3159 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3160 break;
3143 case 4: /* set size (pixels) */ 3161 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3162 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3163 break;
3146 case 5: /* raise window */ 3164 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3165 XRaiseWindow (dpy, parent);
3148 break; 3166 break;
3149 case 6: /* lower window */ 3167 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3168 XLowerWindow (dpy, parent);
3151 break; 3169 break;
3152 case 7: /* refresh window */ 3170 case 7: /* refresh window */
3153 scr_touch (true); 3171 scr_touch (true);
3154 break; 3172 break;
3155 case 8: /* set size (chars) */ 3173 case 8: /* set size (chars) */
… …
3158 break; 3176 break;
3159 3177
3160 //case 9: NYI, TODO, restore maximized window or maximize window 3178 //case 9: NYI, TODO, restore maximized window or maximize window
3161 default: 3179 default:
3162 if (args[0] >= 24) /* set height (chars) */ 3180 if (args[0] >= 24) /* set height (chars) */
3163 set_widthheight ((unsigned int)width, 3181 set_widthheight ((unsigned int)vt_width,
3164 (unsigned int) (args[1] * fheight)); 3182 (unsigned int) (args[1] * fheight));
3165 break; 3183 break;
3166 3184
3167 /* 3185 /*
3168 * reports - some output format copied from XTerm 3186 * reports - some output format copied from XTerm
3169 */ 3187 */
3170 case 11: /* report window state */ 3188 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3189 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3190 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3191 break;
3174 case 13: /* report window position */ 3192 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3194 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3195 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3196 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3197 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3198 break;
3181 case 14: /* report window size (pixels) */ 3199 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3200 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3201 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3202 break;
3185 case 18: /* report text area size (chars) */ 3203 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3204 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3205 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3207 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3208 break;
3191 case 20: /* report icon label */ 3209 case 20: /* report icon label */
3192 { 3210 {
3193 char *s; 3211 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3212 XGetIconName (dpy, parent, &s);
3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3214 XFree (s);
3197 } 3215 }
3198 break; 3216 break;
3199 case 21: /* report window title */ 3217 case 21: /* report window title */
3200 { 3218 {
3201 char *s; 3219 char *s;
3202 XFetchName (dpy, parent[0], &s); 3220 XFetchName (dpy, parent, &s);
3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3221 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204 XFree (s); 3222 XFree (s);
3205 } 3223 }
3206 break; 3224 break;
3207 } 3225 }
… …
3212/* 3230/*
3213 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3214 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3215 */ 3233 */
3216char * 3234char *
3217rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3218{ 3236{
3219 unicode_t ch; 3237 unicode_t ch;
3220 bool seen_esc = false; 3238 bool seen_esc = false;
3221 unsigned int n = 0; 3239 unsigned int n = 0;
3222 wchar_t string[STRING_MAX]; 3240 wchar_t string[CBUFSIZ];
3223 3241
3224 while ((ch = cmd_getc ()) != NOCHAR) 3242 while ((ch = cmd_getc ()) != NOCHAR)
3225 { 3243 {
3226 if (seen_esc) 3244 if (seen_esc)
3227 { 3245 {
… …
3242 else if (ch < 0x20) 3260 else if (ch < 0x20)
3243 return NULL; /* other control character - exit */ 3261 return NULL; /* other control character - exit */
3244 3262
3245 seen_esc = false; 3263 seen_esc = false;
3246 3264
3247 if (n >= STRING_MAX - 1) 3265 if (n >= sizeof (string) - 1)
3248 // stop at some sane length 3266 // stop at some sane length
3249 return NULL; 3267 return NULL;
3250 3268
3251 string[n++] = ch; 3269 string[n++] = ch;
3252 } 3270 }
3253 3271
3254 string[n++] = '\0'; 3272 string[n++] = '\0';
3255 3273
3256 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3257 3279
3258 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3259} 3281}
3260 3282
3261/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3267{ 3289{
3268 /* 3290 /*
3269 * Not handled yet 3291 * Not handled yet
3270 */ 3292 */
3271 3293
3272 unicode_t eh; 3294 string_term st;
3273 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3274 if (s) 3296 if (s)
3275 free (s); 3297 free (s);
3276 3298
3277 return; 3299 return;
3278} 3300}
… …
3290 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3291 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3292 3314
3293 if (ch == ';') 3315 if (ch == ';')
3294 { 3316 {
3295 unicode_t eh; 3317 string_term st;
3296 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3297 3319
3298 if (s) 3320 if (s)
3299 { 3321 {
3300 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3301 free (s); 3323 free (s);
3302 } 3324 }
3303 } 3325 }
3304} 3326}
3305 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {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},
3378 {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},
3379 {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},
3380 {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},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {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},
3383 {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},
3384 {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},
3385 {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},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3306void 3431void
3307rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3308{ 3433{
3309 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3310 { 3435 {
3311 rgba c; 3436 rgba c;
3312 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3313 3439
3314#if XFT 3440#if XFT
3315 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3316 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3317 else 3443 else
3318#endif 3444#endif
3319 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3320 } 3451 }
3321 else 3452 else
3322 set_window_color (color, str); 3453 set_window_color (color, str);
3323} 3454}
3324 3455
3325/* 3456/*
3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3327 */ 3458 */
3328void 3459void
3329rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3330{ 3461{
3331 int color; 3462 int color;
3332 char *buf, *name; 3463 char *buf, *name;
3333 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3334 int saveop = op; 3465 int saveop = op;
… …
3361 unsigned long bytes_after; 3492 unsigned long bytes_after;
3362 unsigned char *value = 0; 3493 unsigned char *value = 0;
3363 const char *str = ""; 3494 const char *str = "";
3364 3495
3365 if (prop 3496 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3497 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3498 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3499 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3501 && actual_type != None
3371 && actual_format == 8) 3502 && actual_format == 8)
3372 str = (const char *)(value); 3503 str = (const char *)(value);
3373 3504
3374 tt_printf ("\033]%d;%s%c", op, str, resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3375 3506
3376 XFree (value); 3507 XFree (value);
3377 } 3508 }
3378 else 3509 else
3379 { 3510 {
… …
3383 { 3514 {
3384 *eq = 0; 3515 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3516 set_utf8_property (display->atom (str), eq + 1);
3386 } 3517 }
3387 else 3518 else
3388 XDeleteProperty (dpy, parent[0], 3519 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3520 display->atom (str));
3390 } 3521 }
3391 break; 3522 break;
3392 3523
3393 case XTerm_Color: 3524 case XTerm_Color:
… …
3403 break; 3534 break;
3404 3535
3405 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3406 *buf++ = '\0'; 3537 *buf++ = '\0';
3407 3538
3408 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3409 } 3540 }
3410 break; 3541 break;
3411 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3412 case XTerm_Color00: 3543 case XTerm_Color00:
3413 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3414 break; 3545 break;
3415 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3547 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3418 break; 3549 break;
3419#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3421 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3422 break; 3553 break;
3423#endif 3554#endif
3424 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3425 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3426 break; 3557 break;
3427 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3429 break; 3560 break;
3430#ifdef OPTION_HC 3561#ifdef OPTION_HC
3431 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3433 break; 3564 break;
3434 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3436 break; 3567 break;
3437#endif 3568#endif
3438#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3439 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3440 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3441 break; 3572 break;
3442 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3443 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3444 break; 3575 break;
3445 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3446 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3447 break; 3578 break;
3448#endif 3579#endif
3449 case URxvt_Color_border: 3580 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3451 break; 3582 break;
3452#if ENABLE_TRANSPARENCY
3453 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3457
3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462
3463 if (changed)
3464 update_background ();
3465 }
3466
3467 break;
3468#endif
3469
3470#if BG_IMAGE_FROM_FILE
3471 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?"))
3473 {
3474 char str[256];
3475
3476 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 }
3481 else
3482 {
3483 int changed = 0;
3484
3485 if (*str != ';')
3486 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3489 changed++;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3496 }
3497 else
3498 {
3499 str++;
3500 if (bgPixmap.set_geometry (str, true))
3501 changed++;
3502 }
3503
3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3512 update_background ();
3513 }
3514 }
3515 break;
3516#endif
3517 3583
3518 case XTerm_logfile: 3584 case XTerm_logfile:
3519 // TODO, when secure mode? 3585 // TODO, when secure mode?
3520 break; 3586 break;
3521 3587
… …
3538 case URxvt_boldFont: 3604 case URxvt_boldFont:
3539 case URxvt_italicFont: 3605 case URxvt_italicFont:
3540 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3541#endif 3607#endif
3542 if (query) 3608 if (query)
3543 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3544 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3545 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3546 resp); 3612 st.v);
3547 else 3613 else
3548 { 3614 {
3549 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3550 3616
3551 res = strdup (str); 3617 res = strdup (str);
… …
3554 } 3620 }
3555 break; 3621 break;
3556 3622
3557 case URxvt_version: 3623 case URxvt_version:
3558 if (query) 3624 if (query)
3559 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3560 op, 3626 op,
3561 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3562 resp); 3628 st.v);
3563 break; 3629 break;
3564 3630
3565#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3566 case URxvt_locale: 3639 case URxvt_locale:
3567 if (query) 3640 if (query)
3568 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3569 else 3642 else
3570 { 3643 {
3571 set_locale (str); 3644 set_locale (str);
3572 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3573 init_xlocale (); 3646 init_xlocale ();
… …
3588 break; 3661 break;
3589#endif 3662#endif
3590 3663
3591#if ENABLE_PERL 3664#if ENABLE_PERL
3592 case URxvt_perl: 3665 case URxvt_perl:
3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3594 break; 3667 break;
3595#endif 3668#endif
3596 } 3669 }
3597} 3670}
3598/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3605 * 's' = save 3678 * 's' = save
3606 * 'r' = restore 3679 * 'r' = restore
3607 * 't' = toggle 3680 * 't' = toggle
3608 * so no need for fancy checking 3681 * so no need for fancy checking
3609 */ 3682 */
3610int 3683int ecb_cold
3611rxvt_term::privcases (int mode, unsigned long bit) 3684rxvt_term::privcases (int mode, unsigned long bit)
3612{ 3685{
3613 int state; 3686 int state;
3614 3687
3615 if (mode == 's') 3688 if (mode == 's')
3616 { 3689 {
3617 SavedModes |= (priv_modes & bit); 3690 if (priv_modes & bit)
3691 SavedModes |= bit;
3692 else
3693 SavedModes &= ~bit;
3618 return -1; 3694 return -1;
3619 } 3695 }
3620 else 3696 else
3621 { 3697 {
3622 if (mode == 'r') 3698 if (mode == 'r')
3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3699 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3624 else 3700 else
3625 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3701 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626 3702
3627 set_privmode (bit, state); 3703 if (state)
3704 priv_modes |= bit;
3705 else
3706 priv_modes &= ~bit;
3628 } 3707 }
3629 3708
3630 return state; 3709 return state;
3631} 3710}
3632 3711
3633/* we're not using priv _yet_ */ 3712/* we're not using priv _yet_ */
3634void 3713void
3635rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3714rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3636{ 3715{
3637 unsigned int i, j; 3716 unsigned int i, j;
3638 int state; 3717 int state;
3639 3718
3640 static const struct 3719 static const struct
3641 { 3720 {
3642 const int argval; 3721 const int argval;
3643 const unsigned long bit; 3722 const unsigned long bit;
3644 } argtopriv[] = { 3723 } argtopriv[] = {
3645 { 1, PrivMode_aplCUR }, // DECCKM 3724 { 1, PrivMode_aplCUR }, // DECCKM
3646 { 2, PrivMode_vt52 }, 3725 { 2, PrivMode_vt52 }, // DECANM
3647 { 3, PrivMode_132 }, // DECCOLM 3726 { 3, PrivMode_132 }, // DECCOLM
3648 { 4, PrivMode_smoothScroll }, // DECSCLM 3727 { 4, PrivMode_smoothScroll }, // DECSCLM
3649 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3650 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3651 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3652 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3653 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3654 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3658 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
3659#endif 3739#endif
3660 { 35, PrivMode_ShiftKeys }, // rxvt extension 3740 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK 3741 // 38, tektronix mode // DECTEK
3662 { 40, PrivMode_132OK }, 3742 { 40, PrivMode_132OK },
3663 // 41 xterm more fixes NYI 3743 // 41 xterm more fixes NYI
3664 // 45 margin bell NYI 3744 // 45 margin bell NYI
3665 // 46 start logging 3745 // 46 start logging
3666 { 47, PrivMode_Screen }, 3746 { 47, PrivMode_Screen },
3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3747 { 66, PrivMode_aplKP }, // DECNKM
3668#ifndef NO_BACKSPACE_KEY 3748#ifndef NO_BACKSPACE_KEY
3669 { 67, PrivMode_BackSpace }, // DECBKM 3749 { 67, PrivMode_BackSpace }, // DECBKM
3670#endif 3750#endif
3671 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3672 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3673 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3675 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3676#endif 3758#endif
3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3678 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3681#endif 3763#endif
3682 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3683 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3684 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3685 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3686 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3689 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3690 }; 3774 };
3691 3775
3692 if (nargs == 0) 3776 if (nargs == 0)
3693 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3694 3796
3695 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3696 if (mode == 'l') 3798 if (mode == 'l')
3697 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3698 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3701 for (i = 0; i < nargs; i++) 3803 for (i = 0; i < nargs; i++)
3702 { 3804 {
3703 state = -1; 3805 state = -1;
3704 3806
3705 /* basic handling */ 3807 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3808 for (j = 0; j < ecb_array_length (argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3809 if (argtopriv[j].argval == arg[i])
3708 { 3810 {
3709 state = privcases (mode, argtopriv[j].bit); 3811 state = privcases (mode, argtopriv[j].bit);
3710 break; 3812 break;
3711 } 3813 }
… …
3737 case 2: /* VT52 mode */ 3839 case 2: /* VT52 mode */
3738 /* oddball mode. should be set regardless of set/reset 3840 /* oddball mode. should be set regardless of set/reset
3739 * parameter. Return from VT52 mode with an ESC < from 3841 * parameter. Return from VT52 mode with an ESC < from
3740 * within VT52 mode 3842 * within VT52 mode
3741 */ 3843 */
3742 set_privmode (PrivMode_vt52, 1); 3844 priv_modes |= PrivMode_vt52;
3743 break; 3845 break;
3744 case 3: /* 80/132 */ 3846 case 3: /* 80/132 */
3745 if (priv_modes & PrivMode_132OK) 3847 if (priv_modes & PrivMode_132OK)
3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3848 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3747 break; 3849 break;
… …
3762 if (state) /* orthogonal */ 3864 if (state) /* orthogonal */
3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3865 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3866 break;
3765#ifdef scrollBar_esc 3867#ifdef scrollBar_esc
3766 case scrollBar_esc: 3868 case scrollBar_esc:
3767 if (scrollBar.map (state)) 3869 scrollBar.map (state);
3768 {
3769 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3770 scr_touch (true); 3871 scr_touch (true);
3771 } 3872 break;
3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3772 break; 3877 break;
3773#endif 3878#endif
3774 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3775 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3776 break; 3881 break;
… …
3831 } 3936 }
3832} 3937}
3833/*}}} */ 3938/*}}} */
3834 3939
3835/*{{{ process sgr sequences */ 3940/*{{{ process sgr sequences */
3836void 3941void ecb_hot
3837rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3942rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3838{ 3943{
3839 unsigned int i; 3944 unsigned int i;
3840 short rendset; 3945 short rendset;
3841 int rendstyle; 3946 int rendstyle;
… …
3883 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3884 //case 20: // gothic 3989 //case 20: // gothic
3885 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3886 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3887 break; 3992 break;
3888 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3889 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3890 break; 3995 break;
3891 case 23: // disable italic 3996 case 23: // disable italic
3892 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3893 break; 3998 break;
3894 case 24: 3999 case 24: // underline off (vt220)
3895 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3896 break; 4001 break;
3897 case 25: 4002 case 25: // blink off (vt220)
3898 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3899 break; 4004 break;
3900 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3901 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3902 break; 4007 break;
3903 case 27: 4008 case 27: // reverse off (vt220)
3904 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3905 break; 4010 break;
3906 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3907 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3908 } 4013 }
… …
3923 case 35: 4028 case 35:
3924 case 36: 4029 case 36:
3925 case 37: 4030 case 37:
3926 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3927 break; 4032 break;
3928 case 38: // set fg color, ISO 8613-6
3929 if (nargs > i + 2 && arg[i + 1] == 5)
3930 {
3931 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3932 i += 2;
3933 }
3934 break;
3935 case 39: /* default fg */ 4033 case 39: /* default fg */
3936 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3937 break; 4035 break;
3938 4036
3939 case 40: 4037 case 40:
… …
3944 case 45: 4042 case 45:
3945 case 46: 4043 case 46:
3946 case 47: 4044 case 47:
3947 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3948 break; 4046 break;
3949 case 48: // set bg color, ISO 8613-6
3950 if (nargs > i + 2 && arg[i + 1] == 5)
3951 {
3952 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3953 i += 2;
3954 }
3955 break;
3956 case 49: /* default bg */ 4047 case 49: /* default bg */
3957 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
3958 break; 4078 break;
3959 4079
3960 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3961 4081
3962#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
3982 break; 4102 break;
3983#endif 4103#endif
3984 } 4104 }
3985 } 4105 }
3986} 4106}
4107
4108void
4109rxvt_term::set_cursor_style (int style)
4110{
4111 if (!IN_RANGE_INC (style, 0, 6))
4112 return;
4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4119
4120#ifdef CURSOR_BLINK
4121 set_option (Opt_cursorBlink, style & 1);
4122 cursor_blink_reset ();
4123#endif
4124
4125 want_refresh = 1;
4126}
3987/*}}} */ 4127/*}}} */
3988 4128
3989/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3990void
3991rxvt_term::process_graphics ()
3992{
3993 unicode_t ch, cmd = cmd_getc ();
3994
3995 if (cmd == 'Q')
3996 {
3997 /* query graphics */
3998 tt_printf ("\033G0\012"); /* no graphics */
3999 return;
4000 }
4001 /* swallow other graphics sequences until terminating ':' */
4002 do
4003 ch = cmd_getc ();
4004 while (ch != ':');
4005}
4006/*}}} */
4007
4008/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
4009 4133
4010/* 4134/*
4011 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
4012 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
4013 */ 4137 */
… …
4021 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4022 va_end (arg_ptr); 4146 va_end (arg_ptr);
4023 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
4024} 4148}
4025 4149
4026/* ---------------------------------------------------------------------- */
4027/* Write data to the pty as typed by the user, pasted with the mouse, 4150/* Write data to the pty as typed by the user. */
4028 * or generated by us in response to a query ESC sequence. 4151void
4029 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4157 if (option (Opt_scrollTtyKeypress))
4158 if (view_start)
4159 {
4160 view_start = 0;
4161 want_refresh = 1;
4162 }
4163
4164 tt_write_ (data, len);
4165}
4031 4166
4032void 4167void
4033rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
4034{ 4169{
4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4036 return; 4171 return;
4037 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
4038 if (pty->pty < 0) 4181 if (pty->pty < 0)
4039 return; 4182 return;
4040 4183
4041 if (v_buflen == 0) 4184 if (v_buflen == 0)
4042 { 4185 {
4043 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4186 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044 4187
4188 max_it (written, 0);
4189
4045 if ((unsigned int)written == len) 4190 if (written == len)
4046 return; 4191 return;
4047 4192
4048 data += written; 4193 data += written;
4049 len -= written; 4194 len -= written;
4050 } 4195 }
4051 4196
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4197 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 4198
4054 memcpy (v_buffer + v_buflen, data, len); 4199 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4200 v_buflen += len;
4056 4201
4057 pty_ev.set (ev::READ | ev::WRITE); 4202 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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