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

Diff Legend

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