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.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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>
… …
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
166 162
167void 163void
168rxvt_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)
169{ 165{
170 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
173 int len; 168 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176 169
177# if ENABLE_COMBINING 170# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
179 { 172 {
180 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
201 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
205 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
206 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
207 207
208 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
210 210
211 if (y >= 0) 211 if (y >= 0)
212 { 212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 214 x = 0;
215 } 215 }
216 216
217 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
218 218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 220
221 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
222 { 222 {
… …
225 ch = *chr++; 225 ch = *chr++;
226 226
227 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
230# if !UNICODE3 230# if !UNICODE_3
231 if (ch >= 0x10000) 231 if (ch >= 0x10000)
232 ch = 0xfffd; 232 ch = 0xfffd;
233# endif 233# endif
234 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
235
236 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 237 scr_overlay_set (12, y, NOCHAR, r);
236 } 238 }
237 239
240// {
241// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf);
244// }
238 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
239 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
240
241 free (fname); 249 free (fname[i]);
250 }
242 251
243# if ENABLE_COMBINING 252# if ENABLE_COMBINING
244 if (alloc) 253 if (alloc)
245 delete [] alloc; 254 delete [] alloc;
246# endif 255# endif
… …
276 } 285 }
277 286
278 iso14755buf = 0; 287 iso14755buf = 0;
279} 288}
280 289
281int 290static int
282rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
283{ 292{
284 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
287 { 296 {
288 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
289 298
… …
295 304
296 return -1; 305 return -1;
297} 306}
298#endif 307#endif
299 308
300/*{{{ Convert the keypress event into a string */ 309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
301void 404void
302rxvt_term::lookup_key (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
303{ 406{
304 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 408 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 409 int valid_keysym;
311 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
411
412#if ISO_14755
413 if (iso14755buf & ISO_14755_52)
414 return;
415#endif
312 416
313 /* 417 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 418 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 419 * escape sequence to toggle the Keypad.
316 * 420 *
317 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
318 */ 422 */
319 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
320 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
321 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
322
323 if (numlock_state || (ev.state & ModNumLockMask))
324 {
325 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP);
327 }
328 426
329 kbuf[0] = 0; 427 kbuf[0] = 0;
330 428
331#ifdef USE_XIM 429#ifdef USE_XIM
332 if (Input_Context) 430 if (Input_Context)
… …
407#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
408 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
409#else 507#else
410 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
411#endif 509#endif
510 max_it (lnsppg, 1);
511
412 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
413 { 513 {
414 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
415 return; 515 return;
416 } 516 }
… …
464 { 564 {
465 switch (keysym) 565 switch (keysym)
466 { 566 {
467 /* normal XTerm key bindings */ 567 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 568 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 569 selection_request (ev.time);
470 return; 570 return;
471#if TODO 571#if TODO
472 /* rxvt extras */ 572 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 574 change_font (FONT_UP);
… …
481 } 581 }
482 } 582 }
483 583
484#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
485 // ISO 14755 support 585 // ISO 14755 support
486 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
487 { 587 {
488 int hv; 588 int hv;
489 589
490 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
491 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
493 { 593 {
494 commit_iso14755 (); 594 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
496# if ISO_14755 596# if ISO_14755
497 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 606# endif
499 return; 607 return;
500 } 608 }
501 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
502 { 610 {
… …
507# endif 615# endif
508 return; 616 return;
509 } 617 }
510 else 618 else
511 { 619 {
512# if ENABLE_OVERLAY 620# if ISO_14755
513 scr_overlay_off (); 621 scr_overlay_off ();
514# endif 622# endif
515 iso14755buf = 0; 623 iso14755buf = 0;
516 } 624 }
517 } 625 }
626 else if (option (Opt_iso14755) &&
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
520 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
521 { 630 {
522 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 632# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 635# endif
527 } 636 }
528#endif 637#endif
529 638
530#ifdef PRINTPIPE 639#ifdef PRINTPIPE
531 if (keysym == XK_Print) 640 if (keysym == XK_Print)
532 { 641 {
533 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
534 return; 643 return;
535 } 644 }
536#endif 645#endif
537 646
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654 switch (translate_keypad (keysym, kp))
540 { 655 {
656#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace)
659 {
660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
661 ^ !!ctrl) ? '\b' : '\177';
662 kbuf[1] = '\0';
663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
541 newlen = 1; 686 newlen = 0;
542 switch (keysym) 687 }
688 break;
689
690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
543 { 770 {
544#ifndef NO_BACKSPACE_KEY 771 int param = map_function_key (keysym);
545 case XK_BackSpace: 772 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 773 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 774 else
553 strcpy (kbuf, key_backspace);
554 break;
555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete:
568 strcpy (kbuf, key_delete);
569 break;
570#endif
571 case XK_Tab:
572 if (shft)
573 strcpy (kbuf, "\033[Z");
574 else
575 {
576#ifdef CTRL_TAB_MAKES_META
577 if (ctrl)
578 meta = 1;
579#endif
580#ifdef MOD4_TAB_MAKES_META
581 if (ev.state & Mod4Mask)
582 meta = 1;
583#endif
584 newlen = 0;
585 }
586 break;
587
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z");
609 kbuf[2] = "DACB"[keysym - XK_Left];
610 /* do Shift first */
611 if (shft)
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 else if (ctrl)
614 {
615 kbuf[1] = 'O';
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 }
618 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O';
620 break;
621
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter:
651 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
653 {
654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
666 }
667 else
668 {
669 kbuf[0] = '\015';
670 kbuf[1] = '\0';
671 }
672 break;
673
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP");
685 kbuf[2] += (keysym - XK_KP_F1);
686 break;
687
688 case XK_KP_Multiply: /* "\033Oj" : "*" */
689 case XK_KP_Add: /* "\033Ok" : "+" */
690 case XK_KP_Separator: /* "\033Ol" : "," */
691 case XK_KP_Subtract: /* "\033Om" : "-" */
692 case XK_KP_Decimal: /* "\033On" : "." */
693 case XK_KP_Divide: /* "\033Oo" : "/" */
694 case XK_KP_0: /* "\033Op" : "0" */
695 case XK_KP_1: /* "\033Oq" : "1" */
696 case XK_KP_2: /* "\033Or" : "2" */
697 case XK_KP_3: /* "\033Os" : "3" */
698 case XK_KP_4: /* "\033Ot" : "4" */
699 case XK_KP_5: /* "\033Ou" : "5" */
700 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
706 {
707 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply);
709 }
710 else
711 {
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0';
714 }
715 break;
716
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End:
755 strcpy (kbuf, KS_END);
756 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home:
768 strcpy (kbuf, KS_HOME);
769 break;
770
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default:
827 newlen = 0; 775 newlen = 0;
828 break;
829 } 776 }
830 777 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 778 }
779
780 if (newlen)
781 len = strlen (kbuf);
834 782
835 /* 783 /*
836 * Pass meta for all function keys, if 'meta' option set 784 * Pass meta for all function keys, if 'meta' option set
837 */ 785 */
838#ifdef META8_OPTION 786#ifdef META8_OPTION
… …
873 return; 821 return;
874 822
875 if (len <= 0) 823 if (len <= 0)
876 return; /* not mapped */ 824 return; /* not mapped */
877 825
878 if (OPTION (Opt_scrollTtyKeypress)) 826 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 827 if (view_start)
880 { 828 {
881 view_start = 0; 829 view_start = 0;
882 want_refresh = 1; 830 want_refresh = 1;
883 } 831 }
… …
905 { 853 {
906 const char ch = C0_ESC; 854 const char ch = C0_ESC;
907 tt_write (&ch, 1); 855 tt_write (&ch, 1);
908 } 856 }
909 857
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 858 tt_write (kbuf, (unsigned int)len);
921} 859}
922/*}}} */ 860
861void
862rxvt_term::key_release (XKeyEvent &ev)
863{
864#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
865 KeySym keysym;
866
867 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
868#endif
869
870#if ENABLE_FRILLS || ISO_14755
871 // ISO 14755 support
872 if (iso14755buf)
873 if (iso14755buf & ISO_14755_52)
874 {
875# if ISO_14755
876 scr_overlay_off ();
877# endif
878# if ISO_14755
879 // iso14755 part 5.2 handling: release time
880 // first: controls
881 if ((ev.state & ControlMask)
882 && ((keysym >= 0x40 && keysym <= 0x5f)
883 || (keysym >= 0x61 && keysym <= 0x7f)))
884 {
885 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
886 commit_iso14755 ();
887
888 return;
889 }
890
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
892 if (i[0] == keysym)
893 {
894 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 ();
896
897 return;
898 }
899
900 scr_bell ();
901# endif
902 iso14755buf = 0;
903
904 return;
905 }
906 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
907 {
908# if ISO_14755
909 scr_overlay_off ();
910# endif
911 if (iso14755buf & ISO_14755_51)
912 commit_iso14755 ();
913#if ISO_14755
914 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
915 {
916 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
917
918 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
919 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
920 }
921# endif
922 else
923 iso14755buf = 0;
924 }
925#endif
926
927 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
928 return;
929
930#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
931 if (!(ev.state & ControlMask))
932 slip_wheel_ev.stop ();
933 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0;
935#endif
936}
923 937
924#if defined (KEYSYM_RESOURCE) 938#if defined (KEYSYM_RESOURCE)
925unsigned int 939unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 940rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 941{
… …
957void 971void
958rxvt_term::flush () 972rxvt_term::flush ()
959{ 973{
960 flush_ev.stop (); 974 flush_ev.stop ();
961 975
962#ifdef TRANSPARENT 976#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 977 if (bgPixmap.check_clearChanged ())
964 { 978 {
965 want_full_refresh = 0; 979// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 980 scr_touch (false);
968 } 981 }
969#endif 982#endif
970 983
971 if (want_refresh) 984 if (want_refresh)
… …
1007 } 1020 }
1008 while (row < end_row); 1021 while (row < end_row);
1009 } 1022 }
1010 1023
1011 scr_refresh (); 1024 scr_refresh ();
1012 scrollbar_show (1); 1025 scrollBar.show (1);
1013#ifdef USE_XIM 1026#ifdef USE_XIM
1014 IMSendSpot (); 1027 IMSendSpot ();
1015#endif 1028#endif
1016 } 1029 }
1017 1030
1018 display->flush (); 1031 display->flush ();
1019} 1032}
1020 1033
1034/* checks whether a refresh is requested and starts the refresh timer */
1021void 1035void
1022rxvt_term::check_cb (check_watcher &w) 1036rxvt_term::refresh_check ()
1037{
1038 if (want_refresh && !flush_ev.is_active ())
1039 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1040
1041 display->flush ();
1042}
1043
1044void
1045rxvt_term::flush_cb (ev::timer &w, int revents)
1023{ 1046{
1024 make_current (); 1047 make_current ();
1025 1048
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0; 1049 refresh_count = 0;
1039 flush (); 1050 flush ();
1040} 1051}
1041 1052
1042#ifdef CURSOR_BLINK 1053#ifdef CURSOR_BLINK
1043void 1054void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1056{
1046 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1058 want_refresh = 1;
1048 1059 refresh_check ();
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1060}
1051#endif 1061#endif
1052 1062
1053#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1054void 1064void
1055rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1066{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1068 {
1059 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1060 want_refresh = 1; 1070 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1062 } 1072 }
1073 else
1074 w.stop ();
1063} 1075}
1064#endif 1076#endif
1065 1077
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1079void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1081{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1072 { 1084 {
1073 want_refresh = 1; 1085 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1075 } 1087 }
1088 else
1089 w.stop ();
1076} 1090}
1077#endif 1091#endif
1078 1092
1079#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1080void 1094void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1096{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1098 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1100 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1088 } 1102 }
1103 else
1104 w.stop ();
1089} 1105}
1090#endif 1106#endif
1091 1107
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1109void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1111{
1096 if (mouse_slip_wheel_speed == 0 1112 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1113 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1; 1114 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1105 } 1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1122 }
1106} 1123}
1107#endif 1124#endif
1108 1125
1109#if HAVE_SCHED_YIELD 1126#if LINUX_YIELD_HACK
1110static struct event_handler 1127static struct event_handler
1111{ 1128{
1112 check_watcher cw_yield; 1129 ev::prepare yield_ev;
1113 1130
1114 void yield (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1115 { 1132 {
1116 sched_yield (); 1133 // this should really be sched_yield(), but the linux guys thought
1134 // that giving a process calling sched_yield () less cpu time than
1135 // ones with high nice levels is a useful thing to do. It surely is is
1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1140
1141 struct timespec ts = { 0, 1000 };
1142 nanosleep (&ts, 0);
1143
1117 w.stop (); 1144 w.stop ();
1118 } 1145 }
1119 1146
1120 event_handler () 1147 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1148 : yield_ev (this, &event_handler::yield_cb)
1122 { 1149 {
1123 } 1150 }
1124} event_handler; 1151} event_handler;
1125#endif 1152#endif
1126 1153
… …
1146 cmdbuf_endp += r; 1173 cmdbuf_endp += r;
1147 return true; 1174 return true;
1148 } 1175 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1176 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1177 {
1151#if HAVE_SCHED_YIELD 1178#if LINUX_YIELD_HACK
1152 if (display->is_local) 1179 if (display->is_local)
1153 event_handler.cw_yield.start (); 1180 event_handler.yield_ev.start ();
1154#endif 1181#endif
1155 } 1182 }
1156 else 1183 else
1157 { 1184 {
1158 pty_ev.stop (); 1185 pty_ev.stop ();
1159 1186
1160 if (!OPTION (Opt_hold)) 1187 if (!option (Opt_hold))
1161 destroy (); 1188 destroy ();
1162 } 1189 }
1163 1190
1164 return false; 1191 return false;
1165} 1192}
1166 1193
1167void 1194void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1196{
1170 make_current (); 1197 make_current ();
1171 1198
1172 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1175 if (cmd_parse ()) 1202 cmd_parse ();
1176 break;
1177 1203
1178 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1179 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1180} 1208}
1181 1209
1182void 1210void
1183rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1184{ 1212{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1214 recolour_cursor ();
1187 1215
1188#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1217 hidden_pointer = 0;
1190 1218
1191 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1193#endif 1221#endif
1194} 1222}
1195 1223
1196#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1197void 1225void
1198rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1199{ 1227{
1200 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1201 return; 1229 return;
1202 1230
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1232 XFlush (dpy);
1205 1233
1206 hidden_pointer = 1; 1234 hidden_pointer = 1;
1207} 1235}
1208 1236
1209void 1237void
1210rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1239{
1212 make_current (); 1240 make_current ();
1213 1241
1214 pointer_blank (); 1242 pointer_blank ();
1215} 1243}
… …
1218void 1246void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1248{
1221 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1222 int x, y; 1250 int x, y;
1251 int code = 32;
1223 1252
1224 x = ev.x; 1253 x = Pixel2Col (ev.x);
1225 y = ev.y; 1254 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1227 1263
1228 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1229 button_number = 3; 1265 button_number = 3;
1230 else 1266 else
1231 { 1267 {
… …
1277 x + 1, 1313 x + 1,
1278 y + 1); 1314 y + 1);
1279#endif 1315#endif
1280 1316
1281 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1283 (32 + x + 1), 1319 (32 + x + 1),
1284 (32 + y + 1)); 1320 (32 + y + 1));
1285} 1321}
1286 1322
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1323/*{{{ process an X event */
1298void 1324void
1299rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1300{ 1326{
1301 make_current (); 1327 make_current ();
1302 1328
1303 dDisp; 1329 dLocal (Display *, dpy);
1304 1330
1305 if (ev.xany.window == vt 1331 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1334 return;
… …
1313 unsigned int unused_mask; 1339 unsigned int unused_mask;
1314 1340
1315 switch (ev.type) 1341 switch (ev.type)
1316 { 1342 {
1317 case KeyPress: 1343 case KeyPress:
1318#if ISO_14755 1344 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1345 break;
1324 1346
1325 case KeyRelease: 1347 case KeyRelease:
1326 { 1348 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1349 break;
1398 }
1399 1350
1400 case ButtonPress: 1351 case ButtonPress:
1401 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1402 break; 1353 break;
1403 1354
… …
1405 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1406 break; 1357 break;
1407 1358
1408 case ClientMessage: 1359 case ClientMessage:
1409 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1361 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1362 {
1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1364 {
1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1366 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1370 destroy ();
1371 }
1414#if ENABLE_EWMH 1372#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1376 &ev);
1377#endif
1378 }
1379 }
1380#if ENABLE_XEMBED
1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1419#endif 1388#endif
1420 } 1389 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1390 break;
1461 1391
1462 /* 1392 /*
1463 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1483 break; 1413 break;
1484 } 1414 }
1485 break; 1415 break;
1486 1416
1487 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1421 focus_in ();
1489 break; 1422 break;
1490 1423
1491 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1428 focus_out ();
1493 break; 1429 break;
1494 1430
1495 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1496 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1497 { 1436 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1438 ;
1500 1439
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1441 {
1503 seen_resize = 1; 1442 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1444 }
1506 1445 else
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1446 {
1508 if (OPTION (Opt_transparent)) 1447#ifdef HAVE_BG_PIXMAP
1509 check_our_parents (); 1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped)
1451 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1510#endif 1455#endif
1456 }
1457
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1511 } 1459 }
1512 break; 1460 break;
1513 1461
1514 case PropertyNotify: 1462 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1465 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1467
1519 break; 1468 break;
1520 1469
1521 case SelectionClear: 1470 case SelectionClear:
1522 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1523 break; 1472 break;
1524 1473
1525 case SelectionNotify: 1474 case SelectionNotify:
1526 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1527 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1530 case SelectionRequest: 1479 case SelectionRequest:
1531 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1532 break; 1481 break;
1533 1482
1534 case MapNotify: 1483 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does
1489 * reparenting.
1490 * We should not render background immidiately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025);
1499#endif
1535 mapped = 1; 1500 mapped = 1;
1536#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start ();
1538#endif 1503#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1505 break;
1541 1506
1542 case UnmapNotify: 1507 case UnmapNotify:
… …
1544#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1545 text_blink_ev.stop (); 1510 text_blink_ev.stop ();
1546#endif 1511#endif
1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1548 break; 1513 break;
1549
1550#ifdef TRANSPARENT
1551 case ReparentNotify:
1552 rootwin_cb (ev);
1553 break;
1554#endif /* TRANSPARENT */
1555 1514
1556 case GraphicsExpose: 1515 case GraphicsExpose:
1557 case Expose: 1516 case Expose:
1558 if (ev.xany.window == vt) 1517 if (ev.xany.window == vt)
1559 { 1518 {
1560 do 1519 do
1520 {
1561 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1562 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1523 }
1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564 1525
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566 1527
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 {
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1532 }
1570 1533
1571 want_refresh = 1; 1534 want_refresh = 1;
1572 } 1535 }
1573 else 1536 else
1574 { 1537 {
1575 XEvent unused_event; 1538 XEvent unused_event;
1576 1539
1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578 ; 1541 ;
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580 ; 1543 ;
1581 1544
1582 if (isScrollbarWindow (ev.xany.window)) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1583 { 1546 {
1584 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1585 scrollbar_show (0); 1548 scrollBar.show (0);
1586 } 1549 }
1587
1588#ifdef TRANSPARENT
1589 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window);
1591#endif
1592 } 1550 }
1593 break; 1551 break;
1594 1552
1595 case MotionNotify: 1553 case MotionNotify:
1596#ifdef POINTER_BLANK 1554#ifdef POINTER_BLANK
1597 if (hidden_pointer) 1555 if (hidden_pointer)
1598 pointer_unblank (); 1556 pointer_unblank ();
1599#endif 1557#endif
1558 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 || priv_modes & PrivMode_MouseAnyEvent)
1560 mouse_report (ev.xbutton);
1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1601 break; 1562 break;
1602 1563
1603 if (ev.xany.window == vt) 1564 if (ev.xany.window == vt)
1604 { 1565 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1566 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1567 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop 1568 ; // nop
1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1569 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609 { 1570 {
1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1571 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611 ; 1572 ;
1612 1573
1613 XQueryPointer (disp, vt, 1574 XQueryPointer (dpy, vt,
1614 &unused_root, &unused_child, 1575 &unused_root, &unused_child,
1615 &unused_root_x, &unused_root_y, 1576 &unused_root_x, &unused_root_y,
1616 &ev.xbutton.x, &ev.xbutton.y, 1577 &ev.xbutton.x, &ev.xbutton.y,
1617 &ev.xbutton.state); 1578 &ev.xbutton.state);
1618#ifdef MOUSE_THRESHOLD 1579#ifdef MOUSE_THRESHOLD
… …
1638 int dist; 1599 int dist;
1639 1600
1640 /* don't clobber the current delay if we are 1601 /* don't clobber the current delay if we are
1641 * already in the middle of scrolling. 1602 * already in the middle of scrolling.
1642 */ 1603 */
1643 if (!sel_scroll_ev.active) 1604 if (!sel_scroll_ev.is_active ())
1644 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1605 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1645 1606
1646 /* save the event params so we can highlight 1607 /* save the event params so we can highlight
1647 * the selection in the pending-scroll loop 1608 * the selection in the pending-scroll loop
1648 */ 1609 */
1649 selection_save_x = ev.xbutton.x; 1610 selection_save_x = ev.xbutton.x;
… …
1671 else 1632 else
1672 { 1633 {
1673 /* we are within the text window, so we 1634 /* we are within the text window, so we
1674 * shouldn't be scrolling 1635 * shouldn't be scrolling
1675 */ 1636 */
1676 if (sel_scroll_ev.active)
1677 sel_scroll_ev.stop(); 1637 sel_scroll_ev.stop();
1678 } 1638 }
1679#endif 1639#endif
1680#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1681 } 1641 }
1682#endif 1642#endif
1683 } 1643 }
1684 } 1644 }
1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1686 { 1646 {
1687 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1689 ; 1649 ;
1690 1650
1691 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (dpy, scrollBar.win,
1692 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1693 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1694 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1695 &unused_mask); 1655 &unused_mask);
1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1697 scrollbar_size ()); 1657 scrollBar.size ());
1698 want_refresh = 1; 1658 want_refresh = 1;
1699 refresh_limit = 0;
1700 scrollbar_show (1); 1659 scrollBar.show (1);
1701 } 1660 }
1702 break; 1661 break;
1703 } 1662 }
1704 1663
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1665 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1709 { 1666 {
1710 if (hidden_cursor) 1667 if (hidden_cursor)
1711 { 1668 {
1712 hidden_cursor = 0; 1669 hidden_cursor = 0;
1713 want_refresh = 1; 1670 want_refresh = 1;
1714 } 1671 }
1715 1672
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1673 cursor_blink_ev.again ();
1717 } 1674 }
1718#endif 1675#endif
1719 1676
1720#if defined(POINTER_BLANK) 1677#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 { 1679 {
1723 if (ev.type == MotionNotify 1680 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress 1681 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease) 1682 || ev.type == ButtonRelease)
1726 if (hidden_pointer) 1683 if (hidden_pointer)
… …
1728 1685
1729 if (ev.type == KeyPress && hidden_pointer == 0) 1686 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank (); 1687 pointer_blank ();
1731 } 1688 }
1732#endif 1689#endif
1690
1691 refresh_check ();
1733} 1692}
1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1734 1709
1735void 1710void
1736rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1737{ 1712{
1738 if (!focus) 1713 if (!focus)
1739 { 1714 {
1740 focus = 1; 1715 focus = 1;
1741 want_refresh = 1; 1716 want_refresh = 1;
1742 1717
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM 1718#if USE_XIM
1746 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1747 { 1720 {
1748 IMSetStatusPosition (); 1721 IMSetPosition ();
1749 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1750 } 1723 }
1751#endif 1724#endif
1752#if CURSOR_BLINK 1725#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1726 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1727 cursor_blink_ev.again ();
1755#endif 1728#endif
1756#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1758 { 1731 {
1759 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
1760 scr_recolour (); 1733 scr_recolour ();
1761 } 1734 }
1762#endif 1735#endif
1736#if ENABLE_FRILLS
1737 if (option (Opt_urgentOnBell))
1738 set_urgency (0);
1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1763 } 1742 }
1764} 1743}
1765 1744
1766void 1745void
1767rxvt_term::focus_out () 1746rxvt_term::focus_out ()
… …
1769 if (focus) 1748 if (focus)
1770 { 1749 {
1771 focus = 0; 1750 focus = 0;
1772 want_refresh = 1; 1751 want_refresh = 1;
1773 1752
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1775 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1776#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf) 1758 if (iso14755buf)
1778 { 1759 {
1779 iso14755buf = 0; 1760 iso14755buf = 0;
1780# if ENABLE_OVERLAY 1761# if ISO_14755
1781 scr_overlay_off (); 1762 scr_overlay_off ();
1782# endif 1763# endif
1783 } 1764 }
1784#endif 1765#endif
1785#if USE_XIM 1766#if USE_XIM
1786 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1788#endif 1769#endif
1789#if CURSOR_BLINK 1770#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1773
1792 hidden_cursor = 0; 1774 hidden_cursor = 0;
1793#endif 1775#endif
1794#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
1796 { 1778 {
1797 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1798 scr_recolour (); 1780 scr_recolour ();
1799 } 1781 }
1800#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785 }
1786}
1787
1788void
1789rxvt_term::update_fade_color (unsigned int idx)
1790{
1791#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade])
1801 } 1793 {
1794 rgba c;
1795 pix_colors [Color_fade].get (c);
1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1797 }
1798#endif
1802} 1799}
1803 1800
1804#if TRANSPARENT 1801#if ENABLE_TRANSPARENCY || ENABLE_PERL
1805void 1802void
1806rxvt_term::rootwin_cb (XEvent &ev) 1803rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1804{
1808 make_current (); 1805 make_current ();
1809 1806
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1811# if ENABLE_TRANSPARENCY
1810 switch (ev.type) 1812 switch (ev.type)
1811 { 1813 {
1812 case PropertyNotify: 1814 case PropertyNotify:
1813 /* 1815 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1816 * if user used some Esetroot compatible prog to set the root bg,
1815 * use the property to determine the pixmap. We use it later on. 1817 * use the property to determine the pixmap. We use it later on.
1816 */ 1818 */
1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 return; 1821 {
1822 bgPixmap.set_root_pixmap ();
1823 update_background ();
1824 }
1820 1825
1821 /* FALLTHROUGH */
1822 case ReparentNotify:
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1;
1825 break; 1826 break;
1826 } 1827 }
1828# endif
1829
1830 refresh_check ();
1827} 1831}
1828#endif 1832#endif
1829 1833
1830void 1834void
1831rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
… …
1840 /* 1844 /*
1841 * VT window processing of button press 1845 * VT window processing of button press
1842 */ 1846 */
1843 if (ev.window == vt) 1847 if (ev.window == vt)
1844 { 1848 {
1849 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1850 return;
1851
1845#if ISO_14755 1852#if ISO_14755
1846 // 5.4 1853 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1854 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1855 {
1849 iso14755_54 (ev.x, ev.y); 1856 iso14755_54 (ev.x, ev.y);
… …
1883 mouse_report (ev); 1890 mouse_report (ev);
1884 } 1891 }
1885#else 1892#else
1886 MEvent.button = ev.button; 1893 MEvent.button = ev.button;
1887 mouse_report (ev); 1894 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1895#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1896
1890 } 1897 }
1891 else 1898 else
1892 { 1899 {
1893 if (ev.button != MEvent.button) 1900 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1901 MEvent.clicks = 0;
1895 1902
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1903 switch (ev.button)
1898 { 1904 {
1899 case Button1: 1905 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1906 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1907 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1908#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1909 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1910#else
1905 selection.rect = false; 1911 selection.rect = false;
1906#endif 1912#endif
1907 1913
1908 /* allow shift+left click to extend selection */ 1914 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1915 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1916 {
1911 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1918 selection_rotate (ev.x, ev.y);
1913 else 1919 else
1914 selection_extend (ev.x, ev.y, 1); 1920 selection_extend (ev.x, ev.y, 1);
1915 } 1921 }
1916 else 1922 else
1917 { 1923 {
1918 if (MEvent.button == Button1 && clickintime) 1924 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1925 MEvent.clicks++;
1920 else 1926 else
1921 MEvent.clicks = 1; 1927 MEvent.clicks = 1;
1922 1928
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1929 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1930 }
1925 1931
1926 MEvent.button = Button1; 1932 MEvent.button = Button1;
1927 break; 1933 break;
1928 1934
1929 case Button3: 1935 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1936 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1932 else 1938 else
1933 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
1934 1940
1935 MEvent.button = Button3; 1941 MEvent.button = Button3;
1936 break; 1942 break;
1937 } 1943 }
1938 } 1944 }
1939 1945
1940 MEvent.time = ev.time; 1946 MEvent.time = ev.time;
1941 return; 1947 return;
1942 } 1948 }
1943 1949
1944 /* 1950 /*
1945 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1946 */ 1952 */
1947 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 1954 {
1949 scrollBar.setIdle (); 1955 page_dirn direction = NO_DIR;
1956
1957 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */
1961
1962 scrollBar.state = STATE_IDLE;
1950 /* 1963 /*
1951 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 1965 * move up if mouse is above slider
1953 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1954 * 1967 *
… …
1963 /* 1976 /*
1964 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1967 */ 1980 */
1968 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1978 else 1985 else
1979 switch (ev.button) 1986 switch (ev.button)
1980 { 1987 {
1981 case Button2: 1988 case Button2:
… …
1988 tt_printf ("\033[5~"); 1995 tt_printf ("\033[5~");
1989 break; 1996 break;
1990 } 1997 }
1991 } 1998 }
1992 else 1999 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2001 {
2000 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2003 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2005 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2007#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2018 { 2009 {
2019 if (upordown < 0) 2010 if (direction == UP)
2020 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2021 else 2012 else
2022 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2023 } 2014 }
2024 } 2015 }
2025 else 2016 else
2026 switch (ev.button) 2017 switch (ev.button)
2027 { 2018 {
2028 case Button2: 2019 case Button2:
2029 switch (scrollbar_align) 2020 switch (scrollBar.align)
2030 { 2021 {
2031 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2032 csrO = 0; 2023 csrO = 0;
2033 break; 2024 break;
2034 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
… …
2040 } 2031 }
2041 2032
2042 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2043 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2046 2037
2047 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2048 break; 2039 break;
2049 2040
2050 case Button1: 2041 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2054 2045
2055 case Button3: 2046 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
… …
2066 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2067# else 2058# else
2068 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2069# endif 2060# endif
2070 else 2061 else
2071 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2072 } 2063 }
2073 else 2064 else
2074 { 2065 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2067 (nrow
2077 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2078 / scrollbar_size ())); 2069 / scrollBar.size ()));
2079 } 2070 }
2080 2071
2081 break; 2072 break;
2082 } 2073 }
2083 } 2074 }
… …
2093 2084
2094 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2086 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2088
2098 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2099 { 2090 {
2100 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2101 scrollbar_show (0); 2092 scrollBar.show (0);
2102 } 2093 }
2103 2094
2104#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2107#endif 2097#endif
2108 2098
2109 if (ev.window == vt) 2099 if (ev.window == vt)
2110 { 2100 {
2101 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2102 return;
2103
2111#if ISO_14755 2104#if ISO_14755
2112 // 5.4 2105 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2106 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2107 return;
2115#endif 2108#endif
2109
2116 if (reportmode) 2110 if (reportmode)
2117 { 2111 {
2118 /* mouse report from vt window */ 2112 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2113 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2114 if (ev.button >= 4)
… …
2131 mouse_report (ev); 2125 mouse_report (ev);
2132 } 2126 }
2133#else /* MOUSE_REPORT_DOUBLECLICK */ 2127#else /* MOUSE_REPORT_DOUBLECLICK */
2134 MEvent.button = AnyButton; 2128 MEvent.button = AnyButton;
2135 mouse_report (ev); 2129 mouse_report (ev);
2136#endif /* MOUSE_REPORT_DOUBLECLICK */ 2130#endif /* MOUSE_REPORT_DOUBLECLICK */
2137 return; 2131 return;
2138 } 2132 }
2139 2133
2140 /* 2134 /*
2141 * dumb hack to compensate for the failure of click-and-drag 2135 * dumb hack to compensate for the failure of click-and-drag
… …
2144 if (priv_modes & PrivMode_mouse_report 2138 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2139 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2140 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2141 selection_extend (ev.x, ev.y, 0);
2148 2142
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2143 switch (ev.button)
2153 { 2144 {
2154 case Button1: 2145 case Button1:
2155 case Button3: 2146 case Button3:
2156 selection_make (ev.time); 2147 selection_make (ev.time);
2157 break; 2148 break;
2149
2158 case Button2: 2150 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2153 break;
2154
2161#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2162 case Button4: 2156 case Button4:
2163 case Button5: 2157 case Button5:
2164 { 2158 {
2165 int i; 2159 int i;
… …
2167 2161
2168 v = ev.button == Button4 ? UP : DN; 2162 v = ev.button == Button4 ? UP : DN;
2169 2163
2170 if (ev.state & ShiftMask) 2164 if (ev.state & ShiftMask)
2171 i = 1; 2165 i = 1;
2172 else if (OPTION (Opt_mouseWheelScrollPage)) 2166 else if (option (Opt_mouseWheelScrollPage))
2173 i = nrow - 1; 2167 i = nrow - 1;
2174 else 2168 else
2175 i = 5; 2169 i = 5;
2176 2170
2177# ifdef MOUSE_SLIP_WHEELING 2171# ifdef MOUSE_SLIP_WHEELING
… …
2179 { 2173 {
2180 mouse_slip_wheel_speed += v ? -1 : 1; 2174 mouse_slip_wheel_speed += v ? -1 : 1;
2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2183 2177
2184 if (slip_wheel_ev.at < NOW) 2178 if (!slip_wheel_ev.is_active ())
2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2186
2187 slip_wheel_ev.start ();
2188 } 2180 }
2189 else 2181 else
2182# endif
2190 { 2183 {
2191# endif
2192 scr_page (v, i); 2184 scr_page (v, i);
2193 scrollbar_show (1); 2185 scrollBar.show (1);
2194# ifdef MOUSE_SLIP_WHEELING
2195 } 2186 }
2196# endif
2197 } 2187 }
2198 break; 2188 break;
2199#endif 2189#endif
2200 } 2190 }
2201 } 2191 }
2202} 2192}
2203 2193
2204#ifdef TRANSPARENT
2205#if TINTING
2206/* taken from aterm-0.4.2 */
2207
2208typedef uint32_t RUINT32T;
2209
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{
2212 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i;
2218
2219 Visual *visual = display->visual;
2220
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222
2223 /* for convenience */
2224 mask_r = visual->red_mask;
2225 mask_g = visual->green_mask;
2226 mask_b = visual->blue_mask;
2227
2228 /* boring lookup table pre-initialization */
2229 switch (srcImage->bits_per_pixel) {
2230 case 15:
2231 if ((mask_r != 0x7c00) ||
2232 (mask_g != 0x03e0) ||
2233 (mask_b != 0x001f))
2234 return;
2235 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2236 lookup_r = lookup;
2237 lookup_g = lookup+32;
2238 lookup_b = lookup+32+32;
2239 sh_r = 10;
2240 sh_g = 5;
2241 sh_b = 0;
2242 break;
2243 case 16:
2244 if ((mask_r != 0xf800) ||
2245 (mask_g != 0x07e0) ||
2246 (mask_b != 0x001f))
2247 return;
2248 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2249 lookup_r = lookup;
2250 lookup_g = lookup+32;
2251 lookup_b = lookup+32+64;
2252 sh_r = 11;
2253 sh_g = 5;
2254 sh_b = 0;
2255 break;
2256 case 24:
2257 if ((mask_r != 0xff0000) ||
2258 (mask_g != 0x00ff00) ||
2259 (mask_b != 0x0000ff))
2260 return;
2261 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2262 lookup_r = lookup;
2263 lookup_g = lookup+256;
2264 lookup_b = lookup+256+256;
2265 sh_r = 16;
2266 sh_g = 8;
2267 sh_b = 0;
2268 break;
2269 case 32:
2270 if ((mask_r != 0xff0000) ||
2271 (mask_g != 0x00ff00) ||
2272 (mask_b != 0x0000ff))
2273 return;
2274 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2275 lookup_r = lookup;
2276 lookup_g = lookup+256;
2277 lookup_b = lookup+256+256;
2278 sh_r = 16;
2279 sh_g = 8;
2280 sh_b = 0;
2281 break;
2282 default:
2283 return; /* we do not support this color depth */
2284 }
2285
2286 /* prepare limits for color transformation (each channel is handled separately) */
2287 if (shade < 0) {
2288 shade = -shade;
2289 if (shade < 0) shade = 0;
2290 if (shade > 100) shade = 100;
2291
2292 lower_lim_r = 65535-rm;
2293 lower_lim_g = 65535-gm;
2294 lower_lim_b = 65535-bm;
2295
2296 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2297 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2298 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2299
2300 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2301 } else {
2302 if (shade < 0) shade = 0;
2303 if (shade > 100) shade = 100;
2304
2305 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2306
2307 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2308 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2309 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2310 }
2311
2312 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2313 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2314 {
2315 unsigned int tmp;
2316
2317 tmp = lower_lim_r;
2318 lower_lim_r = lower_lim_b;
2319 lower_lim_b = tmp;
2320
2321 tmp = upper_lim_r;
2322 upper_lim_r = upper_lim_b;
2323 upper_lim_b = tmp;
2324 }
2325
2326 /* fill our lookup tables */
2327 for (i = 0; i <= mask_r>>sh_r; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2331 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2332 lookup_r[i] = (tmp/65535)<<sh_r;
2333 }
2334 for (i = 0; i <= mask_g>>sh_g; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2338 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2339 lookup_g[i] = (tmp/65535)<<sh_g;
2340 }
2341 for (i = 0; i <= mask_b>>sh_b; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2345 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2346 lookup_b[i] = (tmp/65535)<<sh_b;
2347 }
2348
2349 /* apply table to input image (replacing colors by newly calculated ones) */
2350 switch (srcImage->bits_per_pixel)
2351 {
2352 case 15:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0x7c00)>>10] |
2364 lookup_g[(*p & 0x03e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 16:
2372 {
2373 unsigned short *p1, *pf, *p, *pl;
2374 p1 = (unsigned short *) srcImage->data;
2375 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width;
2380 for (; p < pl; p++)
2381 {
2382 *p = lookup_r[(*p & 0xf800)>>11] |
2383 lookup_g[(*p & 0x07e0)>> 5] |
2384 lookup_b[(*p & 0x001f)];
2385 }
2386 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 24:
2391 {
2392 unsigned char *p1, *pf, *p, *pl;
2393 p1 = (unsigned char *) srcImage->data;
2394 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width * 3;
2399 for (; p < pl; p += 3)
2400 {
2401 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2402 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2403 p[2] = lookup_r[(p[2] & 0x0000ff)];
2404 }
2405 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 32:
2410 {
2411 RUINT32T *p1, *pf, *p, *pl;
2412 p1 = (RUINT32T *) srcImage->data;
2413 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width;
2419 for (; p < pl; p++)
2420 {
2421 *p = lookup_r[(*p & 0xff0000)>>16] |
2422 lookup_g[(*p & 0x00ff00)>> 8] |
2423 lookup_b[(*p & 0x0000ff)] |
2424 (*p & ~0xffffff);
2425 }
2426 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 }
2431
2432 free (lookup);
2433}
2434#endif
2435
2436/*
2437 * Check our parents are still who we think they are.
2438 * Do transparency updates if required
2439 */
2440int
2441rxvt_term::check_our_parents ()
2442{
2443 int i, pchanged, aformat, have_pixmap, rootdepth;
2444 unsigned long nitems, bytes_after;
2445 Atom atype;
2446 unsigned char *prop = NULL;
2447 Window root, oldp, *list;
2448 Pixmap rootpixmap = None;
2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (disp, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (disp, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !rs[Rs_color + Color_tint]
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (disp, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
2542 allowedxerror = -1;
2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (disp, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (disp, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2575
2576 ShadeXImage (display, image, shade, rm, gm, bm);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (disp, vt,
2581 szHint.width, szHint.height, image->depth);
2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2584 nx, ny, image->width, image->height);
2585 XFreeGC (disp, gc);
2586 XDestroyImage (image);
2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2588 XClearWindow (disp, parent[0]);
2589
2590 if (!am_transparent || !am_pixmap_trans)
2591 pchanged = 1;
2592
2593 am_transparent = am_pixmap_trans = 1;
2594 }
2595 }
2596
2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
2600 {
2601 unsigned int n;
2602 /*
2603 * InheritPixmap transparency
2604 */
2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606 {
2607 oldp = parent[i];
2608 XQueryTree (disp, parent[i - 1], &root,
2609 &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 {
2628 for (; n < (unsigned int)i; n++)
2629 {
2630 XGetWindowAttributes (disp, parent[n], &wattr);
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637 }
2638
2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2640 {
2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2643 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */
2645 }
2646 else
2647 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++)
2654 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]);
2657 }
2658
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2660 am_transparent = 1;
2661 }
2662
2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664 parent[i] = None;
2665 }
2666
2667 if (scrollBar.win)
2668 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle ();
2671 scrollbar_show (0);
2672 }
2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2679 }
2680
2681 return pchanged;
2682}
2683#endif
2684
2685/*}}} */ 2194/*}}} */
2686 2195
2687bool 2196void
2688rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2689{ 2198{
2690 bool flag = false;
2691 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2692 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2693 2201
2694 for (;;) 2202 for (;;)
2695 { 2203 {
2696 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2697 { 2205 {
2698 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2699 ch = next_char (); 2207 ch = next_char ();
2700 2208
2701 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2702 break; 2210 break;
2703 } 2211 }
2704 2212
2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2706 { 2214 {
2707 if (!seen_input) 2215 if (expect_false (!seen_input))
2708 { 2216 {
2709 seen_input = 1; 2217 seen_input = 1;
2710 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2711 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2712 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
… …
2725 wchar_t *str = buf; 2233 wchar_t *str = buf;
2726 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2727 2235
2728 for (;;) 2236 for (;;)
2729 { 2237 {
2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2731 break; 2239 break;
2732 2240
2733 *str++ = ch; 2241 *str++ = ch;
2734 2242
2735 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2736 { 2244 {
2737 if (ch == C0_LF) 2245 if (ch == C0_LF)
2738 nlines++; 2246 nlines++;
2739 2247
2740 refresh_count++; 2248 refresh_count++;
2741 2249
2742 if (!OPTION (Opt_jumpScroll) 2250 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2744 { 2251 {
2745 refreshnow = true;
2746 refresh_count = 0; 2252 refresh_count = 0;
2253
2254 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2255 {
2256 refreshnow = true;
2747 ch = NOCHAR; 2257 ch = NOCHAR;
2748 break; 2258 break;
2259 }
2749 } 2260 }
2750 2261
2751 // scr_add_lines only works for nlines <= nrow - 1. 2262 // scr_add_lines only works for nlines <= nrow - 1.
2752 if (nlines >= nrow - 1) 2263 if (nlines >= nrow - 1)
2753 { 2264 {
… …
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2292 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2782 scr_add_lines (buf, str - buf, nlines); 2293 scr_add_lines (buf, str - buf, nlines);
2783 2294
2784 /* 2295 /*
2785 * If there have been a lot of new lines, then update the screen 2296 * If there have been a lot of new lines, then update the screen
2786 * What the heck I'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2787 * the number of pages between refreshes is refresh_limit, which 2298 * if skipScroll is enabled.
2788 * is incremented here because we must be doing flat-out scrolling.
2789 */ 2299 */
2790 if (refreshnow) 2300 if (refreshnow)
2791 { 2301 {
2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793 refresh_limit++;
2794 else
2795 {
2796 flag = true;
2797 scr_refresh (); 2302 scr_refresh ();
2798 want_refresh = 1; 2303 want_refresh = 1;
2799 }
2800 } 2304 }
2801
2802 } 2305 }
2803 else 2306 else
2804 { 2307 {
2805 try 2308 try
2806 { 2309 {
… …
2814 } 2317 }
2815 2318
2816 ch = NOCHAR; 2319 ch = NOCHAR;
2817 } 2320 }
2818 } 2321 }
2819
2820 return flag;
2821} 2322}
2822 2323
2823// read the next character 2324// read the next character
2824wchar_t 2325wchar_t
2825rxvt_term::next_char () 2326rxvt_term::next_char () NOTHROW
2826{ 2327{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2329 {
2829 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2831 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2832 2333
2833 wchar_t wc; 2334 wchar_t wc;
2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2835 2336
… …
2839 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2840 break; 2341 break;
2841 } 2342 }
2842 2343
2843 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2845 2349
2846 // assume wchar == unicode 2350 // assume wchar == unicode
2847 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2848 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2849 } 2353 }
… …
2851 return NOCHAR; 2355 return NOCHAR;
2852} 2356}
2853 2357
2854// read the next octet 2358// read the next octet
2855uint32_t 2359uint32_t
2856rxvt_term::next_octet () 2360rxvt_term::next_octet () NOTHROW
2857{ 2361{
2858 return cmdbuf_ptr < cmdbuf_endp 2362 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2363 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2364 : NOCHAR;
2861} 2365}
2366
2367static class out_of_input out_of_input;
2862 2368
2863/* rxvt_cmd_getc () - Return next input character */ 2369/* rxvt_cmd_getc () - Return next input character */
2864/* 2370/*
2865 * Return the next input character after first passing any keyboard input 2371 * Return the next input character after first passing any keyboard input
2866 * to the command. 2372 * to the command.
2867 */ 2373 */
2868wchar_t 2374wchar_t
2869rxvt_term::cmd_getc () 2375rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2376{
2871 wchar_t c = next_char (); 2377 wchar_t c = next_char ();
2872 2378
2873 if (c == NOCHAR) 2379 if (c == NOCHAR)
2874 throw out_of_input; 2380 throw out_of_input;
2875 2381
2876 return c; 2382 return c;
2877} 2383}
2878 2384
2879uint32_t 2385uint32_t
2880rxvt_term::cmd_get8 () 2386rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2387{
2882 uint32_t c = next_octet (); 2388 uint32_t c = next_octet ();
2883 2389
2884 if (c == NOCHAR) 2390 if (c == NOCHAR)
2885 throw out_of_input; 2391 throw out_of_input;
… …
2891/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2892#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2893FILE * 2399FILE *
2894rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2895{ 2401{
2896 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2897 2403
2898 if (stream == NULL) 2404 if (stream == NULL)
2899 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2900 2406
2901 return stream; 2407 return stream;
… …
2912 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2913 */ 2419 */
2914void 2420void
2915rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2916{ 2422{
2917 int done; 2423 FILE *fd = popen_printer ();
2918 FILE *fd;
2919 2424
2920 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2921 return; 2426 return;
2922 2427
2923 /* 2428 /*
2924 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2925 * is received. 2430 * is received.
2926 */ 2431 */
2927 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2928 { 2433 {
2929 unsigned char buf[8]; 2434 unsigned char buf[8];
2930 unicode_t ch; 2435 unicode_t ch;
2931 unsigned int i, len; 2436 unsigned int i, len;
2932 2437
… …
2951 { 2456 {
2952 if ((buf[len++] = cmd_getc ()) == 'i') 2457 if ((buf[len++] = cmd_getc ()) == 'i')
2953 break; /* done = 1 */ 2458 break; /* done = 1 */
2954 } 2459 }
2955 } 2460 }
2956 2461
2957 for (i = 0; i < len; i++) 2462 for (i = 0; i < len; i++)
2958 if (putc (buf[i], fd) == EOF) 2463 if (putc (buf[i], fd) == EOF)
2959 { 2464 {
2960 done = 1; 2465 done = 1;
2961 break; 2466 break;
… …
2963 } 2468 }
2964 } 2469 }
2965 2470
2966 pclose_printer (fd); 2471 pclose_printer (fd);
2967} 2472}
2968#endif /* PRINTPIPE */ 2473#endif /* PRINTPIPE */
2969/*}}} */ 2474/*}}} */
2970 2475
2971/* *INDENT-OFF* */ 2476/* *INDENT-OFF* */
2972enum { 2477enum {
2973 C1_40 = 0x40, 2478 C1_40 = 0x40,
… …
3023 process_dcs_seq (); 2528 process_dcs_seq ();
3024 break; 2529 break;
3025 case 0x9b: /* CSI */ 2530 case 0x9b: /* CSI */
3026 process_csi_seq (); 2531 process_csi_seq ();
3027 break; 2532 break;
3028 case 0x9d: /* CSI */ 2533 case 0x9d: /* OSC */
3029 process_osc_seq (); 2534 process_osc_seq ();
3030 break; 2535 break;
3031#endif 2536#endif
3032 } 2537 }
3033} 2538}
… …
3077 break; 2582 break;
3078 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
3079 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3080 break; 2585 break;
3081 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
3082 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
3083 break; 2588 break;
3084 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
3085 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
3086 /* unimplemented */ 2591 /* unimplemented */
3087 break; 2592 break;
… …
3123 scr_charset_set (2, (unsigned int)cmd_getc ()); 2628 scr_charset_set (2, (unsigned int)cmd_getc ());
3124 break; 2629 break;
3125 case '+': 2630 case '+':
3126 scr_charset_set (3, (unsigned int)cmd_getc ()); 2631 scr_charset_set (3, (unsigned int)cmd_getc ());
3127 break; 2632 break;
3128#if ENABLE_FRILLS 2633#if !ENABLE_MINIMAL
3129 case '6': 2634 case '6':
3130 scr_backindex (); 2635 scr_backindex ();
3131 break; 2636 break;
3132#endif 2637#endif
3133 case '7': 2638 case '7':
3134 scr_cursor (SAVE); 2639 scr_cursor (SAVE);
3135 break; 2640 break;
3136 case '8': 2641 case '8':
3137 scr_cursor (RESTORE); 2642 scr_cursor (RESTORE);
3138 break; 2643 break;
3139#if ENABLE_FRILLS 2644#if !ENABLE_MINIMAL
3140 case '9': 2645 case '9':
3141 scr_forwardindex (); 2646 scr_forwardindex ();
3142 break; 2647 break;
3143#endif 2648#endif
3144 case '=': 2649 case '=':
3145 case '>': 2650 case '>':
3146 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
3147 break; 2652 break;
3148 2653
3149 case C1_40: 2654 case C1_40:
3150 cmd_getc (); 2655 cmd_getc ();
3151 break; 2656 break;
… …
3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3191 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3193 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
3194 2699
3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3196 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
3197 process_csi_seq (); 2702 process_csi_seq ();
3198 break; 2703 break;
3199 2704
3200 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3201 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
3202 process_osc_seq (); 2707 process_osc_seq ();
3203 break; 2708 break;
3204 2709
3205 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3206 case 'c': 2711 case 'c':
3207 mbstate.reset (); 2712 mbstate.reset ();
3208 scr_poweron (); 2713 scr_poweron ();
3209 scrollbar_show (1); 2714 scrollBar.show (1);
3210 break; 2715 break;
3211 2716
3212 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3213 case 'n': 2718 case 'n':
3214 scr_charset_choose (2); 2719 scr_charset_choose (2);
… …
3259rxvt_term::process_csi_seq () 2764rxvt_term::process_csi_seq ()
3260{ 2765{
3261 unicode_t ch, priv, i; 2766 unicode_t ch, priv, i;
3262 unsigned int nargs, p; 2767 unsigned int nargs, p;
3263 int n, ndef; 2768 int n, ndef;
3264 int arg[ESC_ARGS]; 2769 int arg[ESC_ARGS] = { };
3265 2770
3266 for (nargs = ESC_ARGS; nargs > 0;) 2771 nargs = 0;
3267 arg[--nargs] = 0;
3268 2772
3269 priv = 0; 2773 priv = 0;
3270 ch = cmd_getc (); 2774 ch = cmd_getc ();
3271 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2776 {
3272 { /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
3273 priv = ch; 2778 priv = ch;
3274 ch = cmd_getc (); 2779 ch = cmd_getc ();
3275 } 2780 }
3276 2781
3277 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
3306 ndef = get_byte_array_bit (csi_defaults, i); 2811 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 2812 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 2813 if (arg[p] == -1)
3309 arg[p] = ndef; 2814 arg[p] = ndef;
3310 2815
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 2816 /*
3319 * private mode handling 2817 * private mode handling
3320 */ 2818 */
3321 if (priv) 2819 if (priv)
3322 { 2820 {
3323 switch (priv) 2821 switch (priv)
3324 { 2822 {
3325 case '>': 2823 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 2824 if (ch == CSI_DA) /* secondary device attributes */
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2825 {
2826 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2827 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2828 //
2829 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2830 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2831 // versions.
2832 //
2833 tt_printf ("\033[>%d;95;0c", 'U');
2834 }
3328 break; 2835 break;
2836
3329 case '?': 2837 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3333 } 2853 }
2854 break;
2855 }
2856
3334 return; 2857 return;
3335 } 2858 }
3336 2859
3337 switch (ch) 2860 switch (ch)
3338 { 2861 {
… …
3458 break; 2981 break;
3459 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3460 scr_report_position (); 2983 scr_report_position ();
3461 break; 2984 break;
3462 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3463 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3464 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3465 break; 2988 break;
3466 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3468 break; 2991 break;
… …
3535 break; 3058 break;
3536 case CSI_75: 3059 case CSI_75:
3537 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3538 break; 3061 break;
3539 3062
3540#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
3541 case CSI_74: 3064 case CSI_74:
3542 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3543 break; 3066 break;
3544#endif 3067#endif
3545 3068
… …
3552 break; 3075 break;
3553 } 3076 }
3554} 3077}
3555/*}}} */ 3078/*}}} */
3556 3079
3557#if ENABLE_FRILLS 3080#if !ENABLE_MINIMAL
3558/* ARGSUSED */ 3081/* ARGSUSED */
3559void 3082void
3560rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561{ 3084{
3562 int x, y; 3085 int x, y;
3563 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3564 Window wdummy; 3087 Window wdummy;
3565 dDisp; 3088
3089 dLocal (Display *, dpy);
3566 3090
3567 if (nargs == 0) 3091 if (nargs == 0)
3568 return; 3092 return;
3569 3093
3570 switch (args[0]) 3094 switch (args[0])
3571 { 3095 {
3572 /* 3096 /*
3573 * commands 3097 * commands
3574 */ 3098 */
3575 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3576 XMapWindow (disp, parent[0]); 3100 XMapWindow (dpy, parent[0]);
3577 break; 3101 break;
3578 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3579 XIconifyWindow (disp, parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3580 break; 3104 break;
3581 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3582 XMoveWindow (disp, parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3583 break; 3107 break;
3584 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3110 break;
3587 case 5: /* raise window */ 3111 case 5: /* raise window */
3588 XRaiseWindow (disp, parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3589 break; 3113 break;
3590 case 6: /* lower window */ 3114 case 6: /* lower window */
3591 XLowerWindow (disp, parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3592 break; 3116 break;
3593 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3594 scr_touch (true); 3118 scr_touch (true);
3595 break; 3119 break;
3596 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
… …
3603 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3128 set_widthheight ((unsigned int)width,
3605 (unsigned int) (args[1] * fheight)); 3129 (unsigned int) (args[1] * fheight));
3606 break; 3130 break;
3607 3131
3608
3609 /* 3132 /*
3610 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3611 */ 3134 */
3612 case 11: /* report window state */ 3135 case 11: /* report window state */
3613 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615 break; 3138 break;
3616 case 13: /* report window position */ 3139 case 13: /* report window position */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 XTranslateCoordinates (disp, parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3619 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3620 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3621 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3622 break; 3145 break;
3623 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626 break; 3149 break;
3627 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break; 3152 break;
… …
3631 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632 break; 3155 break;
3633 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3634 { 3157 {
3635 char *s; 3158 char *s;
3636 XGetIconName (disp, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s); 3161 XFree (s);
3639 } 3162 }
3640 break; 3163 break;
3641 case 21: /* report window title */ 3164 case 21: /* report window title */
3642 { 3165 {
3643 char *s; 3166 char *s;
3644 XFetchName (disp, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s); 3169 XFree (s);
3647 } 3170 }
3648 break; 3171 break;
3649 } 3172 }
3650} 3173}
… …
3677 seen_esc = true; 3200 seen_esc = true;
3678 continue; 3201 continue;
3679 } 3202 }
3680 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3681 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3682 else if (ch < 0x20) 3207 else if (ch < 0x20)
3683 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3684 3209
3685 seen_esc = false; 3210 seen_esc = false;
3686 3211
3687 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3688 // stop at some sane length 3213 // stop at some sane length
3689 return NULL; 3214 return NULL;
3690 3215
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
3694 string[n++] = ch; 3216 string[n++] = ch;
3695 } 3217 }
3696 3218
3697 string[n++] = '\0'; 3219 string[n++] = '\0';
3698 3220
3699 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3750void 3272void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{ 3274{
3753 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3754 { 3276 {
3755 unsigned short r, g, b; 3277 rgba c;
3756 pix_colors_focused[color].get (display, r, g, b); 3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758 } 3286 }
3759 else 3287 else
3760 set_window_color (color, str); 3288 set_window_color (color, str);
3761} 3289}
3762 3290
3763/* 3291/*
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3293 */
3766void 3294void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3768{ 3296{
3769 int changed = 0;
3770 int color; 3297 int color;
3771 char *buf, *name; 3298 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3300 int saveop = op;
3774 dDisp; 3301
3302 dLocal (Display *, dpy);
3775 3303
3776 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3777 switch (op) 3309 switch (op)
3778 { 3310 {
3779 case XTerm_name: 3311 case XTerm_name:
3780 set_title (str); 3312 set_title (str);
3781 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3795 unsigned long bytes_after; 3327 unsigned long bytes_after;
3796 unsigned char *value = 0; 3328 unsigned char *value = 0;
3797 const char *str = ""; 3329 const char *str = "";
3798 3330
3799 if (prop 3331 if (prop
3800 && XGetWindowProperty (disp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None 3336 && actual_type != None
3805 && actual_format == 8) 3337 && actual_format == 8)
3806 str = (const char *)(value); 3338 str = (const char *)(value);
3807 3339
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3809 3341
3810 XFree (value); 3342 XFree (value);
3811 } 3343 }
3812 else 3344 else
3813 { 3345 {
3814 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3815 3347
3816 if (eq) 3348 if (eq)
3817 { 3349 {
3818 *eq = 0; 3350 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3820 } 3352 }
3821 else 3353 else
3822 XDeleteProperty (disp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3823 display->atom (str)); 3355 display->atom (str));
3824 } 3356 }
3825 break; 3357 break;
3826 3358
3827 case XTerm_Color: 3359 case XTerm_Color:
… …
3837 break; 3369 break;
3838 3370
3839 if ((buf = strchr (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3840 *buf++ = '\0'; 3372 *buf++ = '\0';
3841 3373
3842 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
3849 set_window_color (color, name);
3850 } 3375 }
3851 break; 3376 break;
3377 case Rxvt_restoreFG:
3852 case XTerm_Color00: 3378 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3854 break; 3380 break;
3381 case Rxvt_restoreBG:
3855 case XTerm_Color01: 3382 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3857 break; 3384 break;
3858#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3387 process_color_seq (op, Color_cursor, str, resp);
3861 break; 3388 break;
3862#endif 3389#endif
3863 case XTerm_Color_pointer_fg: 3390 case XTerm_Color_pointer_fg:
3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3392 break;
3866 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3395 break;
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3396#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV: 3397 case XTerm_Color_RV:
3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3398 process_color_seq (op, Color_RV, str, resp);
3872 break; 3399 break;
3873 case Rxvt_Color_BD: 3400 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3401 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3402 process_color_seq (op, Color_BD, str, resp);
3876 break; 3403 break;
3877 case Rxvt_Color_UL: 3404 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3405 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3406 process_color_seq (op, Color_UL, str, resp);
3880 break; 3407 break;
3881 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3883 break; 3410 break;
3884#endif 3411#endif
3885#if TRANSPARENT && TINTING 3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3415#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3888 check_our_parents (); 3418 {
3889 if (am_transparent) 3419 bool changed = false;
3890 want_full_refresh = want_refresh = 1;
3891 break;
3892#endif
3893 3420
3421 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425
3426 if (changed)
3427 update_background ();
3428 }
3429
3430 break;
3431#endif
3432
3433#if BG_IMAGE_FROM_FILE
3894 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3895 if (*str != ';') 3435 if (!strcmp (str, "?"))
3896 { 3436 {
3897#if XPM_BACKGROUND 3437 char str[256];
3898 scale_pixmap (""); /* reset to default scaling */ 3438
3899 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3900 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3901#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3902 } 3443 }
3903 3444 else
3904 while ((str = strchr (str, ';')) != NULL)
3905 { 3445 {
3446 int changed = 0;
3447
3448 if (*str != ';')
3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458
3459 while (str)
3460 {
3906 str++; 3461 str++;
3907#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3908 changed += scale_pixmap (str); 3463 changed++;
3909#endif 3464 str = strchr (str, ';');
3465 }
3466
3467 if (changed)
3468 update_background ();
3910 } 3469 }
3911
3912 if (changed)
3913 {
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap ();
3916 scr_touch (true);
3917#endif
3918 }
3919 break; 3470 break;
3920 3471#endif
3921 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str);
3923 break;
3924 case Rxvt_restoreBG:
3925 set_window_color (Color_bg, str);
3926 break;
3927 3472
3928 case XTerm_logfile: 3473 case XTerm_logfile:
3929 // TODO, when secure mode? 3474 // TODO, when secure mode?
3930 break; 3475 break;
3931 3476
… …
3949 case URxvt_italicFont: 3494 case URxvt_italicFont:
3950 case URxvt_boldItalicFont: 3495 case URxvt_boldItalicFont:
3951#endif 3496#endif
3952 if (query) 3497 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop, 3498 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3499 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "", 3500 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp); 3501 resp);
3957 else 3502 else
3958 { 3503 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3504 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3962 allocated.push_back ((void *)res); 3507 allocated.push_back ((void *)res);
3963 set_fonts (); 3508 set_fonts ();
3964 } 3509 }
3965 break; 3510 break;
3966 3511
3967#if ENABLE_FRILLS 3512 case URxvt_version:
3513 if (query)
3514 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3515 op,
3516 rs[Rs_name], VERSION[0], VERSION[2],
3517 resp);
3518 break;
3519
3520#if !ENABLE_MINIMAL
3968 case URxvt_locale: 3521 case URxvt_locale:
3969 if (query) 3522 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3523 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3971 else 3524 else
3972 { 3525 {
3973 set_locale (str); 3526 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8); 3527 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3528 init_xlocale ();
… …
3990 break; 3543 break;
3991#endif 3544#endif
3992 3545
3993#if ENABLE_PERL 3546#if ENABLE_PERL
3994 case URxvt_perl: 3547 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3548 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3996 ; // no responses yet
3997 break; 3549 break;
3998#endif 3550#endif
3999 } 3551 }
4000} 3552}
4001/*----------------------------------------------------------------------*/ 3553/*----------------------------------------------------------------------*/
… …
4024 { 3576 {
4025 if (mode == 'r') 3577 if (mode == 'r')
4026 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4027 else 3579 else
4028 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3580 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4029 PrivMode (state, bit); 3581 set_privmode (bit, state);
4030 } 3582 }
4031 3583
4032 return state; 3584 return state;
4033} 3585}
4034 3586
4035/* we're not using priv _yet_ */ 3587/* we're not using priv _yet_ */
4036void 3588void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3589rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 3590{
4039 unsigned int i, j; 3591 unsigned int i, j;
4040 int state; 3592 int state;
4041 3593
4042 static const struct 3594 static const struct
4043 { 3595 {
4044 const int argval; 3596 const int argval;
4045 const unsigned long bit; 3597 const unsigned long bit;
4046 }
4047
4048 argtopriv[] = { 3598 } argtopriv[] = {
4049 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
4050 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4051 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
4052 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
4053 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
4054 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
4055 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
4056 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
4057 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
4058 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
4059 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4060#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
4061 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
4062#endif 3613#endif
4063 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
4064 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
4065 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
4066 // 45 margin bell NYI 3618 // 45 margin bell NYI
4067 // 46 start logging 3619 // 46 start logging
4068 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
4069 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4070#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
4071 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
4072#endif 3624#endif
4073 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
4074 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3626 { 1002, PrivMode_MouseBtnEvent },
4075 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3627 { 1003, PrivMode_MouseAnyEvent },
4076 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4077 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4078 { 1011, PrivMode_Keypress }, // rxvt extension 3629 { 1011, PrivMode_Keypress }, // rxvt extension
4079 // 1035 enable modifiers for alt, numlock NYI 3630 // 1035 enable modifiers for alt, numlock NYI
4080 // 1036 send ESC for meta keys NYI 3631 // 1036 send ESC for meta keys NYI
4081 // 1037 send DEL for keypad delete NYI 3632 // 1037 send DEL for keypad delete NYI
4082 { 1047, PrivMode_Screen }, 3633 { 1047, PrivMode_Screen },
4083 // 1048 save and restore cursor 3634 // 1048 save and restore cursor
4084 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4085 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste },
4086 }; 3638 };
4087 3639
4088 if (nargs == 0) 3640 if (nargs == 0)
4089 return; 3641 return;
4090 3642
… …
4115 3667
4116 scr_touch (true); 3668 scr_touch (true);
4117 break; 3669 break;
4118#endif 3670#endif
4119 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
4120 case 1049:
4121 if (OPTION (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
4122 if (mode == 0) 3673 if (mode == 0)
4123 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
4124 else if (mode == 1) 3675 else if (mode == 1)
4125 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
4126 break; 3677 break;
… …
4134 case 2: /* VT52 mode */ 3685 case 2: /* VT52 mode */
4135 /* oddball mode. should be set regardless of set/reset 3686 /* oddball mode. should be set regardless of set/reset
4136 * parameter. Return from VT52 mode with an ESC < from 3687 * parameter. Return from VT52 mode with an ESC < from
4137 * within VT52 mode 3688 * within VT52 mode
4138 */ 3689 */
4139 PrivMode (1, PrivMode_vt52); 3690 set_privmode (PrivMode_vt52, 1);
4140 break; 3691 break;
4141 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
4142 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
4143 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4144 break; 3695 break;
4145 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4146 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
4147 break; 3698 break;
4148 case 5: /* reverse video */ 3699 case 5: /* reverse video */
… …
4155 scr_autowrap (state); 3706 scr_autowrap (state);
4156 break; 3707 break;
4157 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
4158 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4159 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3712 break;
4162#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
4163 case scrollBar_esc: 3714 case scrollBar_esc:
4164 if (scrollbar_mapping (state)) 3715 if (scrollBar.map (state))
4165 { 3716 {
4166 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
4167 scr_touch (true); 3718 scr_touch (true);
4168 } 3719 }
4169 break; 3720 break;
… …
4178 break; 3729 break;
4179 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4180 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4181 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4182 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4183 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4184 break; 3735 break;
4185#if 0
4186 case 1001: 3736 case 1002:
4187 break; /* X11 mouse highlighting */ 3737 case 1003:
4188#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746
3747 vt_select_input ();
3748 break;
4189 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
4190 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
4191 break; 3751 break;
4192 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
4193 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
4194 break; 3754 break;
4195 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 3757 if (!state)
4198 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
4199 scr_change_screen (state); 3760 scr_change_screen (state);
4200 break; 3761 break;
4201 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
3763 if (option (Opt_secondaryScreen))
3764 if (state)
3765 scr_cursor (SAVE);
3766
4202 scr_change_screen (state); 3767 scr_change_screen (state);
3768
4203 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3770 if (state)
4205 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
4206 break; 3774 break;
4207 default: 3775 default:
4208 break; 3776 break;
4209 } 3777 }
4210 } 3778 }
… …
4336 scr_color (Color_bg, Color_bg); 3904 scr_color (Color_bg, Color_bg);
4337 break; 3905 break;
4338 3906
4339 //case 50: // not variable spacing 3907 //case 50: // not variable spacing
4340 3908
4341#if ENABLE_FRILLS 3909#if !ENABLE_MINIMAL
4342 case 90: 3910 case 90:
4343 case 91: /* set bright fg color */ 3911 case 91: /* set bright fg color */
4344 case 92: 3912 case 92:
4345 case 93: 3913 case 93:
4346 case 94: 3914 case 94:
… …
4370rxvt_term::process_graphics () 3938rxvt_term::process_graphics ()
4371{ 3939{
4372 unicode_t ch, cmd = cmd_getc (); 3940 unicode_t ch, cmd = cmd_getc ();
4373 3941
4374 if (cmd == 'Q') 3942 if (cmd == 'Q')
3943 {
4375 { /* query graphics */ 3944 /* query graphics */
4376 tt_printf ("\033G0\012"); /* no graphics */ 3945 tt_printf ("\033G0\012"); /* no graphics */
4377 return; 3946 return;
4378 } 3947 }
4379 /* swallow other graphics sequences until terminating ':' */ 3948 /* swallow other graphics sequences until terminating ':' */
4380 do 3949 do
… …
4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4431 4000
4432 memcpy (v_buffer + v_buflen, data, len); 4001 memcpy (v_buffer + v_buflen, data, len);
4433 v_buflen += len; 4002 v_buflen += len;
4434 4003
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 4004 pty_ev.set (ev::READ | ev::WRITE);
4436} 4005}
4437 4006
4438void rxvt_term::pty_write () 4007void rxvt_term::pty_write ()
4439{ 4008{
4440 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4009 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4445 4014
4446 if (v_buflen == 0) 4015 if (v_buflen == 0)
4447 { 4016 {
4448 free (v_buffer); 4017 free (v_buffer);
4449 v_buffer = 0; 4018 v_buffer = 0;
4450 v_buflen = 0;
4451 4019
4452 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4453 return; 4021 return;
4454 } 4022 }
4455 4023
4456 memmove (v_buffer, v_buffer + written, v_buflen); 4024 memmove (v_buffer, v_buffer + written, v_buflen);
4457 } 4025 }
4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4026 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4459 pty_ev.set (EVENT_READ); 4027 pty_ev.set (ev::READ);
4460} 4028}
4461 4029
4462/*----------------------- end-of-file (C source) -----------------------*/ 4030/*----------------------- end-of-file (C source) -----------------------*/
4463 4031

Diff Legend

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