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.211 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 2010 UTC

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

Diff Legend

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