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.225 by root, Sun Jan 1 13:35:14 2006 UTC vs.
Revision 1.453 by sf-exg, Wed Aug 18 17:45:42 2010 UTC

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

Diff Legend

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