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.253 by root, Mon Jan 9 23:30:01 2006 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 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-2011 Marc Lehmann <schmorp@schmorp.de>
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,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
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 }
… …
443 scr_move_to (0, 1); 543 scr_move_to (0, 1);
444 return; 544 return;
445 } 545 }
446 else if (keysym == XK_End) 546 else if (keysym == XK_End)
447 { 547 {
448 scr_move_to (1, 0); 548 scr_move_to (1, 1);
449 return; 549 return;
450 } 550 }
451 } 551 }
452#endif 552#endif
453 } 553 }
… …
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);
475 return; 574 return;
476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
477 change_font (FONT_DN);
478 return; 576 return;
479#endif 577#endif
480 } 578 }
481 } 579 }
482 } 580 }
483 581
484#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
485 // ISO 14755 support 583 // ISO 14755 support
486 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
487 { 585 {
488 int hv; 586 int hv;
489 587
490 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
491 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
493 { 591 {
494 commit_iso14755 (); 592 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
496# if ISO_14755 594# if ISO_14755
497 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 604# endif
499 return; 605 return;
500 } 606 }
501 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
502 { 608 {
… …
507# endif 613# endif
508 return; 614 return;
509 } 615 }
510 else 616 else
511 { 617 {
512# if ENABLE_OVERLAY 618# if ISO_14755
513 scr_overlay_off (); 619 scr_overlay_off ();
514# endif 620# endif
515 iso14755buf = 0; 621 iso14755buf = 0;
516 } 622 }
517 } 623 }
624 else if (option (Opt_iso14755) &&
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
520 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
521 { 628 {
522 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 630# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 633# endif
527 } 634 }
528#endif 635#endif
529 636
530#ifdef PRINTPIPE 637#ifdef PRINTPIPE
531 if (keysym == XK_Print) 638 if (keysym == XK_Print)
532 { 639 {
533 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
534 return; 641 return;
535 } 642 }
536#endif 643#endif
537 644
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
540 { 656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
541 newlen = 1; 687 newlen = 0;
542 switch (keysym) 688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
543 { 771 {
544#ifndef NO_BACKSPACE_KEY 772 int param = map_function_key (keysym);
545 case XK_BackSpace: 773 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 774 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 775 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; 776 newlen = 0;
828 break;
829 } 777 }
830 778 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
834 783
835 /* 784 /*
836 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
837 */ 786 */
838#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
873 return; 822 return;
874 823
875 if (len <= 0) 824 if (len <= 0)
876 return; /* not mapped */ 825 return; /* not mapped */
877 826
878 if (OPTION (Opt_scrollTtyKeypress)) 827 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 828 if (view_start)
880 { 829 {
881 view_start = 0; 830 view_start = 0;
882 want_refresh = 1; 831 want_refresh = 1;
883 } 832 }
… …
905 { 854 {
906 const char ch = C0_ESC; 855 const char ch = C0_ESC;
907 tt_write (&ch, 1); 856 tt_write (&ch, 1);
908 } 857 }
909 858
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); 859 tt_write (kbuf, (unsigned int)len);
921} 860}
922/*}}} */
923 861
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 862void
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 863rxvt_term::key_release (XKeyEvent &ev)
926/* attempt to `write' count to the input buffer */
927unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 864{
930 unsigned int n, s; 865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym;
931 867
932 n = cmdbuf_ptr - cmdbuf_base; 868 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 869#endif
934 870
935 if (n > 0 && s < count) 871#if ENABLE_FRILLS || ISO_14755
872 // ISO 14755 support
873 if (iso14755buf)
874 if (iso14755buf & ISO_14755_52)
936 { 875 {
937 memmove (cmdbuf_base, cmdbuf_ptr, 876# if ISO_14755
938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 877 scr_overlay_off ();
939 cmdbuf_ptr = cmdbuf_base;
940 cmdbuf_endp -= n;
941 s += n;
942 }
943
944 if (count > s)
945 {
946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
947 count = s;
948 }
949
950 for (; count--;)
951 *cmdbuf_endp++ = *str++;
952
953 cmd_parse ();
954
955 return 0;
956}
957#endif 878# endif
879# if ISO_14755
880 // iso14755 part 5.2 handling: release time
881 // first: controls
882 if ((ev.state & ControlMask)
883 && ((keysym >= 0x40 && keysym <= 0x5f)
884 || (keysym >= 0x61 && keysym <= 0x7f)))
885 {
886 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
887 commit_iso14755 ();
888
889 return;
890 }
891
892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
893 if (i[0] == keysym)
894 {
895 iso14755buf = ISO_14755_51 | i[1];
896 commit_iso14755 ();
897
898 return;
899 }
900
901 scr_bell ();
902# endif
903 iso14755buf = 0;
904
905 return;
906 }
907 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
908 {
909# if ISO_14755
910 scr_overlay_off ();
911# endif
912 if (iso14755buf & ISO_14755_51)
913 commit_iso14755 ();
914#if ISO_14755
915 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
916 {
917 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
918
919 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
920 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
921 }
922# endif
923 else
924 iso14755buf = 0;
925 }
926#endif
927
928 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
929 return;
930
931#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
932 if (!(ev.state & ControlMask))
933 slip_wheel_ev.stop ();
934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
935 mouse_slip_wheel_speed = 0;
936#endif
937}
958 938
959void 939void
960rxvt_term::flush () 940rxvt_term::flush ()
961{ 941{
962 flush_ev.stop (); 942 flush_ev.stop ();
963 943
964#ifdef TRANSPARENT 944#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 945 if (bg_flags & BG_NEEDS_REFRESH)
966 { 946 {
967 want_full_refresh = 0; 947 bg_flags &= ~BG_NEEDS_REFRESH;
968 scr_clear ();
969 scr_touch (false); 948 scr_touch (false);
970 } 949 }
971#endif 950#endif
972 951
973 if (want_refresh) 952 if (want_refresh)
974 { 953 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 954 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 955 {
977 int row = -view_start; 956 int row = view_start;
978 int end_row = row + nrow; 957 int end_row = row + nrow;
979 958
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 959 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 960 --row;
982 961
983 do 962 do
984 { 963 {
985 int start_row = row; 964 int start_row = row;
… …
987 966
988 do 967 do
989 { 968 {
990 l = &ROW (row++); 969 l = &ROW (row++);
991 970
992 if (l->f & LINE_FILTERED) 971 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 972 {
996 // line not filtered, mark it as filtered 973 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 974 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 975 while (l->is_longer ())
999 { 976 {
1000 l = &ROW (++row); 977 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 978 l->f |= LINE_FILTERED;
1002 } 979 }
1003 980
1004 // and filter it 981 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 982 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 984 break;
1008 } 985 }
1009 } 986 }
1010 while (l->is_longer () && row < end_row); 987 while (l->is_longer () && row < end_row);
1011 } 988 }
1012 while (++row < end_row); 989 while (row < end_row);
1013 } 990 }
1014 991
1015 scr_refresh (refresh_type); 992 scr_refresh ();
1016 scrollbar_show (1); 993 scrollBar.show (1);
1017#ifdef USE_XIM 994#ifdef USE_XIM
1018 IMSendSpot (); 995 IMSendSpot ();
1019#endif 996#endif
1020 } 997 }
1021 998
1022 display->flush (); 999 display->flush ();
1023} 1000}
1024 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
1025void 1003void
1026rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
1027{ 1005{
1028 SET_R (this); 1006 if (want_refresh && !flush_ev.is_active ())
1029 SET_LOCALE (locale); 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1030 1008
1031 display->flush (); 1009 display->flush ();
1032
1033 if (want_refresh && !flush_ev.active)
1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035} 1010}
1036 1011
1037void 1012void
1038rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
1039{ 1014{
1040 SET_R (this); 1015 make_current ();
1041 SET_LOCALE (locale);
1042 1016
1043 refresh_limit = 1;
1044 refresh_count = 0; 1017 refresh_count = 0;
1045 flush (); 1018 flush ();
1046} 1019}
1047 1020
1048#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
1049void 1022void
1050rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1024{
1052 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1026 want_refresh = 1;
1054 1027 refresh_check ();
1055 w.start (w.at + BLINK_INTERVAL);
1056} 1028}
1057#endif 1029#endif
1058 1030
1059#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1060void 1032void
1061rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
1062{ 1034{
1063 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1064 { 1036 {
1065 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1066 want_refresh = 1; 1038 want_refresh = 1;
1067 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
1068 } 1040 }
1041 else
1042 w.stop ();
1069} 1043}
1070#endif 1044#endif
1071 1045
1072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1073void 1047void
1074rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1075{ 1049{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1077 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1078 { 1052 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1; 1053 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1082 } 1055 }
1056 else
1057 w.stop ();
1083} 1058}
1084#endif 1059#endif
1085 1060
1086#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1087void 1062void
1088rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1089{ 1064{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 { 1066 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1; 1068 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1096 } 1070 }
1071 else
1072 w.stop ();
1097} 1073}
1098#endif 1074#endif
1099 1075
1100#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1101void 1077void
1102rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1103{ 1079{
1104 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1105 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1081 {
1108 if (view_start == nsaved ||
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0;
1111
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1082 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1115 } 1087 {
1088 mouse_slip_wheel_speed = 0;
1089 w.stop ();
1090 }
1116} 1091}
1117#endif 1092#endif
1118 1093
1119#if HAVE_SCHED_YIELD 1094#if LINUX_YIELD_HACK
1120static struct event_handler 1095static struct event_handler
1121{ 1096{
1122 check_watcher cw_yield; 1097 ev::prepare yield_ev;
1123 1098
1124 void yield (check_watcher &w) 1099 void yield_cb (ev::prepare &w, int revents)
1125 { 1100 {
1126 sched_yield (); 1101 // this should really be sched_yield(), but the linux guys thought
1102 // that giving a process calling sched_yield () less cpu time than
1103 // ones with high nice levels is a useful thing to do. It surely is is
1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1108
1109 struct timespec ts = { 0, 1000 };
1110 nanosleep (&ts, 0);
1111
1127 w.stop (); 1112 w.stop ();
1128 } 1113 }
1129 1114
1130 event_handler () 1115 event_handler ()
1131 : cw_yield (this, &event_handler::yield) 1116 : yield_ev (this, &event_handler::yield_cb)
1132 { 1117 {
1133 } 1118 }
1134} event_handler; 1119} event_handler;
1135#endif 1120#endif
1136 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1137bool 1155bool
1138rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1139{ 1157{
1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1141 1159
1142 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1143 { 1161
1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1145 n = 0;
1146 } 1163 {
1147 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1151 1169
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1153 1171
1154 if (r > 0) 1172 if (r > 0)
1155 { 1173 {
1156 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1157 return true; 1175 return true;
1158 } 1176 }
1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 { 1178 {
1161#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1162 if (display->is_local) 1180 if (display->is_local)
1163 event_handler.cw_yield.start (); 1181 event_handler.yield_ev.start ();
1164#endif 1182#endif
1165 } 1183 }
1166 else 1184 else
1167 { 1185 {
1168 pty_ev.stop (); 1186 pty_ev.stop ();
1169 1187
1170 if (!OPTION (Opt_hold)) 1188 if (!option (Opt_hold))
1171 destroy (); 1189 destroy ();
1172 } 1190 }
1173 1191
1174 return false; 1192 return false;
1175} 1193}
1176 1194
1177void 1195void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1179{ 1197{
1180 SET_R (this); 1198 make_current ();
1181 SET_LOCALE (locale);
1182 1199
1183 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1184 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1186 if (cmd_parse ()) 1203 cmd_parse ();
1187 break;
1188 1204
1189 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1190 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1191} 1209}
1192 1210
1193void 1211void
1194rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1195{ 1213{
1196 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1197 recolour_cursor (); 1215 recolour_cursor ();
1198 1216
1199#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1200 hidden_pointer = 0; 1218 hidden_pointer = 0;
1201 1219
1202 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1203 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1204#endif 1222#endif
1205} 1223}
1206 1224
1207#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1208void 1226void
1209rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1210{ 1228{
1211 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1212 return; 1230 return;
1213 1231
1214 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1215 XFlush (display->display); 1233 XFlush (dpy);
1216 1234
1217 hidden_pointer = 1; 1235 hidden_pointer = 1;
1218} 1236}
1219 1237
1220void 1238void
1221rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1222{ 1240{
1223 SET_R (this); 1241 make_current ();
1224 SET_LOCALE (locale);
1225 1242
1226 pointer_blank (); 1243 pointer_blank ();
1227} 1244}
1228#endif 1245#endif
1229 1246
1230void 1247void
1231rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1232{ 1249{
1233 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1234 int x, y; 1251 int x, y;
1252 int code = 32;
1235 1253
1236 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
1237 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
1238 pixel_position (&x, &y); 1256
1257 if (ev.type == MotionNotify)
1258 {
1259 if (x == mouse_row && y == mouse_col)
1260 return;
1261
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1239 1266
1240 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1241 button_number = 3; 1268 button_number = 3;
1242 else 1269 else
1243 { 1270 {
1244 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1245 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1246 if (button_number >= 3) 1273 if (button_number >= 3)
1247 button_number += (64 - 3); 1274 button_number += 64 - 3;
1248 } 1275 }
1249 1276
1250 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1251 { 1278 {
1252 /* 1279 /*
… …
1284 fputc ('A', stderr); 1311 fputc ('A', stderr);
1285 if (key_state & 32) 1312 if (key_state & 32)
1286 fputc ('2', stderr); 1313 fputc ('2', stderr);
1287 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1288 button_number, 1315 button_number,
1289 x + 1, 1316 x,
1290 y + 1); 1317 y);
1291#endif 1318#endif
1292 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1293 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1294 (32 + button_number + key_state), 1334 code + button_number + key_state,
1295 (32 + x + 1), 1335 32 + x,
1296 (32 + y + 1)); 1336 32 + y);
1297} 1337}
1298
1299#ifdef USING_W11LIB
1300void
1301rxvt_W11_process_x_event (XEvent *ev)
1302{
1303 rxvt_t *r = rxvt_get_r ();
1304
1305 x_cb (*ev);
1306}
1307#endif
1308 1338
1309/*{{{ process an X event */ 1339/*{{{ process an X event */
1310void 1340void
1311rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
1312{ 1342{
1313 dDisp; 1343 make_current ();
1314 1344
1315 SET_R (this); 1345 dLocal (Display *, dpy);
1316 SET_LOCALE (locale);
1317 1346
1347 if (ev.xany.window == vt
1348 && SHOULD_INVOKE (HOOK_X_EVENT)
1349 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1350 return;
1351
1352 // for XQueryPointer
1318 Window unused_root, unused_child; 1353 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1354 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1355 unsigned int unused_mask;
1321 1356
1322 switch (ev.type) 1357 switch (ev.type)
1323 { 1358 {
1324 case KeyPress: 1359 case KeyPress:
1325#if ISO_14755 1360 key_press (ev.xkey);
1326 if (!(iso14755buf & ISO_14755_52))
1327#endif
1328 lookup_key (ev.xkey);
1329
1330 break; 1361 break;
1331 1362
1332 case KeyRelease: 1363 case KeyRelease:
1333 { 1364 key_release (ev.xkey);
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym keysym;
1336
1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif
1339
1340#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support
1342 if (iso14755buf)
1343 if (iso14755buf & ISO_14755_52)
1344 {
1345# if ENABLE_OVERLAY
1346 scr_overlay_off ();
1347# endif
1348# if ISO_14755
1349 // iso14755 part 5.2 handling: release time
1350 // first: controls
1351 if ((ev.xkey.state & ControlMask)
1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 ();
1357 goto skip_switch;
1358 }
1359
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == keysym)
1362 {
1363 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 ();
1365 goto skip_switch;
1366 }
1367
1368 scr_bell ();
1369# endif
1370 iso14755buf = 0;
1371 break;
1372 }
1373 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1374 {
1375# if ENABLE_OVERLAY
1376 scr_overlay_off ();
1377# endif
1378 if (iso14755buf & ISO_14755_51)
1379 commit_iso14755 ();
1380#if ISO_14755
1381 else if (iso14755buf & ISO_14755_STARTED)
1382 {
1383 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1384
1385 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1386 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1387 }
1388# endif
1389 else
1390 iso14755buf = 0;
1391 }
1392#endif
1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop ();
1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402 mouse_slip_wheel_speed = 0;
1403#endif
1404 break; 1365 break;
1405 }
1406 1366
1407 case ButtonPress: 1367 case ButtonPress:
1408 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
1409 break; 1369 break;
1410 1370
… …
1412 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1413 break; 1373 break;
1414 1374
1415 case ClientMessage: 1375 case ClientMessage:
1416 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1417 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1377 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418 { 1378 {
1379 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1380 {
1381 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1382 {
1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1383 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1384 {
1385 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1420 destroy (); 1386 destroy ();
1387 }
1421#if ENABLE_EWMH 1388#if ENABLE_EWMH
1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1389 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423 XSendEvent (disp, ev.xclient.window = display->root, 1390 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask, 1391 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &ev); 1392 &ev);
1393#endif
1394 }
1395 }
1396#if ENABLE_XEMBED
1397 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1398 {
1399 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1400 focus_in ();
1401 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1402 focus_out ();
1403 }
1426#endif 1404#endif
1427 } 1405 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1437#ifdef OFFIX_DND
1438 /* OffiX Dnd (drag 'n' drop) protocol */
1439 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1440 && (ev.xclient.data.l[0] == DndFile
1441 || ev.xclient.data.l[0] == DndDir
1442 || ev.xclient.data.l[0] == DndLink))
1443 {
1444 /* Get Dnd data */
1445 Atom ActualType;
1446 int ActualFormat;
1447 unsigned char *data;
1448 unsigned long Size, RemainingBytes;
1449
1450 XGetWindowProperty (disp, display->root,
1451 xa[XA_DNDSELECTION],
1452 0L, 1000000L,
1453 False, AnyPropertyType,
1454 &ActualType, &ActualFormat,
1455 &Size, &RemainingBytes,
1456 &data);
1457 set_string_property (XA_CUT_BUFFER0, data);
1458 XFree (data);
1459 selection_paste (display->root, XA_CUT_BUFFER0, true);
1460 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1461 }
1462#endif /* OFFIX_DND */
1463 break;
1464
1465 case MappingNotify:
1466 XRefreshKeyboardMapping (&ev.xmapping);
1467 break; 1406 break;
1468 1407
1469 /* 1408 /*
1470 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1471 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1490 break; 1429 break;
1491 } 1430 }
1492 break; 1431 break;
1493 1432
1494 case FocusIn: 1433 case FocusIn:
1434 if (ev.xfocus.detail != NotifyInferior
1435 && ev.xfocus.detail != NotifyPointer
1436 && ev.xfocus.mode != NotifyGrab)
1495 focus_in (); 1437 focus_in ();
1496 break; 1438 break;
1497 1439
1498 case FocusOut: 1440 case FocusOut:
1441 if (ev.xfocus.detail != NotifyInferior
1442 && ev.xfocus.detail != NotifyPointer
1443 && ev.xfocus.mode != NotifyGrab)
1499 focus_out (); 1444 focus_out ();
1500 break; 1445 break;
1501 1446
1502 case ConfigureNotify: 1447 case ConfigureNotify:
1503 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1504 { 1449 {
1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1506 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1507 1471
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 { 1473 {
1510 seen_resize = 1; 1474 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1476 }
1513 1477 else
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478 {
1515 if (OPTION (Opt_transparent)) 1479#ifdef HAVE_BG_PIXMAP
1516 check_our_parents (); 1480 if (moved)
1481 {
1482 if (mapped)
1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1517#endif 1487#endif
1488 }
1489
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 } 1491 }
1519 break; 1492 break;
1520 1493
1521 case PropertyNotify: 1494 case PropertyNotify:
1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 && ev.xproperty.state == PropertyNewValue)
1524 selection_property (ev.xproperty.window, ev.xproperty.atom);
1525
1526 break; 1496 break;
1527 1497
1528 case SelectionClear: 1498 case SelectionClear:
1529 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1530 break;
1531
1532 case SelectionNotify:
1533 if (selection_wait == Sel_normal)
1534 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1535 break; 1500 break;
1536 1501
1537 case SelectionRequest: 1502 case SelectionRequest:
1538 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1539 break; 1504 break;
1540 1505
1541 case MapNotify: 1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1542 mapped = 1; 1523 mapped = 1;
1543#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1525 text_blink_ev.start ();
1545#endif 1526#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1528 break;
1548 1529
1549 case UnmapNotify: 1530 case UnmapNotify:
… …
1551#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1552 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1553#endif 1534#endif
1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1555 break; 1536 break;
1556
1557#ifdef TRANSPARENT
1558 case ReparentNotify:
1559 rootwin_cb (ev);
1560 break;
1561#endif /* TRANSPARENT */
1562 1537
1563 case GraphicsExpose: 1538 case GraphicsExpose:
1564 case Expose: 1539 case Expose:
1565 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1566 { 1541 {
1567 do 1542 do
1543 {
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1571 1548
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573 1550
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1577 1556
1578 scr_refresh (refresh_type); 1557 want_refresh = 1;
1579 } 1558 }
1580 else 1559 else
1581 { 1560 {
1582 XEvent unused_event; 1561 XEvent unused_event;
1583 1562
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1585 ; 1564 ;
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1587 ; 1566 ;
1588 1567
1589 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1590 { 1569 {
1591 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1592 scrollbar_show (0); 1571 scrollBar.show (0);
1593 } 1572 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598
1599#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window);
1602#endif
1603 } 1573 }
1604 break; 1574 break;
1605 1575
1606 case MotionNotify: 1576 case MotionNotify:
1607#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1578 if (hidden_pointer)
1609 pointer_unblank (); 1579 pointer_unblank ();
1610#endif 1580#endif
1611#if MENUBAR 1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1612 if (isMenuBarWindow (ev.xany.window)) 1582 || priv_modes & PrivMode_MouseAnyEvent)
1613 {
1614 menubar_control (ev.xbutton); 1583 mouse_report (ev.xbutton);
1615 break;
1616 }
1617#endif
1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1585 break;
1620 1586
1621 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1622 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1591 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1593 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1628 ; 1595 ;
1629 1596
1630 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1631 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1601 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1655 int dist; 1622 int dist;
1656 1623
1657 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1658 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1659 */ 1626 */
1660 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1661 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1662 1629
1663 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1664 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1665 */ 1632 */
1666 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
… …
1688 else 1655 else
1689 { 1656 {
1690 /* we are within the text window, so we 1657 /* we are within the text window, so we
1691 * shouldn't be scrolling 1658 * shouldn't be scrolling
1692 */ 1659 */
1693 if (sel_scroll_ev.active)
1694 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1695 } 1661 }
1696#endif 1662#endif
1697#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1698 } 1664 }
1699#endif 1665#endif
1700 } 1666 }
1701 } 1667 }
1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1703 { 1669 {
1704 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1705 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1706 ; 1672 ;
1707 1673
1708 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1709 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1710 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1678 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1680 scrollBar.size ());
1715 scr_refresh (refresh_type);
1716 refresh_limit = 0; 1681 want_refresh = 1;
1717 scrollbar_show (1); 1682 scrollBar.show (1);
1718 } 1683 }
1719 break; 1684 break;
1720 } 1685 }
1721 1686
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1726 { 1689 {
1727 if (hidden_cursor) 1690 if (hidden_cursor)
1728 { 1691 {
1729 hidden_cursor = 0; 1692 hidden_cursor = 0;
1730 want_refresh = 1; 1693 want_refresh = 1;
1731 } 1694 }
1732 1695
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1696 cursor_blink_ev.again ();
1734 } 1697 }
1735#endif 1698#endif
1736 1699
1737#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 { 1702 {
1740 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1743 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1745 1708
1746 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank (); 1710 pointer_blank ();
1748 } 1711 }
1749#endif 1712#endif
1713
1714 refresh_check ();
1750} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1751 1732
1752void 1733void
1753rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1754{ 1735{
1755 if (!focus) 1736 if (!focus)
1756 { 1737 {
1757 focus = 1; 1738 focus = 1;
1758 want_refresh = 1; 1739 want_refresh = 1;
1759 1740
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1762#if USE_XIM 1741#if USE_XIM
1763 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1764 { 1743 {
1765 IMSetStatusPosition (); 1744 IMSetPosition ();
1766 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1767 } 1746 }
1768#endif 1747#endif
1769#if CURSOR_BLINK 1748#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1772#endif 1751#endif
1773#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1775 { 1754 {
1776 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1777 scr_recolour (); 1756 scr_recolour ();
1778 } 1757 }
1779#endif 1758#endif
1759#if ENABLE_FRILLS
1760 if (option (Opt_urgentOnBell))
1761 set_urgency (0);
1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 } 1765 }
1781} 1766}
1782 1767
1783void 1768void
1784rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1786 if (focus) 1771 if (focus)
1787 { 1772 {
1788 focus = 0; 1773 focus = 0;
1789 want_refresh = 1; 1774 want_refresh = 1;
1790 1775
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1792 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1793#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf) 1781 if (iso14755buf)
1795 { 1782 {
1796 iso14755buf = 0; 1783 iso14755buf = 0;
1797# if ENABLE_OVERLAY 1784# if ISO_14755
1798 scr_overlay_off (); 1785 scr_overlay_off ();
1799# endif 1786# endif
1800 } 1787 }
1801#endif 1788#endif
1802#if USE_XIM 1789#if USE_XIM
1803 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1804 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1805#endif 1792#endif
1806#if CURSOR_BLINK 1793#if CURSOR_BLINK
1807 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1808 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1809 hidden_cursor = 0; 1797 hidden_cursor = 0;
1810#endif 1798#endif
1811#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1813 { 1801 {
1814 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1815 scr_recolour (); 1803 scr_recolour ();
1816 } 1804 }
1817#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 }
1809}
1810
1811void
1812rxvt_term::update_fade_color (unsigned int idx)
1813{
1814#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade])
1818 } 1816 {
1817 rgba c;
1818 pix_colors [Color_fade].get (c);
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 }
1821#endif
1819} 1822}
1820 1823
1821#if TRANSPARENT 1824#if ENABLE_TRANSPARENCY || ENABLE_PERL
1822void 1825void
1823rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1827{
1825 SET_R (this); 1828 make_current ();
1826 SET_LOCALE (locale);
1827 1829
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return;
1833
1834# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1835 switch (ev.type)
1829 { 1836 {
1830 case PropertyNotify: 1837 case PropertyNotify:
1831 /* 1838 /*
1832 * if user used some Esetroot compatible prog to set the root bg, 1839 * if user used some Esetroot compatible prog to set the root bg,
1833 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1834 */ 1841 */
1835 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 return; 1844 {
1845 bg_set_root_pixmap ();
1846 update_background ();
1847 }
1838 1848
1839 /* FALLTHROUGH */
1840 case ReparentNotify:
1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1842 want_refresh = want_full_refresh = 1;
1843 break; 1849 break;
1844 } 1850 }
1851# endif
1852
1853 refresh_check ();
1845} 1854}
1846#endif 1855#endif
1847 1856
1848void 1857void
1849rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1858 /* 1867 /*
1859 * VT window processing of button press 1868 * VT window processing of button press
1860 */ 1869 */
1861 if (ev.window == vt) 1870 if (ev.window == vt)
1862 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1863#if ISO_14755 1875#if ISO_14755
1864 // 5.4 1876 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 { 1878 {
1867 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1877 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1878 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1879#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1880 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1881 { 1893 {
1882 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1883 MEvent.clicks++; 1895 MEvent.clicks++;
1884 1896
1885 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1886 { 1898 {
1887 /* only report double clicks */ 1899 /* only report double clicks */
… …
1901 mouse_report (ev); 1913 mouse_report (ev);
1902 } 1914 }
1903#else 1915#else
1904 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1905 mouse_report (ev); 1917 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1919
1908 } 1920 }
1909 else 1921 else
1910 { 1922 {
1911 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1912 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1913 1925
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915 switch (ev.button) 1926 switch (ev.button)
1916 { 1927 {
1917 case Button1: 1928 case Button1:
1918 /* allow meta + click to select rectangular areas */ 1929 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */ 1930 /* should be done in screen.C */
1920#if ENABLE_FRILLS 1931#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask); 1932 selection.rect = !!(ev.state & ModMetaMask);
1922#else 1933#else
1923 selection.rect = false; 1934 selection.rect = false;
1924#endif 1935#endif
1925 1936
1926 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1939 {
1929 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1931 else 1942 else
1932 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1933 } 1944 }
1934 else 1945 else
1935 { 1946 {
1936 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++; 1948 MEvent.clicks++;
1938 else 1949 else
1939 MEvent.clicks = 1; 1950 MEvent.clicks = 1;
1940 1951
1941 selection_click (MEvent.clicks, ev.x, ev.y); 1952 selection_click (MEvent.clicks, ev.x, ev.y);
1942 } 1953 }
1943 1954
1944 MEvent.button = Button1; 1955 MEvent.button = Button1;
1945 break; 1956 break;
1946 1957
1947 case Button3: 1958 case Button3:
1948 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1950 else 1961 else
1951 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1952 1963
1953 MEvent.button = Button3; 1964 MEvent.button = Button3;
1954 break; 1965 break;
1955 } 1966 }
1956 } 1967 }
1957 1968
1958 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1959 return; 1970 return;
1960 } 1971 }
1961 1972
1962 /* 1973 /*
1963 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1964 */ 1975 */
1965 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 1977 {
1967 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1968 /* 1986 /*
1969 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 1988 * move up if mouse is above slider
1971 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1972 * 1990 *
… …
1981 /* 1999 /*
1982 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1985 */ 2003 */
1986 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1992 && scrollbarnext_dnButton (ev.y))
1993 || (scrollBar.style == R_SB_RXVT
1994 && scrollbarrxvt_dnButton (ev.y)))
1995 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1996 else 2008 else
1997 switch (ev.button) 2009 switch (ev.button)
1998 { 2010 {
1999 case Button2: 2011 case Button2:
… …
2006 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
2007 break; 2019 break;
2008 } 2020 }
2009 } 2021 }
2010 else 2022 else
2011#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 2024 {
2018 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
2019 upordown = -1; /* up */
2020 else if (scrollbarnext_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 else if (scrollBar.style == R_SB_RXVT)
2024 {
2025 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 if (upordown)
2031 { 2026 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2030#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
2036 { 2032 {
2037 if (upordown < 0) 2033 if (direction == UP)
2038 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
2039 else 2035 else
2040 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2041 } 2037 }
2042 } 2038 }
2043 else 2039 else
2044 switch (ev.button) 2040 switch (ev.button)
2045 { 2041 {
2046 case Button2: 2042 case Button2:
2047 switch (scrollbar_align) 2043 switch (scrollBar.align)
2048 { 2044 {
2049 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2050 csrO = 0; 2046 csrO = 0;
2051 break; 2047 break;
2052 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2058 } 2054 }
2059 2055
2060 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2061 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2064 2060
2065 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2066 break; 2062 break;
2067 2063
2068 case Button1: 2064 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2072 2068
2073 case Button3: 2069 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2084 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2085# else 2081# else
2086 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2087# endif 2083# endif
2088 else 2084 else
2089 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2090 } 2086 }
2091 else 2087 else
2092 { 2088 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2090 (nrow
2095 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2096 / scrollbar_size ())); 2092 / scrollBar.size ()));
2097 } 2093 }
2098 2094
2099 break; 2095 break;
2100 } 2096 }
2101 } 2097 }
2102 2098
2103 return; 2099 return;
2104 } 2100 }
2105
2106#if MENUBAR
2107 /*
2108 * Menubar window processing of button press
2109 */
2110 if (isMenuBarWindow (ev.window))
2111 menubar_control (ev);
2112#endif
2113} 2101}
2114 2102
2115void 2103void
2116rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
2117{ 2105{
… …
2119 2107
2120 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2109 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2111
2124 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2125 { 2113 {
2126 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2127 scrollbar_show (0); 2115 scrollBar.show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2116 }
2132 2117
2133#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2136#endif 2120#endif
2137 2121
2138 if (ev.window == vt) 2122 if (ev.window == vt)
2139 { 2123 {
2124 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2125 return;
2126
2140#if ISO_14755 2127#if ISO_14755
2141 // 5.4 2128 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2129 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return; 2130 return;
2144#endif 2131#endif
2132
2145 if (reportmode) 2133 if (reportmode)
2146 { 2134 {
2147 /* mouse report from vt window */ 2135 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2136 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2137 if (ev.button >= 4)
… …
2160 mouse_report (ev); 2148 mouse_report (ev);
2161 } 2149 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2164 mouse_report (ev); 2152 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2154 return;
2167 } 2155 }
2168 2156
2169 /* 2157 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2173 if (priv_modes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
2174 && bypass_keystate 2162 && bypass_keystate
2175 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
2176 selection_extend (ev.x, ev.y, 0); 2164 selection_extend (ev.x, ev.y, 0);
2177 2165
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2181 switch (ev.button) 2166 switch (ev.button)
2182 { 2167 {
2183 case Button1: 2168 case Button1:
2184 case Button3: 2169 case Button3:
2185 selection_make (ev.time); 2170 selection_make (ev.time);
2186 break; 2171 break;
2172
2187 case Button2: 2173 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2189 break; 2176 break;
2177
2190#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2191 case Button4: 2179 case Button4:
2192 case Button5: 2180 case Button5:
2193 { 2181 {
2194 int i; 2182 int i;
… …
2196 2184
2197 v = ev.button == Button4 ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
2198 2186
2199 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
2200 i = 1; 2188 i = 1;
2201 else if (OPTION (Opt_mouseWheelScrollPage)) 2189 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2190 i = nrow - 1;
2203 else 2191 else
2204 i = 5; 2192 i = 5;
2205 2193
2206# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
… …
2208 { 2196 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2200
2213 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2203 }
2218 else 2204 else
2205# endif
2219 { 2206 {
2220# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2207 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2208 scrollBar.show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING
2234 } 2209 }
2235#endif
2236 } 2210 }
2237 break; 2211 break;
2238#endif 2212#endif
2239 } 2213 }
2240 } 2214 }
2241#ifdef MENUBAR
2242 else if (isMenuBarWindow (ev.window))
2243 menubar_control (ev);
2244#endif
2245} 2215}
2246
2247#ifdef TRANSPARENT
2248#if TINTING
2249/* taken from aterm-0.4.2 */
2250
2251typedef uint32_t RUINT32T;
2252
2253void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2254{
2255 int sh_r, sh_g, sh_b;
2256 RUINT32T mask_r, mask_g, mask_b;
2257 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2258 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2259 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2260 int i;
2261
2262 Visual *visual = display->visual;
2263
2264 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2265
2266 /* for convenience */
2267 mask_r = visual->red_mask;
2268 mask_g = visual->green_mask;
2269 mask_b = visual->blue_mask;
2270
2271 /* boring lookup table pre-initialization */
2272 switch (srcImage->bits_per_pixel) {
2273 case 15:
2274 if ((mask_r != 0x7c00) ||
2275 (mask_g != 0x03e0) ||
2276 (mask_b != 0x001f))
2277 return;
2278 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2279 lookup_r = lookup;
2280 lookup_g = lookup+32;
2281 lookup_b = lookup+32+32;
2282 sh_r = 10;
2283 sh_g = 5;
2284 sh_b = 0;
2285 break;
2286 case 16:
2287 if ((mask_r != 0xf800) ||
2288 (mask_g != 0x07e0) ||
2289 (mask_b != 0x001f))
2290 return;
2291 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2292 lookup_r = lookup;
2293 lookup_g = lookup+32;
2294 lookup_b = lookup+32+64;
2295 sh_r = 11;
2296 sh_g = 5;
2297 sh_b = 0;
2298 break;
2299 case 24:
2300 if ((mask_r != 0xff0000) ||
2301 (mask_g != 0x00ff00) ||
2302 (mask_b != 0x0000ff))
2303 return;
2304 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2305 lookup_r = lookup;
2306 lookup_g = lookup+256;
2307 lookup_b = lookup+256+256;
2308 sh_r = 16;
2309 sh_g = 8;
2310 sh_b = 0;
2311 break;
2312 case 32:
2313 if ((mask_r != 0xff0000) ||
2314 (mask_g != 0x00ff00) ||
2315 (mask_b != 0x0000ff))
2316 return;
2317 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2318 lookup_r = lookup;
2319 lookup_g = lookup+256;
2320 lookup_b = lookup+256+256;
2321 sh_r = 16;
2322 sh_g = 8;
2323 sh_b = 0;
2324 break;
2325 default:
2326 return; /* we do not support this color depth */
2327 }
2328
2329 /* prepare limits for color transformation (each channel is handled separately) */
2330 if (shade < 0) {
2331 shade = -shade;
2332 if (shade < 0) shade = 0;
2333 if (shade > 100) shade = 100;
2334
2335 lower_lim_r = 65535-rm;
2336 lower_lim_g = 65535-gm;
2337 lower_lim_b = 65535-bm;
2338
2339 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2340 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2341 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2342
2343 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2344 } else {
2345 if (shade < 0) shade = 0;
2346 if (shade > 100) shade = 100;
2347
2348 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2349
2350 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2351 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2352 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2353 }
2354
2355 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2356 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2357 {
2358 unsigned int tmp;
2359
2360 tmp = lower_lim_r;
2361 lower_lim_r = lower_lim_b;
2362 lower_lim_b = tmp;
2363
2364 tmp = upper_lim_r;
2365 upper_lim_r = upper_lim_b;
2366 upper_lim_b = tmp;
2367 }
2368
2369 /* fill our lookup tables */
2370 for (i = 0; i <= mask_r>>sh_r; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2374 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2375 lookup_r[i] = (tmp/65535)<<sh_r;
2376 }
2377 for (i = 0; i <= mask_g>>sh_g; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2381 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2382 lookup_g[i] = (tmp/65535)<<sh_g;
2383 }
2384 for (i = 0; i <= mask_b>>sh_b; i++)
2385 {
2386 RUINT32T tmp;
2387 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2388 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2389 lookup_b[i] = (tmp/65535)<<sh_b;
2390 }
2391
2392 /* apply table to input image (replacing colors by newly calculated ones) */
2393 switch (srcImage->bits_per_pixel)
2394 {
2395 case 15:
2396 {
2397 unsigned short *p1, *pf, *p, *pl;
2398 p1 = (unsigned short *) srcImage->data;
2399 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0x7c00)>>10] |
2407 lookup_g[(*p & 0x03e0)>> 5] |
2408 lookup_b[(*p & 0x001f)];
2409 }
2410 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 16:
2415 {
2416 unsigned short *p1, *pf, *p, *pl;
2417 p1 = (unsigned short *) srcImage->data;
2418 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419 while (p1 < pf)
2420 {
2421 p = p1;
2422 pl = p1 + srcImage->width;
2423 for (; p < pl; p++)
2424 {
2425 *p = lookup_r[(*p & 0xf800)>>11] |
2426 lookup_g[(*p & 0x07e0)>> 5] |
2427 lookup_b[(*p & 0x001f)];
2428 }
2429 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 case 24:
2434 {
2435 unsigned char *p1, *pf, *p, *pl;
2436 p1 = (unsigned char *) srcImage->data;
2437 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2438 while (p1 < pf)
2439 {
2440 p = p1;
2441 pl = p1 + srcImage->width * 3;
2442 for (; p < pl; p += 3)
2443 {
2444 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2445 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2446 p[2] = lookup_r[(p[2] & 0x0000ff)];
2447 }
2448 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2449 }
2450 break;
2451 }
2452 case 32:
2453 {
2454 RUINT32T *p1, *pf, *p, *pl;
2455 p1 = (RUINT32T *) srcImage->data;
2456 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2457
2458 while (p1 < pf)
2459 {
2460 p = p1;
2461 pl = p1 + srcImage->width;
2462 for (; p < pl; p++)
2463 {
2464 *p = lookup_r[(*p & 0xff0000)>>16] |
2465 lookup_g[(*p & 0x00ff00)>> 8] |
2466 lookup_b[(*p & 0x0000ff)] |
2467 (*p & ~0xffffff);
2468 }
2469 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2470 }
2471 break;
2472 }
2473 }
2474
2475 free (lookup);
2476}
2477#endif
2478
2479/*
2480 * Check our parents are still who we think they are.
2481 * Do transparency updates if required
2482 */
2483int
2484rxvt_term::check_our_parents ()
2485{
2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2487 unsigned long nitems, bytes_after;
2488 Atom atype;
2489 unsigned char *prop = NULL;
2490 Window root, oldp, *list;
2491 Pixmap rootpixmap = None;
2492 XWindowAttributes wattr, wrootattr;
2493 dDisp;
2494
2495 pchanged = 0;
2496
2497 if (!OPTION (Opt_transparent))
2498 return pchanged; /* Don't try any more */
2499
2500 XGetWindowAttributes (disp, display->root, &wrootattr);
2501 rootdepth = wrootattr.depth;
2502
2503 XGetWindowAttributes (disp, parent[0], &wattr);
2504
2505 if (rootdepth != wattr.depth)
2506 {
2507 if (am_transparent)
2508 {
2509 pchanged = 1;
2510 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = am_pixmap_trans = 0;
2512 }
2513
2514 return pchanged; /* Don't try any more */
2515 }
2516
2517 /* Get all X ops out of the queue so that our information is up-to-date. */
2518 XSync (disp, False);
2519
2520 /*
2521 * Make the frame window set by the window manager have
2522 * the root background. Some window managers put multiple nested frame
2523 * windows for each client, so we have to take care about that.
2524 */
2525 i = (xa[XA_XROOTPMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success);
2529
2530 if (!i || prop == NULL)
2531 i = (xa[XA_ESETROOT_PMAP_ID]
2532 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2533 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2534 &nitems, &bytes_after, &prop) == Success);
2535
2536 if (!i || prop == NULL
2537#if TINTING
2538 || !rs[Rs_color + Color_tint]
2539#endif
2540 )
2541 have_pixmap = 0;
2542 else
2543 {
2544 have_pixmap = 1;
2545 rootpixmap = *(Pixmap *)prop;
2546 XFree (prop);
2547 }
2548
2549 if (have_pixmap)
2550 {
2551 /*
2552 * Copy display->root pixmap transparency
2553 */
2554 int sx, sy, nx, ny;
2555 unsigned int nw, nh;
2556 Window cr;
2557 XImage *image;
2558 GC gc;
2559 XGCValues gcvalue;
2560
2561 XTranslateCoordinates (disp, parent[0], display->root,
2562 0, 0, &sx, &sy, &cr);
2563 nw = (unsigned int)szHint.width;
2564 nh = (unsigned int)szHint.height;
2565 nx = ny = 0;
2566
2567 if (sx < 0)
2568 {
2569 nw += sx;
2570 nx = -sx;
2571 sx = 0;
2572 }
2573
2574 if (sy < 0)
2575 {
2576 nh += sy;
2577 ny = -sy;
2578 sy = 0;
2579 }
2580
2581 min_it (nw, (unsigned int) (wrootattr.width - sx));
2582 min_it (nh, (unsigned int) (wrootattr.height - sy));
2583
2584 XSync (disp, False);
2585 allowedxerror = -1;
2586 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2587
2588 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2589 /* XXX: may need a delay here? */
2590 allowedxerror = 0;
2591
2592 if (image == NULL)
2593 {
2594 if (am_transparent && am_pixmap_trans)
2595 {
2596 pchanged = 1;
2597 if (pixmap != None)
2598 {
2599 XFreePixmap (disp, pixmap);
2600 pixmap = None;
2601 }
2602 }
2603
2604 am_pixmap_trans = 0;
2605 }
2606 else
2607 {
2608 if (pixmap != None)
2609 XFreePixmap (disp, pixmap);
2610
2611#if TINTING
2612 if (ISSET_PIXCOLOR (Color_tint))
2613 {
2614 unsigned short rm, gm, bm;
2615 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2616
2617 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2618
2619 ShadeXImage (display, image, shade, rm, gm, bm);
2620 }
2621#endif
2622
2623 pixmap = XCreatePixmap (disp, vt,
2624 szHint.width, szHint.height, image->depth);
2625 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2626 XPutImage (disp, pixmap, gc, image, 0, 0,
2627 nx, ny, image->width, image->height);
2628 XFreeGC (disp, gc);
2629 XDestroyImage (image);
2630 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2631 XClearWindow (disp, parent[0]);
2632
2633 if (!am_transparent || !am_pixmap_trans)
2634 pchanged = 1;
2635
2636 am_transparent = am_pixmap_trans = 1;
2637 }
2638 }
2639
2640 if (am_pixmap_trans)
2641 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2642 else
2643 {
2644 unsigned int n;
2645 /*
2646 * InheritPixmap transparency
2647 */
2648 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 {
2650 oldp = parent[i];
2651 XQueryTree (disp, parent[i - 1], &root,
2652 &parent[i], &list, &n);
2653 XFree (list);
2654
2655 if (parent[i] == display->root)
2656 {
2657 if (oldp != None)
2658 pchanged = 1;
2659
2660 break;
2661 }
2662
2663 if (oldp != parent[i])
2664 pchanged = 1;
2665 }
2666
2667 n = 0;
2668
2669 if (pchanged)
2670 {
2671 for (; n < (unsigned int)i; n++)
2672 {
2673 XGetWindowAttributes (disp, parent[n], &wattr);
2674 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2675 {
2676 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2677 break;
2678 }
2679 }
2680 }
2681
2682 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2683 {
2684 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2685 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2686 am_transparent = 0;
2687 /* XXX: also turn off Opt_transparent? */
2688 }
2689 else
2690 {
2691#if WAIT_FOR_WM
2692 /* wait (an arbitrary period) for the WM to do its thing
2693 * needed for fvwm2.2.2 (and before?) */
2694 sleep (1);
2695#endif
2696 for (n = 0; n < (unsigned int)i; n++)
2697 {
2698 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2699 XClearWindow (disp, parent[n]);
2700 }
2701
2702 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2703 am_transparent = 1;
2704 }
2705
2706 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2707 parent[i] = None;
2708 }
2709
2710 if (scrollBar.win)
2711 {
2712 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2713 scrollBar.setIdle ();
2714 scrollbar_show (0);
2715 }
2716
2717 if (am_transparent)
2718 {
2719 want_refresh = want_full_refresh = 1;
2720 if (am_pixmap_trans)
2721 flush ();
2722 }
2723
2724 return pchanged;
2725}
2726#endif
2727 2216
2728/*}}} */ 2217/*}}} */
2729 2218
2730bool 2219void
2731rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2732{ 2221{
2733 bool flag = false;
2734 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2735 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2736 2224
2737 for (;;) 2225 for (;;)
2738 { 2226 {
2739 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2740 { 2228 {
2741 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2742 ch = next_char (); 2230 ch = next_char ();
2743 2231
2744 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2745 break; 2233 break;
2746 } 2234 }
2747 2235
2748 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2749 { 2237 {
2750 if (!seen_input) 2238 if (expect_false (!seen_input))
2751 { 2239 {
2752 seen_input = 1; 2240 seen_input = 1;
2753 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2754 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2755 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2768 wchar_t *str = buf; 2256 wchar_t *str = buf;
2769 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2770 2258
2771 for (;;) 2259 for (;;)
2772 { 2260 {
2773 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2774 break; 2262 break;
2775 2263
2776 *str++ = ch; 2264 *str++ = ch;
2777 2265
2778 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2779 { 2267 {
2780 if (ch == C0_LF) 2268 if (ch == C0_LF)
2781 nlines++; 2269 nlines++;
2782 2270
2783 refresh_count++; 2271 refresh_count++;
2784 2272
2785 if (!OPTION (Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2786 || (refresh_count >= refresh_limit * (nrow - 1)))
2787 { 2274 {
2788 refreshnow = true;
2789 refresh_count = 0; 2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 {
2279 refreshnow = true;
2790 ch = NOCHAR; 2280 ch = NOCHAR;
2791 break; 2281 break;
2282 }
2792 } 2283 }
2793 2284
2794 // scr_add_lines only works for nlines <= nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2795 if (nlines >= nrow - 1) 2286 if (nlines >= nrow - 1)
2796 { 2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798 scr_add_lines (buf, str - buf, nlines); 2290 scr_add_lines (buf, str - buf, nlines);
2799 2291
2800 nlines = 0; 2292 nlines = 0;
2801 str = buf; 2293 str = buf;
2802 eol = str + min (ncol, UBUFSIZ); 2294 eol = str + min (ncol, UBUFSIZ);
… …
2817 2309
2818 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2819 ch = next_char (); 2311 ch = next_char ();
2820 } 2312 }
2821 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823 scr_add_lines (buf, str - buf, nlines); 2316 scr_add_lines (buf, str - buf, nlines);
2824 2317
2825 /* 2318 /*
2826 * If there have been a lot of new lines, then update the screen 2319 * If there have been a lot of new lines, then update the screen
2827 * What the heck I'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2828 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2829 * is incremented here because we must be doing flat-out scrolling.
2830 */ 2322 */
2831 if (refreshnow) 2323 if (refreshnow)
2832 { 2324 {
2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834 refresh_limit++;
2835 else
2836 {
2837 flag = true;
2838 scr_refresh (refresh_type); 2325 scr_refresh ();
2839 flush_ev.stop (); 2326 want_refresh = 1;
2840 }
2841 } 2327 }
2842
2843 } 2328 }
2844 else 2329 else
2845 { 2330 {
2846 try 2331 try
2847 { 2332 {
… …
2855 } 2340 }
2856 2341
2857 ch = NOCHAR; 2342 ch = NOCHAR;
2858 } 2343 }
2859 } 2344 }
2860
2861 return flag;
2862} 2345}
2863 2346
2864// read the next character 2347// read the next character
2865wchar_t 2348wchar_t
2866rxvt_term::next_char () 2349rxvt_term::next_char () NOTHROW
2867{ 2350{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2352 {
2870 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2872 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2873 2356
2874 wchar_t wc; 2357 wchar_t wc;
2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2876 2359
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2364 break;
2882 } 2365 }
2883 2366
2884 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2885 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2886 2372
2887 // assume wchar == unicode 2373 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2890 } 2376 }
… …
2892 return NOCHAR; 2378 return NOCHAR;
2893} 2379}
2894 2380
2895// read the next octet 2381// read the next octet
2896uint32_t 2382uint32_t
2897rxvt_term::next_octet () 2383rxvt_term::next_octet () NOTHROW
2898{ 2384{
2899 return cmdbuf_ptr < cmdbuf_endp 2385 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++ 2386 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR; 2387 : NOCHAR;
2902} 2388}
2903 2389
2904/* rxvt_cmd_getc () - Return next input character */ 2390static class out_of_input out_of_input;
2905/* 2391
2906 * Return the next input character after first passing any keyboard input
2907 * to the command.
2908 */
2909wchar_t 2392wchar_t
2910rxvt_term::cmd_getc () 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2911{ 2394{
2912 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2913 2396
2914 if (c == NOCHAR) 2397 if (c == NOCHAR)
2915 throw out_of_input; 2398 throw out_of_input;
2916 2399
2917 return c; 2400 return c;
2918} 2401}
2919 2402
2920uint32_t 2403uint32_t
2921rxvt_term::cmd_get8 () 2404rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922{ 2405{
2923 uint32_t c = next_octet (); 2406 uint32_t c = next_octet ();
2924 2407
2925 if (c == NOCHAR) 2408 if (c == NOCHAR)
2926 throw out_of_input; 2409 throw out_of_input;
… …
2932/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2933#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2934FILE * 2417FILE *
2935rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2936{ 2419{
2937 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2938 2421
2939 if (stream == NULL) 2422 if (stream == NULL)
2940 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2941 2424
2942 return stream; 2425 return stream;
… …
2953 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2954 */ 2437 */
2955void 2438void
2956rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2957{ 2440{
2958 int done; 2441 FILE *fd = popen_printer ();
2959 FILE *fd;
2960 2442
2961 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2962 return; 2444 return;
2963 2445
2964 /* 2446 /*
2965 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2966 * is received. 2448 * is received.
2967 */ 2449 */
2968 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2969 { 2451 {
2970 unsigned char buf[8]; 2452 unsigned char buf[8];
2971 unicode_t ch; 2453 unicode_t ch;
2972 unsigned int i, len; 2454 unsigned int i, len;
2973 2455
… …
2992 { 2474 {
2993 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
2994 break; /* done = 1 */ 2476 break; /* done = 1 */
2995 } 2477 }
2996 } 2478 }
2997 2479
2998 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
2999 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
3000 { 2482 {
3001 done = 1; 2483 done = 1;
3002 break; 2484 break;
… …
3004 } 2486 }
3005 } 2487 }
3006 2488
3007 pclose_printer (fd); 2489 pclose_printer (fd);
3008} 2490}
3009#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
3010/*}}} */ 2492/*}}} */
3011 2493
3012/* *INDENT-OFF* */ 2494/* *INDENT-OFF* */
3013enum { 2495enum {
3014 C1_40 = 0x40, 2496 C1_40 = 0x40,
… …
3064 process_dcs_seq (); 2546 process_dcs_seq ();
3065 break; 2547 break;
3066 case 0x9b: /* CSI */ 2548 case 0x9b: /* CSI */
3067 process_csi_seq (); 2549 process_csi_seq ();
3068 break; 2550 break;
3069 case 0x9d: /* CSI */ 2551 case 0x9d: /* OSC */
3070 process_osc_seq (); 2552 process_osc_seq ();
3071 break; 2553 break;
3072#endif 2554#endif
3073 } 2555 }
3074} 2556}
… …
3118 break; 2600 break;
3119 case 'Z': /* identify the terminal type */ 2601 case 'Z': /* identify the terminal type */
3120 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3121 break; 2603 break;
3122 case '<': /* turn off VT52 mode */ 2604 case '<': /* turn off VT52 mode */
3123 PrivMode (0, PrivMode_vt52); 2605 set_privmode (PrivMode_vt52, 0);
3124 break; 2606 break;
3125 case 'F': /* use special graphics character set */ 2607 case 'F': /* use special graphics character set */
3126 case 'G': /* use regular character set */ 2608 case 'G': /* use regular character set */
3127 /* unimplemented */ 2609 /* unimplemented */
3128 break; 2610 break;
… …
3164 scr_charset_set (2, (unsigned int)cmd_getc ()); 2646 scr_charset_set (2, (unsigned int)cmd_getc ());
3165 break; 2647 break;
3166 case '+': 2648 case '+':
3167 scr_charset_set (3, (unsigned int)cmd_getc ()); 2649 scr_charset_set (3, (unsigned int)cmd_getc ());
3168 break; 2650 break;
3169#if ENABLE_FRILLS 2651#if !ENABLE_MINIMAL
3170 case '6': 2652 case '6':
3171 scr_backindex (); 2653 scr_backindex ();
3172 break; 2654 break;
3173#endif 2655#endif
3174 case '7': 2656 case '7':
3175 scr_cursor (SAVE); 2657 scr_cursor (SAVE);
3176 break; 2658 break;
3177 case '8': 2659 case '8':
3178 scr_cursor (RESTORE); 2660 scr_cursor (RESTORE);
3179 break; 2661 break;
3180#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3181 case '9': 2663 case '9':
3182 scr_forwardindex (); 2664 scr_forwardindex ();
3183 break; 2665 break;
3184#endif 2666#endif
3185 case '=': 2667 case '=':
3186 case '>': 2668 case '>':
3187 PrivMode ((ch == '='), PrivMode_aplKP); 2669 set_privmode (PrivMode_aplKP, ch == '=');
3188 break; 2670 break;
3189 2671
3190 case C1_40: 2672 case C1_40:
3191 cmd_getc (); 2673 cmd_getc ();
3192 break; 2674 break;
… …
3196 2678
3197 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
3198 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
3199 { 2681 {
3200 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
3201 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3202 } 2684 }
3203 break; 2685 break;
3204 2686
3205 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
3206 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
3207 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3208 break; 2692 break;
3209 2693
3210 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
3211 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
3212 scr_set_tab (1); 2696 scr_set_tab (1);
… …
3231 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3232 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
3233 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3234 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
3235 2719
3236 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3237 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
3238 process_csi_seq (); 2722 process_csi_seq ();
3239 break; 2723 break;
3240 2724
3241 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3242 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
3243 process_osc_seq (); 2727 process_osc_seq ();
3244 break; 2728 break;
3245 2729
3246 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3247 case 'c': 2731 case 'c':
3248 mbstate.reset (); 2732 mbstate.reset ();
3249 scr_poweron (); 2733 scr_poweron ();
3250 scrollbar_show (1); 2734 scrollBar.show (1);
3251 break; 2735 break;
3252 2736
3253 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3254 case 'n': 2738 case 'n':
3255 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
3275 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3276 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3277 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3278}; 2762};
3279 2763
3280#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3281 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3282 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3283#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
3284 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3285 2769
3286const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
3287 { 2771 {
3288 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3289 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3290 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3291 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3300rxvt_term::process_csi_seq () 2784rxvt_term::process_csi_seq ()
3301{ 2785{
3302 unicode_t ch, priv, i; 2786 unicode_t ch, priv, i;
3303 unsigned int nargs, p; 2787 unsigned int nargs, p;
3304 int n, ndef; 2788 int n, ndef;
3305 int arg[ESC_ARGS]; 2789 int arg[ESC_ARGS] = { };
3306 2790
3307 for (nargs = ESC_ARGS; nargs > 0;) 2791 nargs = 0;
3308 arg[--nargs] = 0;
3309 2792
3310 priv = 0; 2793 priv = 0;
3311 ch = cmd_getc (); 2794 ch = cmd_getc ();
3312 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
3313 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
3314 priv = ch; 2798 priv = ch;
3315 ch = cmd_getc (); 2799 ch = cmd_getc ();
3316 } 2800 }
3317 2801
3318 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
3347 ndef = get_byte_array_bit (csi_defaults, i); 2831 ndef = get_byte_array_bit (csi_defaults, i);
3348 for (p = 0; p < nargs; p++) 2832 for (p = 0; p < nargs; p++)
3349 if (arg[p] == -1) 2833 if (arg[p] == -1)
3350 arg[p] = ndef; 2834 arg[p] = ndef;
3351 2835
3352#ifdef DEBUG_CMD
3353 fprintf (stderr, "CSI ");
3354 for (p = 0; p < nargs; p++)
3355 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3356 fprintf (stderr, "%c\n", ch);
3357#endif
3358
3359 /* 2836 /*
3360 * private mode handling 2837 * private mode handling
3361 */ 2838 */
3362 if (priv) 2839 if (priv)
3363 { 2840 {
3364 switch (priv) 2841 switch (priv)
3365 { 2842 {
3366 case '>': 2843 case '>':
3367 if (ch == CSI_DA) /* secondary device attributes */ 2844 if (ch == CSI_DA) /* secondary device attributes */
3368 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2845 {
2846 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2847 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2848 //
2849 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2850 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2851 // versions.
2852 //
2853 tt_printf ("\033[>%d;95;0c", 'U');
2854 }
3369 break; 2855 break;
2856
3370 case '?': 2857 case '?':
3371 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3372 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
3373 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3374 } 2873 }
2874 break;
2875 }
2876
3375 return; 2877 return;
3376 } 2878 }
3377 2879
3378 switch (ch) 2880 switch (ch)
3379 { 2881 {
… …
3499 break; 3001 break;
3500 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
3501 scr_report_position (); 3003 scr_report_position ();
3502 break; 3004 break;
3503 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3504 if (OPTION (Opt_insecure)) 3006 if (option (Opt_insecure))
3505 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3506 break; 3008 break;
3507 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
3508 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3509 break; 3011 break;
… …
3576 break; 3078 break;
3577 case CSI_75: 3079 case CSI_75:
3578 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3579 break; 3081 break;
3580 3082
3581#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3582 case CSI_74: 3084 case CSI_74:
3583 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
3584 break; 3086 break;
3585#endif 3087#endif
3586 3088
… …
3593 break; 3095 break;
3594 } 3096 }
3595} 3097}
3596/*}}} */ 3098/*}}} */
3597 3099
3598#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3599/* ARGSUSED */ 3101/* ARGSUSED */
3600void 3102void
3601rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3602{ 3104{
3603 int x, y; 3105 int x, y;
3604 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
3605 Window wdummy; 3107 Window wdummy;
3606 dDisp; 3108
3109 dLocal (Display *, dpy);
3607 3110
3608 if (nargs == 0) 3111 if (nargs == 0)
3609 return; 3112 return;
3610 3113
3611 switch (args[0]) 3114 switch (args[0])
3612 { 3115 {
3613 /* 3116 /*
3614 * commands 3117 * commands
3615 */ 3118 */
3616 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3617 XMapWindow (disp, parent[0]); 3120 XMapWindow (dpy, parent);
3618 break; 3121 break;
3619 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3620 XIconifyWindow (disp, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3621 break; 3124 break;
3622 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3623 XMoveWindow (disp, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3624 break; 3127 break;
3625 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3626 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3627 break; 3130 break;
3628 case 5: /* raise window */ 3131 case 5: /* raise window */
3629 XRaiseWindow (disp, parent[0]); 3132 XRaiseWindow (dpy, parent);
3630 break; 3133 break;
3631 case 6: /* lower window */ 3134 case 6: /* lower window */
3632 XLowerWindow (disp, parent[0]); 3135 XLowerWindow (dpy, parent);
3633 break; 3136 break;
3634 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3635 scr_touch (true); 3138 scr_touch (true);
3636 break; 3139 break;
3637 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3644 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
3645 set_widthheight ((unsigned int)width, 3148 set_widthheight ((unsigned int)width,
3646 (unsigned int) (args[1] * fheight)); 3149 (unsigned int) (args[1] * fheight));
3647 break; 3150 break;
3648 3151
3649
3650 /* 3152 /*
3651 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3652 */ 3154 */
3653 case 11: /* report window state */ 3155 case 11: /* report window state */
3654 XGetWindowAttributes (disp, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3655 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3656 break; 3158 break;
3657 case 13: /* report window position */ 3159 case 13: /* report window position */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3659 XTranslateCoordinates (disp, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3660 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3661 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3662 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3663 break; 3165 break;
3664 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3665 XGetWindowAttributes (disp, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3666 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3667 break; 3169 break;
3668 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3669 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3670 break; 3172 break;
… …
3672 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3673 break; 3175 break;
3674 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3675 { 3177 {
3676 char *s; 3178 char *s;
3677 XGetIconName (disp, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3678 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679 XFree (s); 3181 XFree (s);
3680 } 3182 }
3681 break; 3183 break;
3682 case 21: /* report window title */ 3184 case 21: /* report window title */
3683 { 3185 {
3684 char *s; 3186 char *s;
3685 XFetchName (disp, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3686 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3687 XFree (s); 3189 XFree (s);
3688 } 3190 }
3689 break; 3191 break;
3690 } 3192 }
3691} 3193}
… …
3718 seen_esc = true; 3220 seen_esc = true;
3719 continue; 3221 continue;
3720 } 3222 }
3721 else if (ch == C0_BEL || ch == CHAR_ST) 3223 else if (ch == C0_BEL || ch == CHAR_ST)
3722 break; 3224 break;
3225 else if (ch == C0_SYN)
3226 ch = cmd_get8 ();
3723 else if (ch < 0x20) 3227 else if (ch < 0x20)
3724 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
3725 3229
3726 seen_esc = false; 3230 seen_esc = false;
3727 3231
3728 if (n >= STRING_MAX - 1) 3232 if (n >= STRING_MAX - 1)
3729 // stop at some sane length 3233 // stop at some sane length
3730 return NULL; 3234 return NULL;
3731 3235
3732 if (ch == C0_SYN)
3733 string[n++] = cmd_get8 ();
3734 else
3735 string[n++] = ch; 3236 string[n++] = ch;
3736 } 3237 }
3737 3238
3738 string[n++] = '\0'; 3239 string[n++] = '\0';
3739 3240
3740 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3747 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3748 */ 3249 */
3749void 3250void
3750rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3751{ 3252{
3752 char *s;
3753 unicode_t eh;
3754
3755 /* 3253 /*
3756 * Not handled yet 3254 * Not handled yet
3757 */ 3255 */
3256
3257 unicode_t eh;
3758 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3759 if (s) 3259 if (s)
3760 free (s); 3260 free (s);
3761 3261
3762 return; 3262 return;
3763} 3263}
… …
3767 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3768 */ 3268 */
3769void 3269void
3770rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3771{ 3271{
3772 unicode_t ch, eh;
3773 int arg; 3272 int arg;
3774 3273
3775 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3776 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3777 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3778 3277
3779 if (ch == ';') 3278 if (ch == ';')
3780 { 3279 {
3280 unicode_t eh;
3781 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3782 3282
3783 if (s) 3283 if (s)
3784 { 3284 {
3785 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3791void 3291void
3792rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3793{ 3293{
3794 if (str[0] == '?' && !str[1]) 3294 if (str[0] == '?' && !str[1])
3795 { 3295 {
3796 unsigned short r, g, b; 3296 rgba c;
3797 pix_colors_focused[color].get (display, r, g, b); 3297 pix_colors_focused[color].get (c);
3298
3299#if XFT
3300 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3302 else
3303#endif
3798 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3799 } 3305 }
3800 else 3306 else
3801 set_window_color (color, str); 3307 set_window_color (color, str);
3802} 3308}
3803 3309
3804/* 3310/*
3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806 */ 3312 */
3807void 3313void
3808rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3809{ 3315{
3810 int changed = 0;
3811 int color; 3316 int color;
3812 char *buf, *name; 3317 char *buf, *name;
3813 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3814 int saveop = op; 3319 int saveop = op;
3815 dDisp; 3320
3321 dLocal (Display *, dpy);
3816 3322
3817 assert (str != NULL); 3323 assert (str != NULL);
3324
3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3326 return;
3327
3818 switch (op) 3328 switch (op)
3819 { 3329 {
3820 case XTerm_name: 3330 case XTerm_name:
3821 set_title (str); 3331 set_title (str);
3822 /* FALLTHROUGH */ 3332 /* FALLTHROUGH */
… …
3836 unsigned long bytes_after; 3346 unsigned long bytes_after;
3837 unsigned char *value = 0; 3347 unsigned char *value = 0;
3838 const char *str = ""; 3348 const char *str = "";
3839 3349
3840 if (prop 3350 if (prop
3841 && XGetWindowProperty (disp, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3842 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3843 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3844 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3845 && actual_type != None 3355 && actual_type != None
3846 && actual_format == 8) 3356 && actual_format == 8)
3847 str = (const char *)(value); 3357 str = (const char *)(value);
3848 3358
3849 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3359 tt_printf ("\033]%d;%s%c", op, str, resp);
3850 3360
3851 XFree (value); 3361 XFree (value);
3852 } 3362 }
3853 else 3363 else
3854 { 3364 {
3855 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3856 3366
3857 if (eq) 3367 if (eq)
3858 { 3368 {
3859 *eq = 0; 3369 *eq = 0;
3860 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3861 } 3371 }
3862 else 3372 else
3863 XDeleteProperty (disp, parent[0], 3373 XDeleteProperty (dpy, parent,
3864 display->atom (str)); 3374 display->atom (str));
3865 } 3375 }
3866 break; 3376 break;
3867 3377
3868 case XTerm_Color: 3378 case XTerm_Color:
… …
3870 { 3380 {
3871 if ((name = strchr (buf, ';')) == NULL) 3381 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3382 break;
3873 3383
3874 *name++ = '\0'; 3384 *name++ = '\0';
3875 color = atoi (buf); 3385 color = atoi (buf) + minCOLOR;
3876 3386
3877 if (color < 0 || color >= TOTAL_COLORS) 3387 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3388 break;
3879 3389
3880 if ((buf = strchr (name, ';')) != NULL) 3390 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3391 *buf++ = '\0';
3882 3392
3883 if (name[0] == '?' && !name[1]) 3393 process_color_seq (op, color, name, resp);
3394 }
3395 break;
3396 case Rxvt_restoreFG:
3397 case XTerm_Color00:
3398 process_color_seq (op, Color_fg, str, resp);
3399 break;
3400 case Rxvt_restoreBG:
3401 case XTerm_Color01:
3402 process_color_seq (op, Color_bg, str, resp);
3403 break;
3404#ifndef NO_CURSORCOLOR
3405 case XTerm_Color_cursor:
3406 process_color_seq (op, Color_cursor, str, resp);
3407 break;
3408#endif
3409 case XTerm_Color_pointer_fg:
3410 process_color_seq (op, Color_pointer_fg, str, resp);
3411 break;
3412 case XTerm_Color_pointer_bg:
3413 process_color_seq (op, Color_pointer_bg, str, resp);
3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3424 case URxvt_Color_BD:
3425 process_color_seq (op, Color_BD, str, resp);
3426 break;
3427 case URxvt_Color_UL:
3428 process_color_seq (op, Color_UL, str, resp);
3429 break;
3430 case URxvt_Color_IT:
3431 process_color_seq (op, Color_IT, str, resp);
3432 break;
3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3437#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp);
3440 {
3441 bool changed = false;
3442
3443 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445
3446 if (changed)
3447 update_background ();
3448 }
3449
3450 break;
3451#endif
3452
3453#if BG_IMAGE_FROM_FILE
3454 case Rxvt_Pixmap:
3455 if (!strcmp (str, "?"))
3456 {
3457 char str[256];
3458
3459 sprintf (str, "[%dx%d+%d+%d]",
3460 min (h_scale, 32767), min (v_scale, 32767),
3461 min (h_align, 32767), min (v_align, 32767));
3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3463 }
3464 else
3465 {
3466 int changed = 0;
3467
3468 if (*str != ';')
3884 { 3469 {
3885 unsigned short r, g, b; 3470 if (bg_set_file (str)) /* change pixmap */
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3471 {
3887 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3472 changed++;
3473 str = strchr (str, ';');
3474 if (str == NULL)
3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3888 } 3479 }
3889 else 3480 else
3890 set_window_color (color + minCOLOR, name); 3481 {
3482 str++;
3483 if (bg_set_geometry (str, true))
3484 changed++;
3485 }
3486
3487 if (changed)
3488 {
3489 if (bg_window_position_sensitive ())
3490 {
3491 int x, y;
3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3495 update_background ();
3496 }
3891 } 3497 }
3892 break; 3498 break;
3893 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break;
3896 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3898 break;
3899#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break;
3903#endif 3499#endif
3904 case XTerm_Color_pointer_fg:
3905 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3906 break;
3907 case XTerm_Color_pointer_bg:
3908 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3909 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE
3911 case XTerm_Color_BD:
3912 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913 break;
3914 case XTerm_Color_UL:
3915 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916 break;
3917 case XTerm_Color_RV:
3918 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3919 break;
3920 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break;
3923#endif
3924#if TRANSPARENT && TINTING
3925 case URxvt_Color_tint:
3926 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3927 check_our_parents ();
3928 if (am_transparent)
3929 want_full_refresh = want_refresh = 1;
3930 break;
3931#endif
3932
3933 case XTerm_Pixmap:
3934 if (*str != ';')
3935 {
3936#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true);
3941 }
3942 while ((str = strchr (str, ';')) != NULL)
3943 {
3944 str++;
3945#if XPM_BACKGROUND
3946 changed += scale_pixmap (str);
3947#endif
3948 }
3949
3950 if (changed)
3951 {
3952#ifdef XPM_BACKGROUND
3953 resize_pixmap ();
3954#endif
3955 scr_touch (true);
3956 }
3957 break;
3958
3959 case XTerm_restoreFG:
3960 set_window_color (Color_fg, str);
3961 break;
3962 case XTerm_restoreBG:
3963 set_window_color (Color_bg, str);
3964 break;
3965 3500
3966 case XTerm_logfile: 3501 case XTerm_logfile:
3967 // TODO, when secure mode? 3502 // TODO, when secure mode?
3968 break; 3503 break;
3969 3504
3970#ifdef MENUBAR
3971 case URxvt_Menu:
3972 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break;
3975#endif
3976#if 0 3505#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3506 case Rxvt_dumpscreen: /* no error notices */
3978 { 3507 {
3979 int fd; 3508 int fd;
3980 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3509 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3981 { 3510 {
3982 scr_dump (fd); 3511 scr_dump (fd);
… …
3993 case URxvt_italicFont: 3522 case URxvt_italicFont:
3994 case URxvt_boldItalicFont: 3523 case URxvt_boldItalicFont:
3995#endif 3524#endif
3996 if (query) 3525 if (query)
3997 tt_printf ("\33]%d;%-.250s%c", saveop, 3526 tt_printf ("\33]%d;%-.250s%c", saveop,
3998 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3527 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3999 ? fontset[op - URxvt_font]->fontdesc : "", 3528 ? fontset[op - URxvt_font]->fontdesc : "",
4000 resp); 3529 resp);
4001 else 3530 else
4002 { 3531 {
4003 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3532 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4006 allocated.push_back ((void *)res); 3535 allocated.push_back ((void *)res);
4007 set_fonts (); 3536 set_fonts ();
4008 } 3537 }
4009 break; 3538 break;
4010 3539
4011#if ENABLE_FRILLS 3540 case URxvt_version:
3541 if (query)
3542 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3543 op,
3544 rs[Rs_name], VERSION[0], VERSION[2],
3545 resp);
3546 break;
3547
3548#if !ENABLE_MINIMAL
4012 case URxvt_locale: 3549 case URxvt_locale:
4013 if (query) 3550 if (query)
4014 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3551 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4015 else 3552 else
4016 { 3553 {
4017 set_locale (str); 3554 set_locale (str);
4018 pty.set_utf8_mode (enc_utf8); 3555 pty->set_utf8_mode (enc_utf8);
4019 init_xlocale (); 3556 init_xlocale ();
4020 } 3557 }
4021 break; 3558 break;
4022 3559
4023 case URxvt_view_up: 3560 case URxvt_view_up:
… …
4034 break; 3571 break;
4035#endif 3572#endif
4036 3573
4037#if ENABLE_PERL 3574#if ENABLE_PERL
4038 case URxvt_perl: 3575 case URxvt_perl:
4039 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3576 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4040 ; // no responses yet
4041 break; 3577 break;
4042#endif 3578#endif
4043 } 3579 }
4044} 3580}
4045/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
4068 { 3604 {
4069 if (mode == 'r') 3605 if (mode == 'r')
4070 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4071 else 3607 else
4072 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4073 PrivMode (state, bit); 3609
3610 set_privmode (bit, state);
4074 } 3611 }
4075 3612
4076 return state; 3613 return state;
4077} 3614}
4078 3615
4079/* we're not using priv _yet_ */ 3616/* we're not using priv _yet_ */
4080void 3617void
4081rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4082{ 3619{
4083 unsigned int i, j; 3620 unsigned int i, j;
4084 int state; 3621 int state;
4085 3622
4086 static const struct 3623 static const struct
4087 { 3624 {
4088 const int argval; 3625 const int argval;
4089 const unsigned long bit; 3626 const unsigned long bit;
4090 }
4091
4092 argtopriv[] = { 3627 } argtopriv[] = {
4093 { 1, PrivMode_aplCUR }, 3628 { 1, PrivMode_aplCUR }, // DECCKM
4094 { 2, PrivMode_vt52 }, 3629 { 2, PrivMode_vt52 },
4095 { 3, PrivMode_132 }, 3630 { 3, PrivMode_132 }, // DECCOLM
4096 { 4, PrivMode_smoothScroll }, 3631 { 4, PrivMode_smoothScroll }, // DECSCLM
4097 { 5, PrivMode_rVideo }, 3632 { 5, PrivMode_rVideo }, // DECSCNM
4098 { 6, PrivMode_relOrigin }, 3633 { 6, PrivMode_relOrigin }, // DECOM
4099 { 7, PrivMode_Autowrap }, 3634 { 7, PrivMode_Autowrap }, // DECAWM
4100 // 8, bi-directional support mode 3635 // 8, auto-repeat keys // DECARM
4101 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
4102#ifdef menuBar_esc 3637 // 18 end FF to printer after print screen
4103 { menuBar_esc, PrivMode_menuBar }, 3638 // 19 Print screen prints full screen/scroll region
4104#endif
4105 // 18, 19 printing-related
4106 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4107#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
4108 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
4109#endif 3642#endif
4110 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK
4111 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
4112 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
4113 // 45 margin bell NYI 3647 // 45 margin bell NYI
4114 // 46 start logging 3648 // 46 start logging
4115 { 47, PrivMode_Screen }, 3649 { 47, PrivMode_Screen },
4116 { 66, PrivMode_aplKP }, 3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4117#ifndef NO_BACKSPACE_KEY 3651#ifndef NO_BACKSPACE_KEY
4118 { 67, PrivMode_BackSpace }, 3652 { 67, PrivMode_BackSpace }, // DECBKM
4119#endif 3653#endif
4120 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
4121 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3655 { 1002, PrivMode_MouseBtnEvent },
4122 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3656 { 1003, PrivMode_MouseAnyEvent },
4123 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
4124 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4125 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
4126 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
4127 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
4128 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
4129 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
4130 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
4131 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4132 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3672 { 2004, PrivMode_BracketPaste },
4133 }; 3673 };
4134 3674
4135 if (nargs == 0) 3675 if (nargs == 0)
4136 return; 3676 return;
4137 3677
… …
4144 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
4145 { 3685 {
4146 state = -1; 3686 state = -1;
4147 3687
4148 /* basic handling */ 3688 /* basic handling */
4149 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4150 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
4151 { 3691 {
4152 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
4153 break; 3693 break;
4154 } 3694 }
… …
4162 3702
4163 scr_touch (true); 3703 scr_touch (true);
4164 break; 3704 break;
4165#endif 3705#endif
4166 case 1048: /* alternative cursor save */ 3706 case 1048: /* alternative cursor save */
4167 case 1049:
4168 if (OPTION (Opt_secondaryScreen)) 3707 if (option (Opt_secondaryScreen))
4169 if (mode == 0) 3708 if (mode == 0)
4170 scr_cursor (RESTORE); 3709 scr_cursor (RESTORE);
4171 else if (mode == 1) 3710 else if (mode == 1)
4172 scr_cursor (SAVE); 3711 scr_cursor (SAVE);
4173 break; 3712 break;
… …
4181 case 2: /* VT52 mode */ 3720 case 2: /* VT52 mode */
4182 /* oddball mode. should be set regardless of set/reset 3721 /* oddball mode. should be set regardless of set/reset
4183 * parameter. Return from VT52 mode with an ESC < from 3722 * parameter. Return from VT52 mode with an ESC < from
4184 * within VT52 mode 3723 * within VT52 mode
4185 */ 3724 */
4186 PrivMode (1, PrivMode_vt52); 3725 set_privmode (PrivMode_vt52, 1);
4187 break; 3726 break;
4188 case 3: /* 80/132 */ 3727 case 3: /* 80/132 */
4189 if (priv_modes & PrivMode_132OK) 3728 if (priv_modes & PrivMode_132OK)
4190 set_widthheight (((state ? 132 : 80) * fwidth), height); 3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4191 break; 3730 break;
4192 case 4: /* smooth scrolling */ 3731 case 4: /* smooth scrolling */
4193 set_option (Opt_jumpScroll, !state); 3732 set_option (Opt_jumpScroll, !state);
4194 break; 3733 break;
4195 case 5: /* reverse video */ 3734 case 5: /* reverse video */
… …
4202 scr_autowrap (state); 3741 scr_autowrap (state);
4203 break; 3742 break;
4204 /* case 8: - auto repeat, can't do on a per window basis */ 3743 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 3744 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4208 break; 3747 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 3748#ifdef scrollBar_esc
4217 case scrollBar_esc: 3749 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 3750 if (scrollBar.map (state))
4219 { 3751 {
4220 resize_all_windows (0, 0, 0); 3752 resize_all_windows (0, 0, 0);
4221 scr_touch (true); 3753 scr_touch (true);
4222 } 3754 }
4223 break; 3755 break;
… …
4232 break; 3764 break;
4233 /* case 66: - application key pad */ 3765 /* case 66: - application key pad */
4234 /* case 67: - backspace key */ 3766 /* case 67: - backspace key */
4235 case 1000: /* X11 mouse reporting */ 3767 case 1000: /* X11 mouse reporting */
4236 if (state) /* orthogonal */ 3768 if (state) /* orthogonal */
4237 priv_modes &= ~PrivMode_MouseX10; 3769 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4238 break; 3770 break;
4239#if 0
4240 case 1001: 3771 case 1002:
4241 break; /* X11 mouse highlighting */ 3772 case 1003:
4242#endif 3773 if (state)
3774 {
3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3778 vt_emask_mouse = PointerMotionMask;
3779 }
3780 else
3781 vt_emask_mouse = NoEventMask;
3782
3783 vt_select_input ();
3784 break;
4243 case 1010: /* scroll to bottom on TTY output inhibit */ 3785 case 1010: /* scroll to bottom on TTY output inhibit */
4244 set_option (Opt_scrollTtyOutput, !state); 3786 set_option (Opt_scrollTtyOutput, !state);
4245 break; 3787 break;
4246 case 1011: /* scroll to bottom on key press */ 3788 case 1011: /* scroll to bottom on key press */
4247 set_option (Opt_scrollTtyKeypress, state); 3789 set_option (Opt_scrollTtyKeypress, state);
4248 break; 3790 break;
4249 case 1047: /* secondary screen w/ clearing last */ 3791 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3793 if (!state)
4252 scr_erase_screen (2); 3794 scr_erase_screen (2);
3795
4253 scr_change_screen (state); 3796 scr_change_screen (state);
4254 break; 3797 break;
4255 case 1049: /* secondary screen w/ clearing first */ 3798 case 1049: /* secondary screen w/ clearing first */
3799 if (option (Opt_secondaryScreen))
3800 if (state)
3801 scr_cursor (SAVE);
3802
4256 scr_change_screen (state); 3803 scr_change_screen (state);
3804
4257 if (OPTION (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3806 if (state)
4259 scr_erase_screen (2); 3807 scr_erase_screen (2);
3808 else
3809 scr_cursor (RESTORE);
4260 break; 3810 break;
4261 default: 3811 default:
4262 break; 3812 break;
4263 } 3813 }
4264 } 3814 }
… …
4390 scr_color (Color_bg, Color_bg); 3940 scr_color (Color_bg, Color_bg);
4391 break; 3941 break;
4392 3942
4393 //case 50: // not variable spacing 3943 //case 50: // not variable spacing
4394 3944
4395#if ENABLE_FRILLS 3945#if !ENABLE_MINIMAL
4396 case 90: 3946 case 90:
4397 case 91: /* set bright fg color */ 3947 case 91: /* set bright fg color */
4398 case 92: 3948 case 92:
4399 case 93: 3949 case 93:
4400 case 94: 3950 case 94:
… …
4417 } 3967 }
4418 } 3968 }
4419} 3969}
4420/*}}} */ 3970/*}}} */
4421 3971
4422/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4423void
4424rxvt_term::process_graphics ()
4425{
4426 unicode_t ch, cmd = cmd_getc ();
4427
4428 if (cmd == 'Q')
4429 { /* query graphics */
4430 tt_printf ("\033G0\012"); /* no graphics */
4431 return;
4432 }
4433 /* swallow other graphics sequences until terminating ':' */
4434 do
4435 ch = cmd_getc ();
4436 while (ch != ':');
4437}
4438/*}}} */
4439
4440/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
4441 3973
4442/* 3974/*
4443 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
4444 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
4457 3989
4458/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
4459/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* Write data to the pty as typed by the user, pasted with the mouse,
4460 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
4461 */ 3993 */
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 3995
4464void 3996void
4465rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 3998{
4467 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 4000 return;
4469 4001
4470 if (pty.pty < 0) 4002 if (pty->pty < 0)
4471 return; 4003 return;
4472 4004
4473 if (v_buflen == 0) 4005 if (v_buflen == 0)
4474 { 4006 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4008
4009 max_it (written, 0);
4010
4477 if ((unsigned int)written == len) 4011 if (written == len)
4478 return; 4012 return;
4479 4013
4480 data += written; 4014 data += written;
4481 len -= written; 4015 len -= written;
4482 } 4016 }
4483 4017
4484 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4485 4019
4486 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
4487 v_buflen += len; 4021 v_buflen += len;
4488 4022
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);
4490} 4024}
4491 4025
4492void rxvt_term::pty_write () 4026void rxvt_term::pty_write ()
4493{ 4027{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4028 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4029
4496 if (written > 0) 4030 if (written > 0)
4497 { 4031 {
4498 v_buflen -= written; 4032 v_buflen -= written;
4499 4033
4500 if (v_buflen == 0) 4034 if (v_buflen == 0)
4501 { 4035 {
4502 free (v_buffer); 4036 free (v_buffer);
4503 v_buffer = 0; 4037 v_buffer = 0;
4504 v_buflen = 0;
4505 4038
4506 pty_ev.set (EVENT_READ); 4039 pty_ev.set (ev::READ);
4507 return; 4040 return;
4508 } 4041 }
4509 4042
4510 memmove (v_buffer, v_buffer + written, v_buflen); 4043 memmove (v_buffer, v_buffer + written, v_buflen);
4511 } 4044 }
4512 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4045 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4513 pty_ev.set (EVENT_READ); 4046 pty_ev.set (ev::READ);
4514} 4047}
4515 4048
4516/*----------------------- end-of-file (C source) -----------------------*/ 4049/*----------------------- end-of-file (C source) -----------------------*/
4517 4050

Diff Legend

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