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.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC

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

Diff Legend

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