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

Diff Legend

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