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.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

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

Diff Legend

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