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.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.570 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 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
… …
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 */
… …
575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
576 return; 785 return;
577#endif 786#endif
578 } 787 }
579 } 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;
580 } 804 }
581 805
582#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 807 // ISO 14755 support
584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
639 { 863 {
640 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
641 return; 865 return;
642 } 866 }
643#endif 867#endif
644
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
687 newlen = 0;
688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
771 {
772 int param = map_function_key (keysym);
773 if (param > 0)
774 sprintf (kbuf,"\033[%d~", param);
775 else
776 newlen = 0;
777 }
778 break;
779 }
780
781 if (newlen)
782 len = strlen (kbuf);
783
784 /*
785 * Pass meta for all function keys, if 'meta' option set
786 */
787#ifdef META8_OPTION
788 if (meta && (meta_char == 0x80) && len > 0)
789 kbuf[len - 1] |= 0x80;
790#endif
791
792 }
793 else if (ctrl && keysym == XK_minus)
794 {
795 len = 1;
796 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
797 }
798 else if (keysym == XK_ISO_Left_Tab)
799 {
800 strcpy (kbuf, "\033[Z");
801 len = 3;
802 }
803 else
804 {
805#ifdef META8_OPTION
806 /* set 8-bit on */
807 if (meta && (meta_char == 0x80))
808 {
809 char *ch;
810
811 for (ch = kbuf; ch < kbuf + len; ch++)
812 *ch |= 0x80;
813
814 meta = 0;
815 }
816#endif
817 /* nil */ ;
818 }
819 } 868 }
820
821 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
822 return;
823 869
824 if (len <= 0) 870 if (len <= 0)
825 return; /* not mapped */ 871 return; /* not mapped */
826 872
827 if (option (Opt_scrollTtyKeypress))
828 if (view_start)
829 {
830 view_start = 0;
831 want_refresh = 1;
832 }
833
834 /*
835 * these modifications only affect the static keybuffer
836 * pass Shift/Control indicators for function keys ending with `~'
837 *
838 * eg,
839 * Prior = "ESC[5~"
840 * Shift+Prior = "ESC[5$"
841 * Ctrl+Prior = "ESC[5^"
842 * Ctrl+Shift+Prior = "ESC[5@"
843 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844 */
845 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848 /* escape prefix */
849 if (meta
850#ifdef META8_OPTION
851 && meta_char == C0_ESC
852#endif
853 )
854 {
855 const char ch = C0_ESC;
856 tt_write (&ch, 1);
857 }
858
859 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
860} 874}
861 875
862void 876void ecb_cold
863rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
864{ 878{
865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym; 880 KeySym keysym;
867 881
… …
939void 953void
940rxvt_term::flush () 954rxvt_term::flush ()
941{ 955{
942 flush_ev.stop (); 956 flush_ev.stop ();
943 957
944#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
945 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
946 { 960 {
947 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
948 scr_touch (false); 962 scr_touch (false);
949 } 963 }
… …
989 while (row < end_row); 1003 while (row < end_row);
990 } 1004 }
991 1005
992 scr_refresh (); 1006 scr_refresh ();
993 scrollBar.show (1); 1007 scrollBar.show (1);
994#ifdef USE_XIM 1008#if USE_XIM
995 IMSendSpot (); 1009 im_send_spot ();
996#endif 1010#endif
997 } 1011 }
998 1012
999 display->flush (); 1013 display->flush ();
1000} 1014}
… …
1018 flush (); 1032 flush ();
1019} 1033}
1020 1034
1021#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1022void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024{ 1056{
1025 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1026 want_refresh = 1; 1058 want_refresh = 1;
1027 refresh_check (); 1059 refresh_check ();
… …
1045 1077
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1079void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1081{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1084 {
1053 want_refresh = 1; 1085 want_refresh = 1;
1054 refresh_check (); 1086 refresh_check ();
1055 } 1087 }
1056 else 1088 else
… …
1060 1092
1061#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1062void 1094void
1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064{ 1096{
1065 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1066 { 1098 {
1067 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068 want_refresh = 1; 1100 want_refresh = 1;
1069 refresh_check (); 1101 refresh_check ();
1070 } 1102 }
… …
1075 1107
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1109void
1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1111{
1080 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1081 { 1113 {
1082 want_refresh = 1; 1114 want_refresh = 1;
1083 refresh_check (); 1115 refresh_check ();
1084 } 1116 }
1085 1117
… …
1206 pty_write (); 1238 pty_write ();
1207 1239
1208 refresh_check (); 1240 refresh_check ();
1209} 1241}
1210 1242
1211void 1243void ecb_cold
1212rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1213{ 1245{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1247 recolor_cursor ();
1216 1248
1217#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1218 hidden_pointer = 0; 1250 hidden_pointer = 0;
1219 1251
1220 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1221 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1222#endif 1254#endif
1223} 1255}
1224 1256
1225#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1226void 1258void ecb_cold
1227rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1228{ 1260{
1229 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1230 return; 1262 return;
1231 1263
… …
1233 XFlush (dpy); 1265 XFlush (dpy);
1234 1266
1235 hidden_pointer = 1; 1267 hidden_pointer = 1;
1236} 1268}
1237 1269
1238void 1270void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1272{
1241 make_current (); 1273 make_current ();
1242 1274
1243 pointer_blank (); 1275 pointer_blank ();
… …
1335 32 + x, 1367 32 + x,
1336 32 + y); 1368 32 + y);
1337} 1369}
1338 1370
1339/*{{{ process an X event */ 1371/*{{{ process an X event */
1340void 1372void ecb_hot
1341rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1342{ 1374{
1343 make_current (); 1375 make_current ();
1344 1376
1345 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1448 if (ev.xconfigure.window == parent) 1480 if (ev.xconfigure.window == parent)
1449 { 1481 {
1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1483 ;
1452 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1453#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1456 { 1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1457 int x, y; 1499 int x, y;
1500
1458 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1459 { 1502 {
1460 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1462 } 1505 }
1463 else 1506 else
1464 get_window_origin (x, y); 1507 get_window_origin (x, y);
1465 1508
1466 if (bg_set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1467 || !(bg_flags & BG_IS_VALID)) 1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1468 moved = true; 1514 moved = true;
1515 }
1469 } 1516 }
1470#endif
1471 1517
1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1473 { 1519 {
1474 seen_resize = 1; 1520 seen_resize = 1;
1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476 } 1522 }
1477 else 1523 else
1478 { 1524 {
1479#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1526 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1527 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1528#endif
1488 } 1529 }
1489 1530
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1532 }
… …
1503 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1504 break; 1545 break;
1505 1546
1506 case MapNotify: 1547 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1509 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1511 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1512 * reparenting. 1553 // events at startup when the window manager reparents the
1513 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1515 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1522#endif 1558#endif
1523 mapped = 1; 1559 mapped = 1;
1524#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1525 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1602 ;
1567 1603
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1605 {
1570 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1607 scrollBar.show (0);
1572 } 1608 }
1573 } 1609 }
1574 break; 1610 break;
1575 1611
1576 case MotionNotify: 1612 case MotionNotify:
1577#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1614 if (hidden_pointer)
1579 pointer_unblank (); 1615 pointer_unblank ();
1580#endif 1616#endif
1617 if (!bypass_keystate
1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1582 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1583 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1622 break;
1586 1623
1587 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1599 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1600 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1601 &ev.xbutton.state); 1638 &ev.xbutton.state);
1602#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1603 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1604 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1605 { 1643 {
1606#endif
1607#if ISO_14755 1644#if ISO_14755
1608 // 5.4 1645 // 5.4
1609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1610 { 1647 {
1611 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1617 1654
1618#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1619 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1620 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1621 { 1658 {
1659 page_dirn scroll_selection_dir;
1622 int dist; 1660 int dist;
1623 1661
1624 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1626 */ 1664 */
… …
1641 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1642 } 1680 }
1643 else 1681 else
1644 { 1682 {
1645 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1685 }
1648 1686
1649 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1689 + 1;
1652 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1653 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1654 } 1693 }
1655 else 1694 else
1656 { 1695 {
1657 /* we are within the text window, so we 1696 /* we are within the text window, so we
1658 * shouldn't be scrolling 1697 * shouldn't be scrolling
1659 */ 1698 */
1660 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1661 } 1700 }
1662#endif 1701#endif
1663#ifdef MOUSE_THRESHOLD
1664 } 1702 }
1665#endif
1666 } 1703 }
1667 } 1704 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1706 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1672 ; 1709 ;
1673 1710
1674 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1715 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1717 scrollBar.size ());
1681 want_refresh = 1; 1718 want_refresh = 1;
1682 scrollBar.show (1); 1719 scrollBar.show (1);
1683 } 1720 }
1684 break; 1721 break;
1685 } 1722 }
1686 1723
1687#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1697 }
1698#endif 1727#endif
1699 1728
1700#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1731 {
… …
1713 1742
1714 refresh_check (); 1743 refresh_check ();
1715} 1744}
1716 1745
1717#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1718void 1747void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1720{ 1749{
1721 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1722 return; 1751 return;
1723 1752
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1754 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1756 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1729 } 1759 }
1730} 1760}
1731#endif 1761#endif
1732 1762
1733void 1763void ecb_cold
1734rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1735{ 1765{
1736 if (!focus) 1766 if (!focus)
1737 { 1767 {
1738 focus = 1; 1768 focus = 1;
1739 want_refresh = 1; 1769 want_refresh = 1;
1740 1770
1741#if USE_XIM 1771#if USE_XIM
1742 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1743 { 1773 {
1744 IMSetPosition (); 1774 im_set_position ();
1745 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1746 } 1776 }
1747#endif 1777#endif
1748#if CURSOR_BLINK 1778#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1751#endif 1781#endif
1752#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1754 { 1784 {
1755 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1756 scr_recolour (); 1786 scr_recolor ();
1757 } 1787 }
1758#endif 1788#endif
1759#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1760 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1761 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1762#endif 1795#endif
1763 1796
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 } 1798 }
1766} 1799}
1767 1800
1768void 1801void ecb_cold
1769rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1770{ 1803{
1771 if (focus) 1804 if (focus)
1772 { 1805 {
1773 focus = 0; 1806 focus = 0;
1774 want_refresh = 1; 1807 want_refresh = 1;
1775 1808
1776#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1777 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1778 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1779#endif 1815#endif
1780#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1817 if (iso14755buf)
1782 { 1818 {
1783 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1798#endif 1834#endif
1799#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1801 { 1837 {
1802 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1803 scr_recolour (); 1839 scr_recolor ();
1804 } 1840 }
1805#endif 1841#endif
1806 1842
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 } 1844 }
1809} 1845}
1810 1846
1811void 1847void ecb_cold
1812rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1813{ 1849{
1814#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1816 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1817 rgba c; 1856 rgba c;
1818 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 } 1859 }
1821#endif 1860#endif
1822} 1861}
1823 1862
1824#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1825void 1864void ecb_hot
1826rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1866{
1828 make_current (); 1867 make_current ();
1829 1868
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return; 1871 return;
1833 1872
1834# if ENABLE_TRANSPARENCY
1835 switch (ev.type) 1873 switch (ev.type)
1836 { 1874 {
1837 case PropertyNotify: 1875 case PropertyNotify:
1838 /* 1876 /*
1839 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1840 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1841 */ 1879 */
1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844 { 1882 {
1845 bg_set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1846 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1847 } 1891 }
1848 1892
1849 break; 1893 break;
1850 } 1894 }
1851# endif
1852 1895
1853 refresh_check (); 1896 refresh_check ();
1854} 1897}
1855#endif 1898#endif
1856 1899
… …
1879 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1880 return; 1923 return;
1881 } 1924 }
1882#endif 1925#endif
1883 1926
1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1885 1928
1886 if (reportmode) 1929 if (reportmode)
1887 { 1930 {
1888 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1889 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
… …
1980 if (scrollBar.upButton (ev.y)) 2023 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 2024 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 2025 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 2026 direction = DN; /* down */
1984 2027
1985 scrollBar.state = STATE_IDLE; 2028 scrollBar.state = SB_STATE_IDLE;
1986 /* 2029 /*
1987 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 2031 * move up if mouse is above slider
1989 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1990 * 2033 *
… …
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2073#endif
2031 if (scr_page (direction, 1)) 2074 if (scr_page (direction, 1))
2032 { 2075 {
2033 if (direction == UP) 2076 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2077 scrollBar.state = SB_STATE_UP;
2035 else 2078 else
2036 scrollBar.state = STATE_DOWN; 2079 scrollBar.state = SB_STATE_DOWN;
2037 } 2080 }
2038 } 2081 }
2039 else 2082 else
2040 switch (ev.button) 2083 switch (ev.button)
2041 { 2084 {
2042 case Button2: 2085 case Button2:
2043 switch (scrollBar.align) 2086 switch (scrollBar.align)
2044 { 2087 {
2045 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2046 csrO = 0; 2089 csrO = 0;
2047 break; 2090 break;
2048 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2093 break;
2051 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2096 break;
2054 } 2097 }
2055 2098
2056 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2103
2061 scrollBar.state = STATE_MOTION; 2104 scrollBar.state = SB_STATE_MOTION;
2062 break; 2105 break;
2063 2106
2064 case Button1: 2107 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2068 2111
2069 case Button3: 2112 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2114 {
2072 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2075# else 2118# else
2076 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2077# endif 2120# endif
2078 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2081# else 2124# else
2082 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2083# endif 2126# endif
2084 else 2127 else
2085 scrollBar.state = STATE_MOTION; 2128 scrollBar.state = SB_STATE_MOTION;
2086 } 2129 }
2087 else 2130 else
2088 { 2131 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2133 (nrow
2091 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2135 / scrollBar.size ()));
2093 } 2136 }
2094 2137
2095 break; 2138 break;
2096 } 2139 }
… …
2107 2150
2108 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2152 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2154
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2156 {
2114 scrollBar.state = STATE_IDLE; 2157 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2158 scrollBar.show (0);
2116 } 2159 }
2117 2160
2118#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
… …
2139#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2140 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2141 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2142 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2143 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2144 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2145 { 2188 {
2146 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2147 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2148 mouse_report (ev); 2191 mouse_report (ev);
2149 } 2192 }
… …
2169 case Button3: 2212 case Button3:
2170 selection_make (ev.time); 2213 selection_make (ev.time);
2171 break; 2214 break;
2172 2215
2173 case Button2: 2216 case Button2:
2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2219 break;
2177 2220
2178#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2179 case Button4: 2222 case Button4:
2180 case Button5: 2223 case Button5:
2181 { 2224 {
2182 int i; 2225 int lines;
2183 page_dirn v; 2226 page_dirn dirn;
2184 2227
2185 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2186 2229
2187 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2188 i = 1; 2231 lines = 1;
2189 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2190 i = nrow - 1; 2233 lines = nrow - 1;
2191 else 2234 else
2192 i = 5; 2235 lines = 5;
2193 2236
2194# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2195 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2196 { 2239 {
2197 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200 2242
2201 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203 } 2245 }
2204 else 2246 else
2205# endif 2247# endif
2206 { 2248 {
2207 scr_page (v, i); 2249 scr_page (dirn, lines);
2208 scrollBar.show (1); 2250 scrollBar.show (1);
2209 } 2251 }
2210 } 2252 }
2211 break; 2253 break;
2212#endif 2254#endif
… …
2214 } 2256 }
2215} 2257}
2216 2258
2217/*}}} */ 2259/*}}} */
2218 2260
2219void 2261void ecb_hot
2220rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2221{ 2263{
2222 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2224 2266
2225 for (;;) 2267 for (;;)
2226 { 2268 {
2227 if (expect_false (ch == NOCHAR)) 2269 if (ecb_unlikely (ch == NOCHAR))
2228 { 2270 {
2229 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2272 ch = next_char ();
2231 2273
2232 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2233 break; 2275 break;
2234 } 2276 }
2235 2277
2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2279 {
2238 if (expect_false (!seen_input)) 2280 if (ecb_unlikely (!seen_input))
2239 { 2281 {
2240 seen_input = 1; 2282 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2298 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2300
2259 for (;;) 2301 for (;;)
2260 { 2302 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2304 break;
2263 2305
2264 *str++ = ch; 2306 *str++ = ch;
2265 2307
2266 if (expect_false (ch == C0_LF || str >= eol)) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2309 {
2268 if (ch == C0_LF) 2310 if (ch == C0_LF)
2269 nlines++; 2311 nlines++;
2270 2312
2271 refresh_count++; 2313 refresh_count++;
… …
2343 } 2385 }
2344 } 2386 }
2345} 2387}
2346 2388
2347// read the next character 2389// read the next character
2348wchar_t 2390wchar_t ecb_hot
2349rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2350{ 2392{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2394 {
2353 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2356 2398
2357 wchar_t wc; 2399 wchar_t wc;
2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359 2401
… …
2365 } 2407 }
2366 2408
2367 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2368 { 2410 {
2369 mbstate.reset (); // reset now undefined conversion state 2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 } 2415 }
2372 2416
2373 // assume wchar == unicode 2417 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
… …
2377 2421
2378 return NOCHAR; 2422 return NOCHAR;
2379} 2423}
2380 2424
2381// read the next octet 2425// read the next octet
2382uint32_t 2426uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2384{ 2428{
2385 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2431 : NOCHAR;
2388} 2432}
2389 2433
2390static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2391 2435
2392wchar_t 2436wchar_t ecb_hot
2393rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2394{ 2438{
2395 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2396 2440
2397 if (c == NOCHAR) 2441 if (c == NOCHAR)
2398 throw out_of_input; 2442 throw out_of_input;
2399 2443
2400 return c; 2444 return c;
2401} 2445}
2402 2446
2403uint32_t 2447uint32_t ecb_hot
2404rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405{ 2449{
2406 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2407 2451
2408 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2412} 2456}
2413 2457
2414/*{{{ print pipe */ 2458/*{{{ print pipe */
2415/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2416#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2417FILE * 2461FILE * ecb_cold
2418rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2419{ 2463{
2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421 2465
2422 if (stream == NULL) 2466 if (stream == NULL)
2423 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2424 2468
2425 return stream; 2469 return stream;
2426} 2470}
2427 2471
2428int 2472int ecb_cold
2429rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2430{ 2474{
2431 fflush (stream); 2475 fflush (stream);
2432 return pclose (stream); 2476 return pclose (stream);
2433} 2477}
2434 2478
2435/* 2479/*
2436 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2437 */ 2481 */
2438void 2482void ecb_cold
2439rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2440{ 2484{
2441 FILE *fd = popen_printer (); 2485 FILE *fd = popen_printer ();
2442 2486
2443 if (!fd) 2487 if (!fd)
… …
2489 pclose_printer (fd); 2533 pclose_printer (fd);
2490} 2534}
2491#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2492/*}}} */ 2536/*}}} */
2493 2537
2494/* *INDENT-OFF* */
2495enum { 2538enum {
2496 C1_40 = 0x40, 2539 C1_40 = 0x40,
2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501}; 2544};
2502/* *INDENT-ON* */
2503 2545
2504/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2505void 2547void ecb_hot
2506rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2507{ 2549{
2508 switch (ch) 2550 switch (ch)
2509 { 2551 {
2510 case C0_ESC: 2552 case C0_ESC:
… …
2540 scr_charset_choose (0); 2582 scr_charset_choose (0);
2541 break; 2583 break;
2542 2584
2543#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2544 // 8-bit controls 2586 // 8-bit controls
2545 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2546 process_dcs_seq (); 2588 process_dcs_seq ();
2547 break; 2589 break;
2548 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2549 process_csi_seq (); 2591 process_csi_seq ();
2550 break; 2592 break;
2551 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2552 process_osc_seq (); 2594 process_osc_seq ();
2553 break; 2595 break;
2554#endif 2596#endif
2555 } 2597 }
2556} 2598}
2557/*}}} */ 2599/*}}} */
2558 2600
2559 2601
2560/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2561void 2603void ecb_cold
2562rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2563{ 2605{
2564 int row, col; 2606 int row, col;
2565 2607
2566 switch (ch) 2608 switch (ch)
… …
2600 break; 2642 break;
2601 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2603 break; 2645 break;
2604 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2605 set_privmode (PrivMode_vt52, 0); 2647 priv_modes &= ~PrivMode_vt52;
2606 break; 2648 break;
2607 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2608 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2609 /* unimplemented */ 2651 /* unimplemented */
2610 break; 2652 break;
… …
2616} 2658}
2617/*}}} */ 2659/*}}} */
2618 2660
2619 2661
2620/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2621void 2663void ecb_hot
2622rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2623{ 2665{
2624 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2625 2667
2626 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2629 return; 2671 return;
2630 } 2672 }
2631 2673
2632 switch (ch) 2674 switch (ch)
2633 { 2675 {
2634 /* case 1: do_tek_mode (); break; */
2635 case '#': 2676 case '#':
2636 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2637 scr_E (); 2678 scr_E ();
2638 break; 2679 break;
2639 case '(': 2680 case '(':
… …
2662#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2663 case '9': 2704 case '9':
2664 scr_forwardindex (); 2705 scr_forwardindex ();
2665 break; 2706 break;
2666#endif 2707#endif
2708 // DECPAM/DECPNM
2667 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2668 case '>': 2712 case '>':
2669 set_privmode (PrivMode_aplKP, ch == '='); 2713 priv_modes &= ~PrivMode_aplKP;
2670 break; 2714 break;
2671 2715
2672 case C1_40: 2716 case C1_40:
2673 cmd_getc (); 2717 cmd_getc ();
2674 break; 2718 break;
… …
2678 2722
2679 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2680 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2681 { 2725 {
2682 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2684 } 2728 }
2685 break; 2729 break;
2686 2730
2687 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2688 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
… …
2700 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2701 scr_index (DN); 2745 scr_index (DN);
2702 break; 2746 break;
2703 2747
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2706 2750
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2709 2753
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2756 process_dcs_seq ();
2713 break; 2757 break;
… …
2746 } 2790 }
2747} 2791}
2748/*}}} */ 2792/*}}} */
2749 2793
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2795enum {
2753 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2823 };
2781/* *INDENT-ON* */
2782 2824
2783void 2825void ecb_hot
2784rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2785{ 2827{
2786 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2787 unsigned int nargs, p; 2829 unsigned int nargs, p;
2788 int n, ndef; 2830 int n, ndef;
2789 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2790 2832
2791 nargs = 0; 2833 nargs = 0;
… …
2797 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2798 priv = ch; 2840 priv = ch;
2799 ch = cmd_getc (); 2841 ch = cmd_getc ();
2800 } 2842 }
2801 2843
2844 prev_ch = 0;
2802 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2803 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2804 { 2847 {
2805 if (isdigit (ch)) 2848 if (isdigit (ch))
2806 { 2849 {
… …
2816 n = -1; 2859 n = -1;
2817 } 2860 }
2818 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2819 process_nonprinting (ch); 2862 process_nonprinting (ch);
2820 2863
2864 prev_ch = ch;
2821 ch = cmd_getc (); 2865 ch = cmd_getc ();
2822 } 2866 }
2823 2867
2824 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2825 return; 2869 return;
… …
2866 scr_soft_reset (); 2910 scr_soft_reset ();
2867 2911
2868 static const int pm_h[] = { 7, 25 }; 2912 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2914
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2917 }
2874 break; 2918 break;
2875 } 2919 }
2876 2920
2877 return; 2921 return;
… …
2895 } 2939 }
2896 break; 2940 break;
2897#endif 2941#endif
2898 2942
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2950 break;
2907 2951
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3059 scr_insert_mode (1); 3103 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3062 break; 3106 break;
3063 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3064 /* 3113 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3115 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3117 if (nargs == 1)
… …
3096 } 3145 }
3097} 3146}
3098/*}}} */ 3147/*}}} */
3099 3148
3100#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3150void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3152{
3105 int x, y; 3153 int x, y;
3106 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3143 break; 3191 break;
3144 3192
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3194 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3150 break; 3198 break;
3151 3199
3152 /* 3200 /*
3153 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
… …
3202rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3203{ 3251{
3204 unicode_t ch; 3252 unicode_t ch;
3205 bool seen_esc = false; 3253 bool seen_esc = false;
3206 unsigned int n = 0; 3254 unsigned int n = 0;
3207 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3208 3256
3209 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3210 { 3258 {
3211 if (seen_esc) 3259 if (seen_esc)
3212 { 3260 {
… …
3227 else if (ch < 0x20) 3275 else if (ch < 0x20)
3228 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3229 3277
3230 seen_esc = false; 3278 seen_esc = false;
3231 3279
3232 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3233 // stop at some sane length 3281 // stop at some sane length
3234 return NULL; 3282 return NULL;
3235 3283
3236 string[n++] = ch; 3284 string[n++] = ch;
3237 } 3285 }
… …
3286 free (s); 3334 free (s);
3287 } 3335 }
3288 } 3336 }
3289} 3337}
3290 3338
3339/*
3340 * Find the nearest color slot in the hidden color cube,
3341 * adapt its value to the 24bit RGB color.
3342 */
3343unsigned int
3344rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3345{
3346 unsigned int idx_r = (r & 0xff) / (0xff / (Red_levels - 1));
3347 unsigned int idx_g = (g & 0xff) / (0xff / (Green_levels - 1));
3348 unsigned int idx_b = (b & 0xff) / (0xff / (Blue_levels - 1));
3349 unsigned int idx;
3350
3351 idx = minTermCOLOR24 + idx_r * Blue_levels * Green_levels +
3352 idx_g * Blue_levels +
3353 idx_b;
3354
3355 pix_colors_focused [idx].free (this);
3356 pix_colors_focused [idx].set (this, rgba (r * 0x0101,
3357 g * 0x0101,
3358 b * 0x0101));
3359 update_fade_color (idx, false);
3360
3361 return idx;
3362}
3363
3291void 3364void
3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3365rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3293{ 3366{
3294 if (str[0] == '?' && !str[1]) 3367 if (str[0] == '?' && !str[1])
3295 { 3368 {
3296 rgba c; 3369 rgba c;
3297 pix_colors_focused[color].get (c); 3370 pix_colors_focused[color].get (c);
3298 3371
3299#if XFT 3372#if XFT
3300 if (c.a != rgba::MAX_CC) 3373 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3374 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3302 else 3375 else
3303#endif 3376#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3377 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 } 3378 }
3306 else 3379 else
… …
3354 &nitems, &bytes_after, &value) == Success 3427 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3428 && actual_type != None
3356 && actual_format == 8) 3429 && actual_format == 8)
3357 str = (const char *)(value); 3430 str = (const char *)(value);
3358 3431
3359 tt_printf ("\033]%d;%s%c", op, str, resp); 3432 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3360 3433
3361 XFree (value); 3434 XFree (value);
3362 } 3435 }
3363 else 3436 else
3364 { 3437 {
… …
3432 break; 3505 break;
3433#endif 3506#endif
3434 case URxvt_Color_border: 3507 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp); 3508 process_color_seq (op, Color_border, str, resp);
3436 break; 3509 break;
3437#if ENABLE_TRANSPARENCY 3510
3511#if BG_IMAGE_FROM_ROOT
3438 case URxvt_Color_tint: 3512 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3513 process_color_seq (op, Color_tint, str, resp);
3440 { 3514 {
3441 bool changed = false; 3515 bool changed = false;
3442 3516
3443 if (ISSET_PIXCOLOR (Color_tint)) 3517 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3518 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 3519
3446 if (changed) 3520 if (changed)
3447 update_background (); 3521 update_background ();
3448 } 3522 }
3449 3523
… …
3453#if BG_IMAGE_FROM_FILE 3527#if BG_IMAGE_FROM_FILE
3454 case Rxvt_Pixmap: 3528 case Rxvt_Pixmap:
3455 if (!strcmp (str, "?")) 3529 if (!strcmp (str, "?"))
3456 { 3530 {
3457 char str[256]; 3531 char str[256];
3532 int h_scale = fimage.h_scale;
3533 int v_scale = fimage.v_scale;
3534 int h_align = fimage.h_align;
3535 int v_align = fimage.v_align;
3458 3536
3459 sprintf (str, "[%dx%d+%d+%d]", 3537 sprintf (str, "[%dx%d+%d+%d]",
3460 min (h_scale, 32767), min (v_scale, 32767), 3538 h_scale, v_scale,
3461 min (h_align, 32767), min (v_align, 32767)); 3539 h_align, v_align);
3462 process_xterm_seq (XTerm_title, str, CHAR_ST); 3540 process_xterm_seq (XTerm_title, str, CHAR_ST);
3463 } 3541 }
3464 else 3542 else
3465 { 3543 {
3466 int changed = 0; 3544 bool changed = false;
3467 3545
3468 if (*str != ';') 3546 if (*str != ';')
3469 { 3547 {
3470 if (bg_set_file (str)) /* change pixmap */ 3548 try
3471 { 3549 {
3550 fimage.set_file_geometry (this, str);
3472 changed++; 3551 changed = true;
3473 str = strchr (str, ';');
3474 if (str == NULL)
3475 bg_set_default_geometry ();
3476 else 3552 }
3477 bg_set_geometry (str+1); 3553 catch (const class rxvt_failure_exception &e)
3554 {
3478 } 3555 }
3479 } 3556 }
3480 else 3557 else
3481 { 3558 {
3482 str++; 3559 str++;
3483 if (bg_set_geometry (str, true)) 3560 if (fimage.set_geometry (str, true))
3484 changed++; 3561 changed = true;
3485 } 3562 }
3486 3563
3487 if (changed) 3564 if (changed)
3488 { 3565 {
3489 if (bg_window_position_sensitive ()) 3566 if (bg_window_position_sensitive ())
3490 { 3567 {
3491 int x, y; 3568 int x, y;
3492 get_window_origin (x, y); 3569 get_window_origin (x, y);
3493 bg_set_position (x, y); 3570 parent_x = x;
3571 parent_y = y;
3494 } 3572 }
3495 update_background (); 3573 update_background ();
3496 } 3574 }
3497 } 3575 }
3498 break; 3576 break;
… …
3588 * 's' = save 3666 * 's' = save
3589 * 'r' = restore 3667 * 'r' = restore
3590 * 't' = toggle 3668 * 't' = toggle
3591 * so no need for fancy checking 3669 * so no need for fancy checking
3592 */ 3670 */
3593int 3671int ecb_cold
3594rxvt_term::privcases (int mode, unsigned long bit) 3672rxvt_term::privcases (int mode, unsigned long bit)
3595{ 3673{
3596 int state; 3674 int state;
3597 3675
3598 if (mode == 's') 3676 if (mode == 's')
3599 { 3677 {
3600 SavedModes |= (priv_modes & bit); 3678 if (priv_modes & bit)
3679 SavedModes |= bit;
3680 else
3681 SavedModes &= ~bit;
3601 return -1; 3682 return -1;
3602 } 3683 }
3603 else 3684 else
3604 { 3685 {
3605 if (mode == 'r') 3686 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3687 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3688 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3689 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 3690
3610 set_privmode (bit, state); 3691 if (state)
3692 priv_modes |= bit;
3693 else
3694 priv_modes &= ~bit;
3611 } 3695 }
3612 3696
3613 return state; 3697 return state;
3614} 3698}
3615 3699
3616/* we're not using priv _yet_ */ 3700/* we're not using priv _yet_ */
3617void 3701void
3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3702rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3619{ 3703{
3620 unsigned int i, j; 3704 unsigned int i, j;
3621 int state; 3705 int state;
3622 3706
3623 static const struct 3707 static const struct
3624 { 3708 {
3625 const int argval; 3709 const int argval;
3626 const unsigned long bit; 3710 const unsigned long bit;
3627 } argtopriv[] = { 3711 } argtopriv[] = {
3628 { 1, PrivMode_aplCUR }, // DECCKM 3712 { 1, PrivMode_aplCUR }, // DECCKM
3629 { 2, PrivMode_vt52 }, 3713 { 2, PrivMode_vt52 }, // DECANM
3630 { 3, PrivMode_132 }, // DECCOLM 3714 { 3, PrivMode_132 }, // DECCOLM
3631 { 4, PrivMode_smoothScroll }, // DECSCLM 3715 { 4, PrivMode_smoothScroll }, // DECSCLM
3632 { 5, PrivMode_rVideo }, // DECSCNM 3716 { 5, PrivMode_rVideo }, // DECSCNM
3633 { 6, PrivMode_relOrigin }, // DECOM 3717 { 6, PrivMode_relOrigin }, // DECOM
3634 { 7, PrivMode_Autowrap }, // DECAWM 3718 { 7, PrivMode_Autowrap }, // DECAWM
3635 // 8, auto-repeat keys // DECARM 3719 // 8, auto-repeat keys // DECARM
3636 { 9, PrivMode_MouseX10 }, 3720 { 9, PrivMode_MouseX10 },
3721 { 12, PrivMode_BlinkingCursor },
3637 // 18 end FF to printer after print screen 3722 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region 3723 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3724 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3726 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3727#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3728 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK 3729 // 38, tektronix mode // DECTEK
3645 { 40, PrivMode_132OK }, 3730 { 40, PrivMode_132OK },
3646 // 41 xterm more fixes NYI 3731 // 41 xterm more fixes NYI
3647 // 45 margin bell NYI 3732 // 45 margin bell NYI
3648 // 46 start logging 3733 // 46 start logging
3649 { 47, PrivMode_Screen }, 3734 { 47, PrivMode_Screen },
3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3735 { 66, PrivMode_aplKP }, // DECNKM
3651#ifndef NO_BACKSPACE_KEY 3736#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, // DECBKM 3737 { 67, PrivMode_BackSpace }, // DECBKM
3653#endif 3738#endif
3654 { 1000, PrivMode_MouseX11 }, 3739 { 1000, PrivMode_MouseX11 },
3655 { 1002, PrivMode_MouseBtnEvent }, 3740 { 1002, PrivMode_MouseBtnEvent },
3656 { 1003, PrivMode_MouseAnyEvent }, 3741 { 1003, PrivMode_MouseAnyEvent },
3657#if ENABLE_FRILLS 3742#if ENABLE_FRILLS
3743 { 1004, PrivMode_FocusEvent },
3658 { 1005, PrivMode_ExtModeMouse }, 3744 { 1005, PrivMode_ExtModeMouse },
3659#endif 3745#endif
3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3746 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3661 { 1011, PrivMode_Keypress }, // rxvt extension 3747 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS 3748#if ENABLE_FRILLS
… …
3684 for (i = 0; i < nargs; i++) 3770 for (i = 0; i < nargs; i++)
3685 { 3771 {
3686 state = -1; 3772 state = -1;
3687 3773
3688 /* basic handling */ 3774 /* basic handling */
3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3775 for (j = 0; j < ecb_array_length (argtopriv); j++)
3690 if (argtopriv[j].argval == arg[i]) 3776 if (argtopriv[j].argval == arg[i])
3691 { 3777 {
3692 state = privcases (mode, argtopriv[j].bit); 3778 state = privcases (mode, argtopriv[j].bit);
3693 break; 3779 break;
3694 } 3780 }
… …
3720 case 2: /* VT52 mode */ 3806 case 2: /* VT52 mode */
3721 /* oddball mode. should be set regardless of set/reset 3807 /* oddball mode. should be set regardless of set/reset
3722 * parameter. Return from VT52 mode with an ESC < from 3808 * parameter. Return from VT52 mode with an ESC < from
3723 * within VT52 mode 3809 * within VT52 mode
3724 */ 3810 */
3725 set_privmode (PrivMode_vt52, 1); 3811 priv_modes |= PrivMode_vt52;
3726 break; 3812 break;
3727 case 3: /* 80/132 */ 3813 case 3: /* 80/132 */
3728 if (priv_modes & PrivMode_132OK) 3814 if (priv_modes & PrivMode_132OK)
3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3815 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3730 break; 3816 break;
… …
3745 if (state) /* orthogonal */ 3831 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3832 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3833 break;
3748#ifdef scrollBar_esc 3834#ifdef scrollBar_esc
3749 case scrollBar_esc: 3835 case scrollBar_esc:
3750 if (scrollBar.map (state)) 3836 scrollBar.map (state);
3751 {
3752 resize_all_windows (0, 0, 0); 3837 resize_all_windows (0, 0, 0);
3753 scr_touch (true); 3838 scr_touch (true);
3754 } 3839 break;
3840#endif
3841#ifdef CURSOR_BLINK
3842 case 12:
3843 cursor_blink_reset ();
3755 break; 3844 break;
3756#endif 3845#endif
3757 case 25: /* visible/invisible cursor */ 3846 case 25: /* visible/invisible cursor */
3758 scr_cursor_visible (state); 3847 scr_cursor_visible (state);
3759 break; 3848 break;
… …
3814 } 3903 }
3815} 3904}
3816/*}}} */ 3905/*}}} */
3817 3906
3818/*{{{ process sgr sequences */ 3907/*{{{ process sgr sequences */
3819void 3908void ecb_hot
3820rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3909rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3821{ 3910{
3822 unsigned int i; 3911 unsigned int i;
3823 short rendset; 3912 short rendset;
3824 int rendstyle; 3913 int rendstyle;
… …
3866 //case 19: // ninth alt font 3955 //case 19: // ninth alt font
3867 //case 20: // gothic 3956 //case 20: // gothic
3868 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3957 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3869 rendset = 0, rendstyle = RS_Bold; 3958 rendset = 0, rendstyle = RS_Bold;
3870 break; 3959 break;
3871 case 22: // normal intensity 3960 case 22: // bold off (vt220)
3872 rendset = 0, rendstyle = RS_Bold; 3961 rendset = 0, rendstyle = RS_Bold;
3873 break; 3962 break;
3874 case 23: // disable italic 3963 case 23: // disable italic
3875 rendset = 0, rendstyle = RS_Italic; 3964 rendset = 0, rendstyle = RS_Italic;
3876 break; 3965 break;
3877 case 24: 3966 case 24: // underline off (vt220)
3878 rendset = 0, rendstyle = RS_Uline; 3967 rendset = 0, rendstyle = RS_Uline;
3879 break; 3968 break;
3880 case 25: 3969 case 25: // blink off (vt220)
3881 rendset = 0, rendstyle = RS_Blink; 3970 rendset = 0, rendstyle = RS_Blink;
3882 break; 3971 break;
3883 case 26: // variable spacing (iso 8613) 3972 case 26: // variable spacing (iso 8613)
3884 rendset = 0, rendstyle = RS_Blink; 3973 rendset = 0, rendstyle = RS_Blink;
3885 break; 3974 break;
3886 case 27: 3975 case 27: // reverse off (vt220)
3887 rendset = 0, rendstyle = RS_RVid; 3976 rendset = 0, rendstyle = RS_RVid;
3888 break; 3977 break;
3889 //case 28: // visible. NYI 3978 //case 28: // visible. NYI
3890 //case 29: // not crossed-out 3979 //case 29: // not crossed-out
3891 } 3980 }
… …
3912 if (nargs > i + 2 && arg[i + 1] == 5) 4001 if (nargs > i + 2 && arg[i + 1] == 5)
3913 { 4002 {
3914 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4003 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3915 i += 2; 4004 i += 2;
3916 } 4005 }
4006 else if (nargs > i + 4 && arg[i + 1] == 2)
4007 {
4008 unsigned int r = arg[i + 2];
4009 unsigned int g = arg[i + 3];
4010 unsigned int b = arg[i + 4];
4011 unsigned int idx = map_rgb24_color (r, g, b);
4012 scr_color (idx, Color_fg);
4013 i += 4;
4014 }
3917 break; 4015 break;
3918 case 39: /* default fg */ 4016 case 39: /* default fg */
3919 scr_color (Color_fg, Color_fg); 4017 scr_color (Color_fg, Color_fg);
3920 break; 4018 break;
3921 4019
… …
3932 case 48: // set bg color, ISO 8613-6 4030 case 48: // set bg color, ISO 8613-6
3933 if (nargs > i + 2 && arg[i + 1] == 5) 4031 if (nargs > i + 2 && arg[i + 1] == 5)
3934 { 4032 {
3935 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4033 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3936 i += 2; 4034 i += 2;
4035 }
4036 else if (nargs > i + 4 && arg[i + 1] == 2)
4037 {
4038 unsigned int r = arg[i + 2];
4039 unsigned int g = arg[i + 3];
4040 unsigned int b = arg[i + 4];
4041 unsigned int idx = map_rgb24_color (r, g, b);
4042 scr_color (idx, Color_bg);
4043 i += 4;
3937 } 4044 }
3938 break; 4045 break;
3939 case 49: /* default bg */ 4046 case 49: /* default bg */
3940 scr_color (Color_bg, Color_bg); 4047 scr_color (Color_bg, Color_bg);
3941 break; 4048 break;
… …
3965 break; 4072 break;
3966#endif 4073#endif
3967 } 4074 }
3968 } 4075 }
3969} 4076}
4077
4078void
4079rxvt_term::set_cursor_style (int style)
4080{
4081 if (!IN_RANGE_INC (style, 0, 6))
4082 return;
4083
4084 if (style == 0)
4085 style = 1;
4086
4087 cursor_type = (style - 1) / 2;
4088 set_option (Opt_cursorUnderline, cursor_type == 1);
4089
4090#ifdef CURSOR_BLINK
4091 set_option (Opt_cursorBlink, style & 1);
4092 cursor_blink_reset ();
4093#endif
4094
4095 want_refresh = 1;
4096}
3970/*}}} */ 4097/*}}} */
3971 4098
3972/* ------------------------------------------------------------------------- */ 4099/* ---------------------------------------------------------------------- */
4100/* Write data to the pty as typed by the user, pasted with the mouse,
4101 * or generated by us in response to a query ESC sequence.
4102 */
3973 4103
3974/* 4104/*
3975 * Send printf () formatted output to the command. 4105 * Send printf () formatted output to the command.
3976 * Only use for small amounts of data. 4106 * Only use for small amounts of data.
3977 */ 4107 */
… …
3985 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4115 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3986 va_end (arg_ptr); 4116 va_end (arg_ptr);
3987 tt_write (buf, strlen (buf)); 4117 tt_write (buf, strlen (buf));
3988} 4118}
3989 4119
3990/* ---------------------------------------------------------------------- */
3991/* Write data to the pty as typed by the user, pasted with the mouse, 4120/* Write data to the pty as typed by the user. */
3992 * or generated by us in response to a query ESC sequence. 4121void
3993 */ 4122rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4123{
4124 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4125 return;
4126
4127 if (option (Opt_scrollTtyKeypress))
4128 if (view_start)
4129 {
4130 view_start = 0;
4131 want_refresh = 1;
4132 }
4133
4134 tt_write_ (data, len);
4135}
3995 4136
3996void 4137void
3997rxvt_term::tt_write (const char *data, unsigned int len) 4138rxvt_term::tt_write (const char *data, unsigned int len)
3998{ 4139{
3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4140 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4000 return; 4141 return;
4001 4142
4143 tt_write_ (data, len);
4144}
4145
4146static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4147
4148void
4149rxvt_term::tt_write_ (const char *data, unsigned int len)
4150{
4002 if (pty->pty < 0) 4151 if (pty->pty < 0)
4003 return; 4152 return;
4004 4153
4005 if (v_buflen == 0) 4154 if (v_buflen == 0)
4006 { 4155 {

Diff Legend

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