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.499 by root, Wed Nov 16 20:15:45 2011 UTC vs.
Revision 1.560 by sf-exg, Mon Nov 24 21:46:04 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 - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
325 }; 324 };
326 325
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 336# endif
338#endif 337#endif
339 return keysym; 338 return keysym;
340} 339}
341 340
342static inline int 341static inline int ecb_cold
343map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
344{ 343{
345 int param = 0; 344 int param = 0;
346 345
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 371 param = 3;
373 break; 372 break;
374 case XK_Select: 373 case XK_Select:
375 param = 4; 374 param = 4;
376 break; 375 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 376 case XK_Prior:
379 param = 5; 377 param = 5;
380 break; 378 break;
381 case XK_Next: 379 case XK_Next:
382 param = 6; 380 param = 6;
… …
385 param = 7; 383 param = 7;
386 break; 384 break;
387 case XK_End: 385 case XK_End:
388 param = 8; 386 param = 8;
389 break; 387 break;
390#endif
391 case XK_Help: 388 case XK_Help:
392 param = 28; 389 param = 28;
393 break; 390 break;
394 case XK_Menu: 391 case XK_Menu:
395 param = 29; 392 param = 29;
396 break; 393 break;
397 } 394 }
398 return param; 395 return param;
399} 396}
400 397
401void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
403{ 409{
404 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
405 KeySym keysym; 411 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
408 414
409#if ISO_14755 415#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
411 return; 417 return;
412#endif 418#endif
… …
421 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
423 429
424 kbuf[0] = 0; 430 kbuf[0] = 0;
425 431
426#ifdef USE_XIM 432#if USE_XIM
427 if (Input_Context) 433 if (Input_Context)
428 { 434 {
429 Status status_return; 435 Status status_return;
430 436
431#if 0 437#if 0
… …
469 } 475 }
470 } 476 }
471 else 477 else
472 len = 0; 478 len = 0;
473 } 479 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 480 }
478 else 481 else
479#endif 482#endif
480 { 483 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
483 } 488 {
489 KeySym orig_keysym = keysym;
484 490
485 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
486 { 704 {
487#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 707 return;
490#endif 708#endif
491 709
492 if (saveLines) 710 if (saveLines)
493 { 711 {
… …
506#endif 724#endif
507 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
508 726
509 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
510 { 728 {
511 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
512 return; 730 return;
513 } 731 }
514 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
515 { 733 {
516 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
517 return; 735 return;
518 } 736 }
519 } 737 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
522 { 740 {
523 if (keysym == XK_Up) 741 if (keysym == XK_Up)
524 { 742 {
525 scr_page (UP, 1); 743 scr_page (1);
526 return; 744 return;
527 } 745 }
528 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
529 { 747 {
530 scr_page (DN, 1); 748 scr_page (-1);
531 return; 749 return;
532 } 750 }
533 } 751 }
534#endif 752#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
537 { 755 {
538 if (keysym == XK_Home) 756 if (keysym == XK_Home)
539 { 757 {
540 scr_move_to (0, 1); 758 scr_changeview (top_row);
541 return; 759 return;
542 } 760 }
543 else if (keysym == XK_End) 761 else if (keysym == XK_End)
544 { 762 {
545 scr_move_to (1, 1); 763 scr_changeview (0);
546 return; 764 return;
547 } 765 }
548 } 766 }
549#endif 767#endif
550 } 768 }
551 769
552 if (shft) 770 if (shft)
553 { 771 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 773 {
562 switch (keysym) 774 switch (keysym)
563 { 775 {
564 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 785 return;
574#endif 786#endif
575 } 787 }
576 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
577 } 804 }
578 805
579#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 807 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 863 {
637 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
638 return; 865 return;
639 } 866 }
640#endif 867#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 /*
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 } 868 }
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 869
821 if (len <= 0) 870 if (len <= 0)
822 return; /* not mapped */ 871 return; /* not mapped */
823 872
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
857} 874}
858 875
859void 876void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
861{ 878{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 880 KeySym keysym;
864 881
… …
936void 953void
937rxvt_term::flush () 954rxvt_term::flush ()
938{ 955{
939 flush_ev.stop (); 956 flush_ev.stop ();
940 957
941#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
943 { 960 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 962 scr_touch (false);
946 } 963 }
… …
986 while (row < end_row); 1003 while (row < end_row);
987 } 1004 }
988 1005
989 scr_refresh (); 1006 scr_refresh ();
990 scrollBar.show (1); 1007 scrollBar.show (1);
991#ifdef USE_XIM 1008#if USE_XIM
992 im_send_spot (); 1009 im_send_spot ();
993#endif 1010#endif
994 } 1011 }
995 1012
996 display->flush (); 1013 display->flush ();
… …
1015 flush (); 1032 flush ();
1016} 1033}
1017 1034
1018#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1019void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1053{
1022 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1055 want_refresh = 1;
1024 refresh_check (); 1056 refresh_check ();
… …
1057 1089
1058#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1059void 1091void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1093{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1063 { 1095 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1097 want_refresh = 1;
1066 refresh_check (); 1098 refresh_check ();
1067 } 1099 }
… …
1072 1104
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1106void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1108{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1078 { 1110 {
1079 want_refresh = 1; 1111 want_refresh = 1;
1080 refresh_check (); 1112 refresh_check ();
1081 } 1113 }
1082 1114
… …
1203 pty_write (); 1235 pty_write ();
1204 1236
1205 refresh_check (); 1237 refresh_check ();
1206} 1238}
1207 1239
1208void 1240void ecb_cold
1209rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1210{ 1242{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1244 recolour_cursor ();
1213 1245
… …
1218 pointer_ev.start (pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1219#endif 1251#endif
1220} 1252}
1221 1253
1222#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1223void 1255void ecb_cold
1224rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1225{ 1257{
1226 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1227 return; 1259 return;
1228 1260
… …
1230 XFlush (dpy); 1262 XFlush (dpy);
1231 1263
1232 hidden_pointer = 1; 1264 hidden_pointer = 1;
1233} 1265}
1234 1266
1235void 1267void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1269{
1238 make_current (); 1270 make_current ();
1239 1271
1240 pointer_blank (); 1272 pointer_blank ();
… …
1332 32 + x, 1364 32 + x,
1333 32 + y); 1365 32 + y);
1334} 1366}
1335 1367
1336/*{{{ process an X event */ 1368/*{{{ process an X event */
1337void 1369void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1339{ 1371{
1340 make_current (); 1372 make_current ();
1341 1373
1342 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1477 if (ev.xconfigure.window == parent)
1446 { 1478 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1480 ;
1449 1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1486 if (bg_window_position_sensitive ())
1453 { 1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1454 int x, y; 1496 int x, y;
1497
1455 if (ev.xconfigure.send_event) 1498 if (ev.xconfigure.send_event)
1456 { 1499 {
1457 x = ev.xconfigure.x; 1500 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1501 y = ev.xconfigure.y;
1459 } 1502 }
1460 else 1503 else
1461 get_window_origin (x, y); 1504 get_window_origin (x, y);
1462 1505
1463 if (bg_set_position (x, y) 1506 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1511 moved = true;
1512 }
1466 } 1513 }
1467#endif
1468 1514
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1516 {
1471 seen_resize = 1; 1517 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1495 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1496 break; 1542 break;
1497 1543
1498 case MapNotify: 1544 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1545#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1546 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1547 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1548 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1549 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1550 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1551 // 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 1552 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1553 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); 1554 update_background_ev.start (0.025);
1514#endif 1555#endif
1515 mapped = 1; 1556 mapped = 1;
1516#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1558 text_blink_ev.start ();
… …
1609 1650
1610#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1654 {
1655 page_dirn scroll_selection_dir;
1614 int dist; 1656 int dist;
1615 1657
1616 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1618 */ 1660 */
… …
1633 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1634 } 1676 }
1635 else 1677 else
1636 { 1678 {
1637 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1681 }
1640 1682
1641 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1685 + 1;
1644 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1646 } 1689 }
1647 else 1690 else
1648 { 1691 {
1649 /* we are within the text window, so we 1692 /* we are within the text window, so we
1650 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1675 } 1718 }
1676 break; 1719 break;
1677 } 1720 }
1678 1721
1679#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 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 (); 1724 cursor_blink_reset ();
1689 }
1690#endif 1725#endif
1691 1726
1692#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1729 {
… …
1705 1740
1706 refresh_check (); 1741 refresh_check ();
1707} 1742}
1708 1743
1709#if ENABLE_FRILLS 1744#if ENABLE_FRILLS
1710void 1745void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1746rxvt_term::set_urgency (bool enable)
1712{ 1747{
1713 if (enable == urgency_hint) 1748 if (enable == urgency_hint)
1714 return; 1749 return;
1715 1750
… …
1721 XFree (h); 1756 XFree (h);
1722 } 1757 }
1723} 1758}
1724#endif 1759#endif
1725 1760
1726void 1761void ecb_cold
1727rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1728{ 1763{
1729 if (!focus) 1764 if (!focus)
1730 { 1765 {
1731 focus = 1; 1766 focus = 1;
… …
1756 1791
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1793 }
1759} 1794}
1760 1795
1761void 1796void ecb_cold
1762rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1763{ 1798{
1764 if (focus) 1799 if (focus)
1765 { 1800 {
1766 focus = 0; 1801 focus = 0;
… …
1799 1834
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801 } 1836 }
1802} 1837}
1803 1838
1804void 1839void ecb_cold
1805rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1806{ 1841{
1807#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1809 { 1844 {
… …
1812 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1813 } 1848 }
1814#endif 1849#endif
1815} 1850}
1816 1851
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1818void 1853void ecb_hot
1819rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1820{ 1855{
1821 make_current (); 1856 make_current ();
1822 1857
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825 return; 1860 return;
1826 1861
1827# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1862 switch (ev.type)
1829 { 1863 {
1830 case PropertyNotify: 1864 case PropertyNotify:
1831 /* 1865 /*
1832 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1833 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1834 */ 1868 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1871 {
1838 bg_set_root_pixmap (); 1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1839 update_background (); 1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1840 } 1880 }
1841 1881
1842 break; 1882 break;
1843 } 1883 }
1844# endif
1845 1884
1846 refresh_check (); 1885 refresh_check ();
1847} 1886}
1848#endif 1887#endif
1849 1888
… …
1872 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1873 return; 1912 return;
1874 } 1913 }
1875#endif 1914#endif
1876 1915
1877 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1878 1917
1879 if (reportmode) 1918 if (reportmode)
1880 { 1919 {
1881 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1882 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
… …
2132#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2133 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2134 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2135 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2136 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2137 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2138 { 2177 {
2139 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2140 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2141 mouse_report (ev); 2180 mouse_report (ev);
2142 } 2181 }
… …
2162 case Button3: 2201 case Button3:
2163 selection_make (ev.time); 2202 selection_make (ev.time);
2164 break; 2203 break;
2165 2204
2166 case Button2: 2205 case Button2:
2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169 break; 2208 break;
2170 2209
2171#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2172 case Button4: 2211 case Button4:
2173 case Button5: 2212 case Button5:
2174 { 2213 {
2175 int i; 2214 int lines;
2176 page_dirn v; 2215 page_dirn dirn;
2177 2216
2178 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2179 2218
2180 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2181 i = 1; 2220 lines = 1;
2182 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2183 i = nrow - 1; 2222 lines = nrow - 1;
2184 else 2223 else
2185 i = 5; 2224 lines = 5;
2186 2225
2187# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2188 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2189 { 2228 {
2190 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2191 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2192 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2193 2231
2194 if (!slip_wheel_ev.is_active ()) 2232 if (!slip_wheel_ev.is_active ())
2195 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2196 } 2234 }
2197 else 2235 else
2198# endif 2236# endif
2199 { 2237 {
2200 scr_page (v, i); 2238 scr_page (dirn, lines);
2201 scrollBar.show (1); 2239 scrollBar.show (1);
2202 } 2240 }
2203 } 2241 }
2204 break; 2242 break;
2205#endif 2243#endif
… …
2207 } 2245 }
2208} 2246}
2209 2247
2210/*}}} */ 2248/*}}} */
2211 2249
2212void 2250void ecb_hot
2213rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2214{ 2252{
2215 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2216 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2217 2255
… …
2336 } 2374 }
2337 } 2375 }
2338} 2376}
2339 2377
2340// read the next character 2378// read the next character
2341wchar_t 2379wchar_t ecb_hot
2342rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2343{ 2381{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2383 {
2346 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
… …
2358 } 2396 }
2359 2397
2360 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2361 { 2399 {
2362 mbstate.reset (); // reset now undefined conversion state 2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2363 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364 } 2404 }
2365 2405
2366 // assume wchar == unicode 2406 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
… …
2370 2410
2371 return NOCHAR; 2411 return NOCHAR;
2372} 2412}
2373 2413
2374// read the next octet 2414// read the next octet
2375uint32_t 2415uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2377{ 2417{
2378 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2420 : NOCHAR;
2381} 2421}
2382 2422
2383static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2384 2424
2385wchar_t 2425wchar_t ecb_hot
2386rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2387{ 2427{
2388 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2389 2429
2390 if (c == NOCHAR) 2430 if (c == NOCHAR)
2391 throw out_of_input; 2431 throw out_of_input;
2392 2432
2393 return c; 2433 return c;
2394} 2434}
2395 2435
2396uint32_t 2436uint32_t ecb_hot
2397rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2398{ 2438{
2399 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2400 2440
2401 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2405} 2445}
2406 2446
2407/*{{{ print pipe */ 2447/*{{{ print pipe */
2408/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2409#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2410FILE * 2450FILE * ecb_cold
2411rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2412{ 2452{
2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2414 2454
2415 if (stream == NULL) 2455 if (stream == NULL)
2416 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2417 2457
2418 return stream; 2458 return stream;
2419} 2459}
2420 2460
2421int 2461int ecb_cold
2422rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2423{ 2463{
2424 fflush (stream); 2464 fflush (stream);
2425 return pclose (stream); 2465 return pclose (stream);
2426} 2466}
2427 2467
2428/* 2468/*
2429 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2430 */ 2470 */
2431void 2471void ecb_cold
2432rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2433{ 2473{
2434 FILE *fd = popen_printer (); 2474 FILE *fd = popen_printer ();
2435 2475
2436 if (!fd) 2476 if (!fd)
… …
2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2493}; 2533};
2494 2534
2495/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2496void 2536void ecb_hot
2497rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2498{ 2538{
2499 switch (ch) 2539 switch (ch)
2500 { 2540 {
2501 case C0_ESC: 2541 case C0_ESC:
… …
2531 scr_charset_choose (0); 2571 scr_charset_choose (0);
2532 break; 2572 break;
2533 2573
2534#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2535 // 8-bit controls 2575 // 8-bit controls
2536 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2537 process_dcs_seq (); 2577 process_dcs_seq ();
2538 break; 2578 break;
2539 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2540 process_csi_seq (); 2580 process_csi_seq ();
2541 break; 2581 break;
2542 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2543 process_osc_seq (); 2583 process_osc_seq ();
2544 break; 2584 break;
2545#endif 2585#endif
2546 } 2586 }
2547} 2587}
2548/*}}} */ 2588/*}}} */
2549 2589
2550 2590
2551/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
2552void 2592void ecb_cold
2553rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
2554{ 2594{
2555 int row, col; 2595 int row, col;
2556 2596
2557 switch (ch) 2597 switch (ch)
… …
2607} 2647}
2608/*}}} */ 2648/*}}} */
2609 2649
2610 2650
2611/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
2612void 2652void ecb_hot
2613rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
2614{ 2654{
2615 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
2616 2656
2617 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2772 }; 2812 };
2773 2813
2774void 2814void ecb_hot
2775rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2776{ 2816{
2777 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2778 unsigned int nargs, p; 2818 unsigned int nargs, p;
2779 int n, ndef; 2819 int n, ndef;
2780 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2781 2821
2782 nargs = 0; 2822 nargs = 0;
… …
2788 /* '<' '=' '>' '?' '!' */ 2828 /* '<' '=' '>' '?' '!' */
2789 priv = ch; 2829 priv = ch;
2790 ch = cmd_getc (); 2830 ch = cmd_getc ();
2791 } 2831 }
2792 2832
2833 prev_ch = 0;
2793 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2794 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2795 { 2836 {
2796 if (isdigit (ch)) 2837 if (isdigit (ch))
2797 { 2838 {
… …
2807 n = -1; 2848 n = -1;
2808 } 2849 }
2809 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2810 process_nonprinting (ch); 2851 process_nonprinting (ch);
2811 2852
2853 prev_ch = ch;
2812 ch = cmd_getc (); 2854 ch = cmd_getc ();
2813 } 2855 }
2814 2856
2815 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2816 return; 2858 return;
… …
3050 scr_insert_mode (1); 3092 scr_insert_mode (1);
3051 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3052 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3053 break; 3095 break;
3054 3096
3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3055 /* 3102 /*
3056 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3057 */ 3104 */
3058 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3059 if (nargs == 1) 3106 if (nargs == 1)
… …
3133 break; 3180 break;
3134 3181
3135 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3136 default: 3183 default:
3137 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3138 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3139 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3140 break; 3187 break;
3141 3188
3142 /* 3189 /*
3143 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
… …
3192rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3193{ 3240{
3194 unicode_t ch; 3241 unicode_t ch;
3195 bool seen_esc = false; 3242 bool seen_esc = false;
3196 unsigned int n = 0; 3243 unsigned int n = 0;
3197 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3198 3245
3199 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3200 { 3247 {
3201 if (seen_esc) 3248 if (seen_esc)
3202 { 3249 {
… …
3217 else if (ch < 0x20) 3264 else if (ch < 0x20)
3218 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3219 3266
3220 seen_esc = false; 3267 seen_esc = false;
3221 3268
3222 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3223 // stop at some sane length 3270 // stop at some sane length
3224 return NULL; 3271 return NULL;
3225 3272
3226 string[n++] = ch; 3273 string[n++] = ch;
3227 } 3274 }
… …
3344 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3345 && actual_type != None 3392 && actual_type != None
3346 && actual_format == 8) 3393 && actual_format == 8)
3347 str = (const char *)(value); 3394 str = (const char *)(value);
3348 3395
3349 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3350 3397
3351 XFree (value); 3398 XFree (value);
3352 } 3399 }
3353 else 3400 else
3354 { 3401 {
… …
3422 break; 3469 break;
3423#endif 3470#endif
3424 case URxvt_Color_border: 3471 case URxvt_Color_border:
3425 process_color_seq (op, Color_border, str, resp); 3472 process_color_seq (op, Color_border, str, resp);
3426 break; 3473 break;
3427#if ENABLE_TRANSPARENCY 3474
3475#if BG_IMAGE_FROM_ROOT
3428 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3429 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3430 { 3478 {
3431 bool changed = false; 3479 bool changed = false;
3432 3480
3433 if (ISSET_PIXCOLOR (Color_tint)) 3481 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435 3483
3436 if (changed) 3484 if (changed)
3437 update_background (); 3485 update_background ();
3438 } 3486 }
3439 3487
… …
3443#if BG_IMAGE_FROM_FILE 3491#if BG_IMAGE_FROM_FILE
3444 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3445 if (!strcmp (str, "?")) 3493 if (!strcmp (str, "?"))
3446 { 3494 {
3447 char str[256]; 3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3448 3500
3449 sprintf (str, "[%dx%d+%d+%d]", 3501 sprintf (str, "[%dx%d+%d+%d]",
3450 min (h_scale, 32767), min (v_scale, 32767), 3502 h_scale, v_scale,
3451 min (h_align, 32767), min (v_align, 32767)); 3503 h_align, v_align);
3452 process_xterm_seq (XTerm_title, str, CHAR_ST); 3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3453 } 3505 }
3454 else 3506 else
3455 { 3507 {
3456 bool changed = false; 3508 bool changed = false;
3457 3509
3458 if (*str != ';') 3510 if (*str != ';')
3459 { 3511 {
3460 if (bg_set_file (str)) /* change pixmap */ 3512 try
3513 {
3514 fimage.set_file_geometry (this, str);
3461 changed = true; 3515 changed = true;
3516 }
3517 catch (const class rxvt_failure_exception &e)
3518 {
3519 }
3462 } 3520 }
3463 else 3521 else
3464 { 3522 {
3465 str++; 3523 str++;
3466 if (bg_set_geometry (str, true)) 3524 if (fimage.set_geometry (str, true))
3467 changed = true; 3525 changed = true;
3468 } 3526 }
3469 3527
3470 if (changed) 3528 if (changed)
3471 { 3529 {
3472 if (bg_window_position_sensitive ()) 3530 if (bg_window_position_sensitive ())
3473 { 3531 {
3474 int x, y; 3532 int x, y;
3475 get_window_origin (x, y); 3533 get_window_origin (x, y);
3476 bg_set_position (x, y); 3534 parent_x = x;
3535 parent_y = y;
3477 } 3536 }
3478 update_background (); 3537 update_background ();
3479 } 3538 }
3480 } 3539 }
3481 break; 3540 break;
… …
3571 * 's' = save 3630 * 's' = save
3572 * 'r' = restore 3631 * 'r' = restore
3573 * 't' = toggle 3632 * 't' = toggle
3574 * so no need for fancy checking 3633 * so no need for fancy checking
3575 */ 3634 */
3576int 3635int ecb_cold
3577rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
3578{ 3637{
3579 int state; 3638 int state;
3580 3639
3581 if (mode == 's') 3640 if (mode == 's')
3582 { 3641 {
3583 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
3584 return -1; 3646 return -1;
3585 } 3647 }
3586 else 3648 else
3587 { 3649 {
3588 if (mode == 'r') 3650 if (mode == 'r')
… …
3618 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3619 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3620 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3621 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3622 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3685 { 12, PrivMode_BlinkingCursor },
3623 // 18 end FF to printer after print screen 3686 // 18 end FF to printer after print screen
3624 // 19 Print screen prints full screen/scroll region 3687 // 19 Print screen prints full screen/scroll region
3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3688 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3626#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3627 { scrollBar_esc, PrivMode_scrollBar }, 3690 { scrollBar_esc, PrivMode_scrollBar },
… …
3736 scrollBar.map (state); 3799 scrollBar.map (state);
3737 resize_all_windows (0, 0, 0); 3800 resize_all_windows (0, 0, 0);
3738 scr_touch (true); 3801 scr_touch (true);
3739 break; 3802 break;
3740#endif 3803#endif
3804#ifdef CURSOR_BLINK
3805 case 12:
3806 set_option (Opt_cursorBlink, state);
3807 cursor_blink_reset ();
3808 break;
3809#endif
3741 case 25: /* visible/invisible cursor */ 3810 case 25: /* visible/invisible cursor */
3742 scr_cursor_visible (state); 3811 scr_cursor_visible (state);
3743 break; 3812 break;
3744 /* case 35: - shift keys */ 3813 /* case 35: - shift keys */
3745 /* case 40: - 80 <--> 132 mode */ 3814 /* case 40: - 80 <--> 132 mode */
… …
3798 } 3867 }
3799} 3868}
3800/*}}} */ 3869/*}}} */
3801 3870
3802/*{{{ process sgr sequences */ 3871/*{{{ process sgr sequences */
3803void 3872void ecb_hot
3804rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3873rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3805{ 3874{
3806 unsigned int i; 3875 unsigned int i;
3807 short rendset; 3876 short rendset;
3808 int rendstyle; 3877 int rendstyle;
… …
3949 break; 4018 break;
3950#endif 4019#endif
3951 } 4020 }
3952 } 4021 }
3953} 4022}
4023
4024void
4025rxvt_term::set_cursor_style (int style)
4026{
4027 if (!IN_RANGE_INC (style, 0, 6))
4028 return;
4029
4030 if (style == 0)
4031 style = 1;
4032
4033 cursor_type = (style - 1) / 2;
4034 set_option (Opt_cursorUnderline, cursor_type == 1);
4035
4036#ifdef CURSOR_BLINK
4037 set_option (Opt_cursorBlink, style & 1);
4038 cursor_blink_reset ();
4039#endif
4040
4041 want_refresh = 1;
4042}
3954/*}}} */ 4043/*}}} */
3955 4044
3956/* ------------------------------------------------------------------------- */ 4045/* ---------------------------------------------------------------------- */
4046/* Write data to the pty as typed by the user, pasted with the mouse,
4047 * or generated by us in response to a query ESC sequence.
4048 */
3957 4049
3958/* 4050/*
3959 * Send printf () formatted output to the command. 4051 * Send printf () formatted output to the command.
3960 * Only use for small amounts of data. 4052 * Only use for small amounts of data.
3961 */ 4053 */
… …
3969 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4061 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3970 va_end (arg_ptr); 4062 va_end (arg_ptr);
3971 tt_write (buf, strlen (buf)); 4063 tt_write (buf, strlen (buf));
3972} 4064}
3973 4065
3974/* ---------------------------------------------------------------------- */
3975/* Write data to the pty as typed by the user, pasted with the mouse, 4066/* Write data to the pty as typed by the user. */
3976 * or generated by us in response to a query ESC sequence. 4067void
3977 */ 4068rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069{
4070 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4071 return;
4072
4073 if (option (Opt_scrollTtyKeypress))
4074 if (view_start)
4075 {
4076 view_start = 0;
4077 want_refresh = 1;
4078 }
4079
4080 tt_write_ (data, len);
4081}
3979 4082
3980void 4083void
3981rxvt_term::tt_write (const char *data, unsigned int len) 4084rxvt_term::tt_write (const char *data, unsigned int len)
3982{ 4085{
3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4086 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3984 return; 4087 return;
3985 4088
4089 tt_write_ (data, len);
4090}
4091
4092static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4093
4094void
4095rxvt_term::tt_write_ (const char *data, unsigned int len)
4096{
3986 if (pty->pty < 0) 4097 if (pty->pty < 0)
3987 return; 4098 return;
3988 4099
3989 if (v_buflen == 0) 4100 if (v_buflen == 0)
3990 { 4101 {

Diff Legend

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