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

Diff Legend

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