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.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 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 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 - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
325 }; 324 };
326 325
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 336# endif
338#endif 337#endif
339 return keysym; 338 return keysym;
340} 339}
341 340
342static inline int 341static inline int ecb_cold
343map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
344{ 343{
345 int param = 0; 344 int param = 0;
346 345
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 371 param = 3;
373 break; 372 break;
374 case XK_Select: 373 case XK_Select:
375 param = 4; 374 param = 4;
376 break; 375 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 376 case XK_Prior:
379 param = 5; 377 param = 5;
380 break; 378 break;
381 case XK_Next: 379 case XK_Next:
382 param = 6; 380 param = 6;
… …
385 param = 7; 383 param = 7;
386 break; 384 break;
387 case XK_End: 385 case XK_End:
388 param = 8; 386 param = 8;
389 break; 387 break;
390#endif
391 case XK_Help: 388 case XK_Help:
392 param = 28; 389 param = 28;
393 break; 390 break;
394 case XK_Menu: 391 case XK_Menu:
395 param = 29; 392 param = 29;
396 break; 393 break;
397 } 394 }
398 return param; 395 return param;
399} 396}
400 397
401void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
403{ 409{
404 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
405 KeySym keysym; 411 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
408 414
409#if ISO_14755 415#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
411 return; 417 return;
412#endif 418#endif
… …
421 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
423 429
424 kbuf[0] = 0; 430 kbuf[0] = 0;
425 431
426#ifdef USE_XIM 432#if USE_XIM
427 if (Input_Context) 433 if (Input_Context)
428 { 434 {
429 Status status_return; 435 Status status_return;
430 436
431#if 0 437#if 0
… …
469 } 475 }
470 } 476 }
471 else 477 else
472 len = 0; 478 len = 0;
473 } 479 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 480 }
478 else 481 else
479#endif 482#endif
480 { 483 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
483 } 488 {
489 KeySym orig_keysym = keysym;
484 490
485 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681
682 meta = 0;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
486 { 706 {
487#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 709 return;
490#endif 710#endif
491 711
492 if (saveLines) 712 if (saveLines)
493 { 713 {
… …
506#endif 726#endif
507 max_it (lnsppg, 1); 727 max_it (lnsppg, 1);
508 728
509 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
510 { 730 {
511 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
512 return; 732 return;
513 } 733 }
514 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
515 { 735 {
516 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
517 return; 737 return;
518 } 738 }
519 } 739 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
522 { 742 {
523 if (keysym == XK_Up) 743 if (keysym == XK_Up)
524 { 744 {
525 scr_page (UP, 1); 745 scr_page (1);
526 return; 746 return;
527 } 747 }
528 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
529 { 749 {
530 scr_page (DN, 1); 750 scr_page (-1);
531 return; 751 return;
532 } 752 }
533 } 753 }
534#endif 754#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
537 { 757 {
538 if (keysym == XK_Home) 758 if (keysym == XK_Home)
539 { 759 {
540 scr_move_to (0, 1); 760 scr_changeview (top_row);
541 return; 761 return;
542 } 762 }
543 else if (keysym == XK_End) 763 else if (keysym == XK_End)
544 { 764 {
545 scr_move_to (1, 1); 765 scr_changeview (0);
546 return; 766 return;
547 } 767 }
548 } 768 }
549#endif 769#endif
550 } 770 }
551 771
552 if (shft) 772 if (shft)
553 { 773 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 775 {
562 switch (keysym) 776 switch (keysym)
563 { 777 {
564 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 787 return;
574#endif 788#endif
575 } 789 }
576 } 790 }
791 }
792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
577 } 806 }
578 807
579#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 809 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 865 {
637 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
638 return; 867 return;
639 } 868 }
640#endif 869#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 /*
782 * Pass meta for all function keys, if 'meta' option set
783 */
784#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0)
786 kbuf[len - 1] |= 0x80;
787#endif
788
789 }
790 else if (ctrl && keysym == XK_minus)
791 {
792 len = 1;
793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
800 else
801 {
802#ifdef META8_OPTION
803 /* set 8-bit on */
804 if (meta && (meta_char == 0x80))
805 {
806 char *ch;
807
808 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80;
810
811 meta = 0;
812 }
813#endif
814 /* nil */ ;
815 }
816 } 870 }
817
818 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819 return;
820 871
821 if (len <= 0) 872 if (len <= 0)
822 return; /* not mapped */ 873 return; /* not mapped */
823 874
824 if (option (Opt_scrollTtyKeypress))
825 if (view_start)
826 {
827 view_start = 0;
828 want_refresh = 1;
829 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */
846 if (meta
847#ifdef META8_OPTION
848 && meta_char == C0_ESC
849#endif
850 )
851 {
852 const char ch = C0_ESC;
853 tt_write (&ch, 1);
854 }
855
856 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
857} 876}
858 877
859void 878void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
861{ 880{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 882 KeySym keysym;
864 883
… …
936void 955void
937rxvt_term::flush () 956rxvt_term::flush ()
938{ 957{
939 flush_ev.stop (); 958 flush_ev.stop ();
940 959
941#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 961 if (bg_flags & BG_NEEDS_REFRESH)
943 { 962 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 963 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 964 scr_touch (false);
946 } 965 }
… …
986 while (row < end_row); 1005 while (row < end_row);
987 } 1006 }
988 1007
989 scr_refresh (); 1008 scr_refresh ();
990 scrollBar.show (1); 1009 scrollBar.show (1);
991#ifdef USE_XIM 1010#if USE_XIM
992 im_send_spot (); 1011 im_send_spot ();
993#endif 1012#endif
994 } 1013 }
995 1014
996 display->flush (); 1015 display->flush ();
… …
1015 flush (); 1034 flush ();
1016} 1035}
1017 1036
1018#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1019void 1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (hidden_cursor)
1042 {
1043 hidden_cursor = 0;
1044 want_refresh = 1;
1045 }
1046
1047 if (option (Opt_cursorBlink))
1048 cursor_blink_ev.again ();
1049 else
1050 cursor_blink_ev.stop ();
1051}
1052
1053void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1054rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1055{
1022 hidden_cursor = !hidden_cursor; 1056 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1057 want_refresh = 1;
1024 refresh_check (); 1058 refresh_check ();
… …
1042 1076
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1077#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1078void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1079rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1080{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1081 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1082 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1083 {
1050 want_refresh = 1; 1084 want_refresh = 1;
1051 refresh_check (); 1085 refresh_check ();
1052 } 1086 }
1053 else 1087 else
… …
1057 1091
1058#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1059void 1093void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1094rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1095{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1096 if (scr_page (scroll_selection_lines))
1063 { 1097 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1098 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1099 want_refresh = 1;
1066 refresh_check (); 1100 refresh_check ();
1067 } 1101 }
… …
1072 1106
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1107#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1108void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1109rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1110{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1111 if (scr_page (mouse_slip_wheel_speed))
1078 { 1112 {
1079 want_refresh = 1; 1113 want_refresh = 1;
1080 refresh_check (); 1114 refresh_check ();
1081 } 1115 }
1082 1116
… …
1203 pty_write (); 1237 pty_write ();
1204 1238
1205 refresh_check (); 1239 refresh_check ();
1206} 1240}
1207 1241
1208void 1242void ecb_cold
1209rxvt_term::pointer_unblank () 1243rxvt_term::pointer_unblank ()
1210{ 1244{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1245 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1246 recolour_cursor ();
1213 1247
… …
1218 pointer_ev.start (pointerBlankDelay); 1252 pointer_ev.start (pointerBlankDelay);
1219#endif 1253#endif
1220} 1254}
1221 1255
1222#ifdef POINTER_BLANK 1256#ifdef POINTER_BLANK
1223void 1257void ecb_cold
1224rxvt_term::pointer_blank () 1258rxvt_term::pointer_blank ()
1225{ 1259{
1226 if (!option (Opt_pointerBlank)) 1260 if (!option (Opt_pointerBlank))
1227 return; 1261 return;
1228 1262
… …
1230 XFlush (dpy); 1264 XFlush (dpy);
1231 1265
1232 hidden_pointer = 1; 1266 hidden_pointer = 1;
1233} 1267}
1234 1268
1235void 1269void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1270rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1271{
1238 make_current (); 1272 make_current ();
1239 1273
1240 pointer_blank (); 1274 pointer_blank ();
… …
1332 32 + x, 1366 32 + x,
1333 32 + y); 1367 32 + y);
1334} 1368}
1335 1369
1336/*{{{ process an X event */ 1370/*{{{ process an X event */
1337void 1371void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1339{ 1373{
1340 make_current (); 1374 make_current ();
1341 1375
1342 dLocal (Display *, dpy); 1376 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1479 if (ev.xconfigure.window == parent)
1446 { 1480 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1482 ;
1449 1483
1484 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1485
1486 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1487#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1488 if (bg_window_position_sensitive ())
1453 { 1489 {
1490 want_position_change = true;
1491 if (bg_img == 0)
1492 moved = true;
1493 }
1494#endif
1495
1496 if (want_position_change)
1497 {
1454 int x, y; 1498 int x, y;
1499
1455 if (ev.xconfigure.send_event) 1500 if (ev.xconfigure.send_event)
1456 { 1501 {
1457 x = ev.xconfigure.x; 1502 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1503 y = ev.xconfigure.y;
1459 } 1504 }
1460 else 1505 else
1461 get_window_origin (x, y); 1506 get_window_origin (x, y);
1462 1507
1463 if (bg_set_position (x, y) 1508 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1509 {
1510 parent_x = x;
1511 parent_y = y;
1512 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1513 moved = true;
1514 }
1466 } 1515 }
1467#endif
1468 1516
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1517 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1518 {
1471 seen_resize = 1; 1519 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1520 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1495 selection_send (ev.xselectionrequest); 1543 selection_send (ev.xselectionrequest);
1496 break; 1544 break;
1497 1545
1498 case MapNotify: 1546 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1547#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1548 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1549 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1550 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1551 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1552 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1553 // window, so as to perform the computation after we have
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1554 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1555 if (bg_img == 0)
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1556 update_background_ev.start (0.025);
1514#endif 1557#endif
1515 mapped = 1; 1558 mapped = 1;
1516#ifdef TEXT_BLINK 1559#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1560 text_blink_ev.start ();
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1600 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1601 ;
1559 1602
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1603 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1604 {
1562 scrollBar.state = STATE_IDLE; 1605 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1606 scrollBar.show (0);
1564 } 1607 }
1565 } 1608 }
1566 break; 1609 break;
1567 1610
… …
1609 1652
1610#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1656 {
1657 page_dirn scroll_selection_dir;
1614 int dist; 1658 int dist;
1615 1659
1616 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
1618 */ 1662 */
… …
1633 dist = int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1634 } 1678 }
1635 else 1679 else
1636 { 1680 {
1637 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1682 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1683 }
1640 1684
1641 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1687 + 1;
1644 min_it (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1690 scroll_selection_lines *= scroll_selection_dir;
1646 } 1691 }
1647 else 1692 else
1648 { 1693 {
1649 /* we are within the text window, so we 1694 /* we are within the text window, so we
1650 * shouldn't be scrolling 1695 * shouldn't be scrolling
… …
1655#ifdef MOUSE_THRESHOLD 1700#ifdef MOUSE_THRESHOLD
1656 } 1701 }
1657#endif 1702#endif
1658 } 1703 }
1659 } 1704 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1706 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1664 ; 1709 ;
1665 1710
… …
1675 } 1720 }
1676 break; 1721 break;
1677 } 1722 }
1678 1723
1679#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1689 }
1690#endif 1727#endif
1691 1728
1692#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1731 {
… …
1705 1742
1706 refresh_check (); 1743 refresh_check ();
1707} 1744}
1708 1745
1709#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1710void 1747void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1712{ 1749{
1713 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1714 return; 1751 return;
1715 1752
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1754 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1756 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1721 } 1759 }
1722} 1760}
1723#endif 1761#endif
1724 1762
1725void 1763void ecb_cold
1726rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1727{ 1765{
1728 if (!focus) 1766 if (!focus)
1729 { 1767 {
1730 focus = 1; 1768 focus = 1;
… …
1755 1793
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1795 }
1758} 1796}
1759 1797
1760void 1798void ecb_cold
1761rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1762{ 1800{
1763 if (focus) 1801 if (focus)
1764 { 1802 {
1765 focus = 0; 1803 focus = 0;
… …
1798 1836
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1838 }
1801} 1839}
1802 1840
1803void 1841void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx)
1805{ 1843{
1806#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1808 { 1846 {
… …
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1849 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1850 }
1813#endif 1851#endif
1814} 1852}
1815 1853
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1854#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1855void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1856rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1857{
1820 make_current (); 1858 make_current ();
1821 1859
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1860 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1861 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1862 return;
1825 1863
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1864 switch (ev.type)
1828 { 1865 {
1829 case PropertyNotify: 1866 case PropertyNotify:
1830 /* 1867 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1868 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1869 * use the property to determine the pixmap. We use it later on.
1833 */ 1870 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1871 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1872 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1873 {
1837 bg_set_root_pixmap (); 1874#if BG_IMAGE_FROM_ROOT
1875 if (option (Opt_transparent))
1876 {
1877 rxvt_img::new_from_root (this)->replace (root_img);
1838 update_background (); 1878 update_background ();
1879 }
1880#endif
1881 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839 } 1882 }
1840 1883
1841 break; 1884 break;
1842 } 1885 }
1843# endif
1844 1886
1845 refresh_check (); 1887 refresh_check ();
1846} 1888}
1847#endif 1889#endif
1848 1890
… …
1972 if (scrollBar.upButton (ev.y)) 2014 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2015 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2016 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2017 direction = DN; /* down */
1976 2018
1977 scrollBar.state = STATE_IDLE; 2019 scrollBar.state = SB_STATE_IDLE;
1978 /* 2020 /*
1979 * Rxvt-style scrollbar: 2021 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2022 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2023 * move dn if mouse is below slider
1982 * 2024 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2063 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2064#endif
2023 if (scr_page (direction, 1)) 2065 if (scr_page (direction, 1))
2024 { 2066 {
2025 if (direction == UP) 2067 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2068 scrollBar.state = SB_STATE_UP;
2027 else 2069 else
2028 scrollBar.state = STATE_DOWN; 2070 scrollBar.state = SB_STATE_DOWN;
2029 } 2071 }
2030 } 2072 }
2031 else 2073 else
2032 switch (ev.button) 2074 switch (ev.button)
2033 { 2075 {
2034 case Button2: 2076 case Button2:
2035 switch (scrollBar.align) 2077 switch (scrollBar.align)
2036 { 2078 {
2037 case R_SB_ALIGN_TOP: 2079 case SB_ALIGN_TOP:
2038 csrO = 0; 2080 csrO = 0;
2039 break; 2081 break;
2040 case R_SB_ALIGN_CENTRE: 2082 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2083 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2084 break;
2043 case R_SB_ALIGN_BOTTOM: 2085 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2086 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2087 break;
2046 } 2088 }
2047 2089
2048 if (scrollBar.style == R_SB_XTERM 2090 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2091 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2092 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2093 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2094
2053 scrollBar.state = STATE_MOTION; 2095 scrollBar.state = SB_STATE_MOTION;
2054 break; 2096 break;
2055 2097
2056 case Button1: 2098 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2099 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2100 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2101 /* FALLTHROUGH */
2060 2102
2061 case Button3: 2103 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2104 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2105 {
2064 if (scrollBar.above_slider (ev.y)) 2106 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2107# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2108 scr_page (UP, nrow - 1);
2067# else 2109# else
… …
2072 scr_page (DN, nrow - 1); 2114 scr_page (DN, nrow - 1);
2073# else 2115# else
2074 scr_page (DN, nrow / 4); 2116 scr_page (DN, nrow / 4);
2075# endif 2117# endif
2076 else 2118 else
2077 scrollBar.state = STATE_MOTION; 2119 scrollBar.state = SB_STATE_MOTION;
2078 } 2120 }
2079 else 2121 else
2080 { 2122 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2123 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2124 (nrow
… …
2099 2141
2100 csrO = 0; /* reset csr Offset */ 2142 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2143 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2144 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2145
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2146 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2147 {
2106 scrollBar.state = STATE_IDLE; 2148 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2149 scrollBar.show (0);
2108 } 2150 }
2109 2151
2110#ifdef SELECTION_SCROLLING 2152#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2153 sel_scroll_ev.stop();
… …
2161 case Button3: 2203 case Button3:
2162 selection_make (ev.time); 2204 selection_make (ev.time);
2163 break; 2205 break;
2164 2206
2165 case Button2: 2207 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2208 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2209 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2210 break;
2169 2211
2170#ifdef MOUSE_WHEEL 2212#ifdef MOUSE_WHEEL
2171 case Button4: 2213 case Button4:
2172 case Button5: 2214 case Button5:
2173 { 2215 {
2174 int i; 2216 int lines;
2175 page_dirn v; 2217 page_dirn dirn;
2176 2218
2177 v = ev.button == Button4 ? UP : DN; 2219 dirn = ev.button == Button4 ? UP : DN;
2178 2220
2179 if (ev.state & ShiftMask) 2221 if (ev.state & ShiftMask)
2180 i = 1; 2222 lines = 1;
2181 else if (option (Opt_mouseWheelScrollPage)) 2223 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2224 lines = nrow - 1;
2183 else 2225 else
2184 i = 5; 2226 lines = 5;
2185 2227
2186# ifdef MOUSE_SLIP_WHEELING 2228# ifdef MOUSE_SLIP_WHEELING
2187 if (ev.state & ControlMask) 2229 if (ev.state & ControlMask)
2188 { 2230 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2231 mouse_slip_wheel_speed += dirn;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2232 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2233
2193 if (!slip_wheel_ev.is_active ()) 2234 if (!slip_wheel_ev.is_active ())
2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2235 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195 } 2236 }
2196 else 2237 else
2197# endif 2238# endif
2198 { 2239 {
2199 scr_page (v, i); 2240 scr_page (dirn, lines);
2200 scrollBar.show (1); 2241 scrollBar.show (1);
2201 } 2242 }
2202 } 2243 }
2203 break; 2244 break;
2204#endif 2245#endif
… …
2206 } 2247 }
2207} 2248}
2208 2249
2209/*}}} */ 2250/*}}} */
2210 2251
2211void 2252void ecb_hot
2212rxvt_term::cmd_parse () 2253rxvt_term::cmd_parse ()
2213{ 2254{
2214 wchar_t ch = NOCHAR; 2255 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2256 char *seq_begin; // remember start of esc-sequence here
2216 2257
… …
2335 } 2376 }
2336 } 2377 }
2337} 2378}
2338 2379
2339// read the next character 2380// read the next character
2340wchar_t 2381wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2382rxvt_term::next_char () NOTHROW
2342{ 2383{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2384 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2385 {
2345 // assume 7-bit to be ascii ALWAYS 2386 // assume 7-bit to be ascii ALWAYS
… …
2357 } 2398 }
2358 2399
2359 if (len == (size_t)-1) 2400 if (len == (size_t)-1)
2360 { 2401 {
2361 mbstate.reset (); // reset now undefined conversion state 2402 mbstate.reset (); // reset now undefined conversion state
2403 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2404 // in which case we "erroneously" return the next byte which might be valid.
2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2405 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2406 }
2364 2407
2365 // assume wchar == unicode 2408 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2409 cmdbuf_ptr += len;
… …
2369 2412
2370 return NOCHAR; 2413 return NOCHAR;
2371} 2414}
2372 2415
2373// read the next octet 2416// read the next octet
2374uint32_t 2417uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2418rxvt_term::next_octet () NOTHROW
2376{ 2419{
2377 return cmdbuf_ptr < cmdbuf_endp 2420 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2421 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2422 : NOCHAR;
2380} 2423}
2381 2424
2382static class out_of_input out_of_input; 2425static class out_of_input out_of_input;
2383 2426
2384wchar_t 2427wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2428rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2429{
2387 wchar_t c = next_char (); 2430 wchar_t c = next_char ();
2388 2431
2389 if (c == NOCHAR) 2432 if (c == NOCHAR)
2390 throw out_of_input; 2433 throw out_of_input;
2391 2434
2392 return c; 2435 return c;
2393} 2436}
2394 2437
2395uint32_t 2438uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2439rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2440{
2398 uint32_t c = next_octet (); 2441 uint32_t c = next_octet ();
2399 2442
2400 if (c == NOCHAR) 2443 if (c == NOCHAR)
… …
2404} 2447}
2405 2448
2406/*{{{ print pipe */ 2449/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2450/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2451#ifdef PRINTPIPE
2409FILE * 2452FILE * ecb_cold
2410rxvt_term::popen_printer () 2453rxvt_term::popen_printer ()
2411{ 2454{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2455 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2456
2414 if (stream == NULL) 2457 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2458 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2459
2417 return stream; 2460 return stream;
2418} 2461}
2419 2462
2420int 2463int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2464rxvt_term::pclose_printer (FILE *stream)
2422{ 2465{
2423 fflush (stream); 2466 fflush (stream);
2424 return pclose (stream); 2467 return pclose (stream);
2425} 2468}
2426 2469
2427/* 2470/*
2428 * simulate attached vt100 printer 2471 * simulate attached vt100 printer
2429 */ 2472 */
2430void 2473void ecb_cold
2431rxvt_term::process_print_pipe () 2474rxvt_term::process_print_pipe ()
2432{ 2475{
2433 FILE *fd = popen_printer (); 2476 FILE *fd = popen_printer ();
2434 2477
2435 if (!fd) 2478 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2533 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2535};
2493 2536
2494/*{{{ process non-printing single characters */ 2537/*{{{ process non-printing single characters */
2495void 2538void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2539rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2540{
2498 switch (ch) 2541 switch (ch)
2499 { 2542 {
2500 case C0_ESC: 2543 case C0_ESC:
… …
2546} 2589}
2547/*}}} */ 2590/*}}} */
2548 2591
2549 2592
2550/*{{{ process VT52 escape sequences */ 2593/*{{{ process VT52 escape sequences */
2551void 2594void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2595rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2596{
2554 int row, col; 2597 int row, col;
2555 2598
2556 switch (ch) 2599 switch (ch)
… …
2606} 2649}
2607/*}}} */ 2650/*}}} */
2608 2651
2609 2652
2610/*{{{ process escape sequences */ 2653/*{{{ process escape sequences */
2611void 2654void ecb_hot
2612rxvt_term::process_escape_seq () 2655rxvt_term::process_escape_seq ()
2613{ 2656{
2614 unicode_t ch = cmd_getc (); 2657 unicode_t ch = cmd_getc ();
2615 2658
2616 if (priv_modes & PrivMode_vt52) 2659 if (priv_modes & PrivMode_vt52)
… …
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2811 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2812 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2814 };
2772 2815
2773void 2816void ecb_hot
2774rxvt_term::process_csi_seq () 2817rxvt_term::process_csi_seq ()
2775{ 2818{
2776 unicode_t ch, priv, i; 2819 unicode_t ch, priv, prev_ch, i;
2777 unsigned int nargs, p; 2820 unsigned int nargs, p;
2778 int n, ndef; 2821 int n, ndef;
2779 int arg[ESC_ARGS] = { }; 2822 int arg[ESC_ARGS] = { };
2780 2823
2781 nargs = 0; 2824 nargs = 0;
… …
2787 /* '<' '=' '>' '?' '!' */ 2830 /* '<' '=' '>' '?' '!' */
2788 priv = ch; 2831 priv = ch;
2789 ch = cmd_getc (); 2832 ch = cmd_getc ();
2790 } 2833 }
2791 2834
2835 prev_ch = 0;
2792 /* read any numerical arguments */ 2836 /* read any numerical arguments */
2793 for (n = -1; ch < CSI_ICH; ) 2837 for (n = -1; ch < CSI_ICH; )
2794 { 2838 {
2795 if (isdigit (ch)) 2839 if (isdigit (ch))
2796 { 2840 {
… …
2806 n = -1; 2850 n = -1;
2807 } 2851 }
2808 else if (IS_CONTROL (ch)) 2852 else if (IS_CONTROL (ch))
2809 process_nonprinting (ch); 2853 process_nonprinting (ch);
2810 2854
2855 prev_ch = ch;
2811 ch = cmd_getc (); 2856 ch = cmd_getc ();
2812 } 2857 }
2813 2858
2814 if (ch > CSI_7F) 2859 if (ch > CSI_7F)
2815 return; 2860 return;
… …
2885 } 2930 }
2886 break; 2931 break;
2887#endif 2932#endif
2888 2933
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2934 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2935 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2936 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2937 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2938 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2939 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2940 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2941 break;
2897 2942
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2943 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2944 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3049 scr_insert_mode (1); 3094 scr_insert_mode (1);
3050 else if (arg[0] == 20) 3095 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL; 3096 priv_modes |= PrivMode_LFNL;
3052 break; 3097 break;
3053 3098
3099 case CSI_71: // DESCUSR: set cursor style
3100 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]);
3102 break;
3103
3054 /* 3104 /*
3055 * PRIVATE USE beyond this point. All CSI_7? sequences here 3105 * PRIVATE USE beyond this point. All CSI_7? sequences here
3056 */ 3106 */
3057 case CSI_72: /* DECSTBM: set top and bottom margins */ 3107 case CSI_72: /* DECSTBM: set top and bottom margins */
3058 if (nargs == 1) 3108 if (nargs == 1)
… …
3132 break; 3182 break;
3133 3183
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3184 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3185 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3186 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3187 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3188 (unsigned int) (args[1] * fheight));
3139 break; 3189 break;
3140 3190
3141 /* 3191 /*
3142 * reports - some output format copied from XTerm 3192 * reports - some output format copied from XTerm
… …
3191rxvt_term::get_to_st (unicode_t &ends_how) 3241rxvt_term::get_to_st (unicode_t &ends_how)
3192{ 3242{
3193 unicode_t ch; 3243 unicode_t ch;
3194 bool seen_esc = false; 3244 bool seen_esc = false;
3195 unsigned int n = 0; 3245 unsigned int n = 0;
3196 wchar_t string[STRING_MAX]; 3246 wchar_t string[CBUFSIZ];
3197 3247
3198 while ((ch = cmd_getc ()) != NOCHAR) 3248 while ((ch = cmd_getc ()) != NOCHAR)
3199 { 3249 {
3200 if (seen_esc) 3250 if (seen_esc)
3201 { 3251 {
… …
3216 else if (ch < 0x20) 3266 else if (ch < 0x20)
3217 return NULL; /* other control character - exit */ 3267 return NULL; /* other control character - exit */
3218 3268
3219 seen_esc = false; 3269 seen_esc = false;
3220 3270
3221 if (n >= STRING_MAX - 1) 3271 if (n >= sizeof (string) - 1)
3222 // stop at some sane length 3272 // stop at some sane length
3223 return NULL; 3273 return NULL;
3224 3274
3225 string[n++] = ch; 3275 string[n++] = ch;
3226 } 3276 }
… …
3343 &nitems, &bytes_after, &value) == Success 3393 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3394 && actual_type != None
3345 && actual_format == 8) 3395 && actual_format == 8)
3346 str = (const char *)(value); 3396 str = (const char *)(value);
3347 3397
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3398 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3349 3399
3350 XFree (value); 3400 XFree (value);
3351 } 3401 }
3352 else 3402 else
3353 { 3403 {
… …
3421 break; 3471 break;
3422#endif 3472#endif
3423 case URxvt_Color_border: 3473 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3474 process_color_seq (op, Color_border, str, resp);
3425 break; 3475 break;
3426#if ENABLE_TRANSPARENCY 3476
3477#if BG_IMAGE_FROM_ROOT
3427 case URxvt_Color_tint: 3478 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp); 3479 process_color_seq (op, Color_tint, str, resp);
3429 { 3480 {
3430 bool changed = false; 3481 bool changed = false;
3431 3482
3432 if (ISSET_PIXCOLOR (Color_tint)) 3483 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3484 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434 3485
3435 if (changed) 3486 if (changed)
3436 update_background (); 3487 update_background ();
3437 } 3488 }
3438 3489
… …
3442#if BG_IMAGE_FROM_FILE 3493#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap: 3494 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?")) 3495 if (!strcmp (str, "?"))
3445 { 3496 {
3446 char str[256]; 3497 char str[256];
3498 int h_scale = fimage.h_scale;
3499 int v_scale = fimage.v_scale;
3500 int h_align = fimage.h_align;
3501 int v_align = fimage.v_align;
3447 3502
3448 sprintf (str, "[%dx%d+%d+%d]", 3503 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767), 3504 h_scale, v_scale,
3450 min (h_align, 32767), min (v_align, 32767)); 3505 h_align, v_align);
3451 process_xterm_seq (XTerm_title, str, CHAR_ST); 3506 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 } 3507 }
3453 else 3508 else
3454 { 3509 {
3455 bool changed = false; 3510 bool changed = false;
3456 3511
3457 if (*str != ';') 3512 if (*str != ';')
3458 { 3513 {
3459 if (bg_set_file (str)) /* change pixmap */ 3514 try
3515 {
3516 fimage.set_file_geometry (this, str);
3460 changed = true; 3517 changed = true;
3518 }
3519 catch (const class rxvt_failure_exception &e)
3520 {
3521 }
3461 } 3522 }
3462 else 3523 else
3463 { 3524 {
3464 str++; 3525 str++;
3465 if (bg_set_geometry (str, true)) 3526 if (fimage.set_geometry (str, true))
3466 changed = true; 3527 changed = true;
3467 } 3528 }
3468 3529
3469 if (changed) 3530 if (changed)
3470 { 3531 {
3471 if (bg_window_position_sensitive ()) 3532 if (bg_window_position_sensitive ())
3472 { 3533 {
3473 int x, y; 3534 int x, y;
3474 get_window_origin (x, y); 3535 get_window_origin (x, y);
3475 bg_set_position (x, y); 3536 parent_x = x;
3537 parent_y = y;
3476 } 3538 }
3477 update_background (); 3539 update_background ();
3478 } 3540 }
3479 } 3541 }
3480 break; 3542 break;
… …
3570 * 's' = save 3632 * 's' = save
3571 * 'r' = restore 3633 * 'r' = restore
3572 * 't' = toggle 3634 * 't' = toggle
3573 * so no need for fancy checking 3635 * so no need for fancy checking
3574 */ 3636 */
3575int 3637int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3638rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3639{
3578 int state; 3640 int state;
3579 3641
3580 if (mode == 's') 3642 if (mode == 's')
3581 { 3643 {
3582 SavedModes |= (priv_modes & bit); 3644 if (priv_modes & bit)
3645 SavedModes |= bit;
3646 else
3647 SavedModes &= ~bit;
3583 return -1; 3648 return -1;
3584 } 3649 }
3585 else 3650 else
3586 { 3651 {
3587 if (mode == 'r') 3652 if (mode == 'r')
… …
3797 } 3862 }
3798} 3863}
3799/*}}} */ 3864/*}}} */
3800 3865
3801/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
3802void 3867void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3869{
3805 unsigned int i; 3870 unsigned int i;
3806 short rendset; 3871 short rendset;
3807 int rendstyle; 3872 int rendstyle;
… …
3948 break; 4013 break;
3949#endif 4014#endif
3950 } 4015 }
3951 } 4016 }
3952} 4017}
4018
4019void
4020rxvt_term::set_cursor_style (int style)
4021{
4022 if (!IN_RANGE_INC (style, 0, 4))
4023 return;
4024
4025 set_option (Opt_cursorUnderline, style >= 3);
4026
4027#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1));
4029 cursor_blink_reset ();
4030#endif
4031
4032 want_refresh = 1;
4033}
3953/*}}} */ 4034/*}}} */
3954 4035
3955/* ------------------------------------------------------------------------- */ 4036/* ---------------------------------------------------------------------- */
4037/* Write data to the pty as typed by the user, pasted with the mouse,
4038 * or generated by us in response to a query ESC sequence.
4039 */
3956 4040
3957/* 4041/*
3958 * Send printf () formatted output to the command. 4042 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4043 * Only use for small amounts of data.
3960 */ 4044 */
… …
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4052 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4053 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4054 tt_write (buf, strlen (buf));
3971} 4055}
3972 4056
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4057/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4058void
3976 */ 4059rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4060{
4061 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4062 return;
4063
4064 if (option (Opt_scrollTtyKeypress))
4065 if (view_start)
4066 {
4067 view_start = 0;
4068 want_refresh = 1;
4069 }
4070
4071 tt_write_ (data, len);
4072}
3978 4073
3979void 4074void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4076{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4078 return;
3984 4079
4080 tt_write_ (data, len);
4081}
4082
4083static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4084
4085void
4086rxvt_term::tt_write_ (const char *data, unsigned int len)
4087{
3985 if (pty->pty < 0) 4088 if (pty->pty < 0)
3986 return; 4089 return;
3987 4090
3988 if (v_buflen == 0) 4091 if (v_buflen == 0)
3989 { 4092 {

Diff Legend

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