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.231 by root, Wed Jan 4 00:13:22 2006 UTC vs.
Revision 1.474 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

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

Diff Legend

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