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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
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 }
777
778 if (newlen)
779 len = strlen (kbuf);
834 780
835 /* 781 /*
836 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
837 */ 783 */
838#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
873 return; 819 return;
874 820
875 if (len <= 0) 821 if (len <= 0)
876 return; /* not mapped */ 822 return; /* not mapped */
877 823
878 if (OPTION (Opt_scrollTtyKeypress)) 824 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 825 if (view_start)
880 { 826 {
881 view_start = 0; 827 view_start = 0;
882 want_refresh = 1; 828 want_refresh = 1;
883 } 829 }
… …
905 { 851 {
906 const char ch = C0_ESC; 852 const char ch = C0_ESC;
907 tt_write (&ch, 1); 853 tt_write (&ch, 1);
908 } 854 }
909 855
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); 856 tt_write (kbuf, (unsigned int)len);
921} 857}
922/*}}} */
923 858
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 859void
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 860rxvt_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{ 861{
930 unsigned int n, s; 862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym;
931 864
932 n = cmdbuf_ptr - cmdbuf_base; 865 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 866#endif
934 867
935 if (n > 0 && s < count) 868#if ENABLE_FRILLS || ISO_14755
869 // ISO 14755 support
870 if (iso14755buf)
871 if (iso14755buf & ISO_14755_52)
936 { 872 {
937 memmove (cmdbuf_base, cmdbuf_ptr, 873# if ISO_14755
938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 874 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 875# endif
876# if ISO_14755
877 // iso14755 part 5.2 handling: release time
878 // first: controls
879 if ((ev.state & ControlMask)
880 && ((keysym >= 0x40 && keysym <= 0x5f)
881 || (keysym >= 0x61 && keysym <= 0x7f)))
882 {
883 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
884 commit_iso14755 ();
885
886 return;
887 }
888
889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym)
891 {
892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 ();
894
895 return;
896 }
897
898 scr_bell ();
899# endif
900 iso14755buf = 0;
901
902 return;
903 }
904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
905 {
906# if ISO_14755
907 scr_overlay_off ();
908# endif
909 if (iso14755buf & ISO_14755_51)
910 commit_iso14755 ();
911#if ISO_14755
912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
913 {
914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
915
916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
918 }
919# endif
920 else
921 iso14755buf = 0;
922 }
923#endif
924
925 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
926 return;
927
928#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
929 if (!(ev.state & ControlMask))
930 slip_wheel_ev.stop ();
931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0;
933#endif
934}
958 935
959void 936void
960rxvt_term::flush () 937rxvt_term::flush ()
961{ 938{
962 flush_ev.stop (); 939 flush_ev.stop ();
963 940
964#ifdef TRANSPARENT 941#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 942 if (bg_flags & BG_NEEDS_REFRESH)
966 { 943 {
967 want_full_refresh = 0; 944 bg_flags &= ~BG_NEEDS_REFRESH;
968 scr_clear ();
969 scr_touch (false); 945 scr_touch (false);
970 } 946 }
971#endif 947#endif
972 948
973 if (want_refresh) 949 if (want_refresh)
974 { 950 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 951 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 952 {
977 int row = -view_start; 953 int row = view_start;
978 int end_row = row + nrow; 954 int end_row = row + nrow;
979 955
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 956 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 957 --row;
982 958
983 do 959 do
984 { 960 {
985 int start_row = row; 961 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 984 while (l->is_longer () && row < end_row);
1009 } 985 }
1010 while (row < end_row); 986 while (row < end_row);
1011 } 987 }
1012 988
1013 scr_refresh (refresh_type); 989 scr_refresh ();
1014 scrollbar_show (1); 990 scrollBar.show (1);
1015#ifdef USE_XIM 991#ifdef USE_XIM
1016 IMSendSpot (); 992 im_send_spot ();
1017#endif 993#endif
1018 } 994 }
1019 995
1020 display->flush (); 996 display->flush ();
1021} 997}
1022 998
999/* checks whether a refresh is requested and starts the refresh timer */
1023void 1000void
1024rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1025{ 1002{
1026 SET_R (this); 1003 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1005
1029 display->flush (); 1006 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1007}
1034 1008
1035void 1009void
1036rxvt_term::flush_cb (time_watcher &w) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1011{
1038 SET_R (this); 1012 make_current ();
1039 SET_LOCALE (locale);
1040 1013
1041 refresh_limit = 1;
1042 refresh_count = 0; 1014 refresh_count = 0;
1043 flush (); 1015 flush ();
1044} 1016}
1045 1017
1046#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1047void 1019void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1021{
1050 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1023 want_refresh = 1;
1052 1024 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1025}
1055#endif 1026#endif
1056 1027
1057#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1058void 1029void
1059rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1031{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1033 {
1063 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1064 want_refresh = 1; 1035 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1066 } 1037 }
1038 else
1039 w.stop ();
1067} 1040}
1068#endif 1041#endif
1069 1042
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1044void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1046{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1076 { 1049 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1050 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1080 } 1052 }
1053 else
1054 w.stop ();
1081} 1055}
1082#endif 1056#endif
1083 1057
1084#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1085void 1059void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1061{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1063 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1065 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1094 } 1067 }
1068 else
1069 w.stop ();
1095} 1070}
1096#endif 1071#endif
1097 1072
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1074void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1076{
1102 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1078 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1079 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1113 } 1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1087 }
1114} 1088}
1115#endif 1089#endif
1116 1090
1117#if HAVE_SCHED_YIELD 1091#if LINUX_YIELD_HACK
1118static struct event_handler 1092static struct event_handler
1119{ 1093{
1120 check_watcher cw_yield; 1094 ev::prepare yield_ev;
1121 1095
1122 void yield (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1123 { 1097 {
1124 sched_yield (); 1098 // this should really be sched_yield(), but the linux guys thought
1099 // that giving a process calling sched_yield () less cpu time than
1100 // ones with high nice levels is a useful thing to do. It surely is is
1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1105
1106 struct timespec ts = { 0, 1000 };
1107 nanosleep (&ts, 0);
1108
1125 w.stop (); 1109 w.stop ();
1126 } 1110 }
1127 1111
1128 event_handler () 1112 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1113 : yield_ev (this, &event_handler::yield_cb)
1130 { 1114 {
1131 } 1115 }
1132} event_handler; 1116} event_handler;
1133#endif 1117#endif
1134 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1135bool 1152bool
1136rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1137{ 1154{
1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1139 1156
1140 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141 { 1158
1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1143 n = 0;
1144 } 1160 {
1145 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1149 1166
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1151 1168
1152 if (r > 0) 1169 if (r > 0)
1153 { 1170 {
1154 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1155 return true; 1172 return true;
1156 } 1173 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1174 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1175 {
1159#if HAVE_SCHED_YIELD 1176#if LINUX_YIELD_HACK
1160 if (display->is_local) 1177 if (display->is_local)
1161 event_handler.cw_yield.start (); 1178 event_handler.yield_ev.start ();
1162#endif 1179#endif
1163 } 1180 }
1164 else 1181 else
1165 { 1182 {
1166 pty_ev.stop (); 1183 pty_ev.stop ();
1167 1184
1168 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1169 destroy (); 1186 destroy ();
1170 } 1187 }
1171 1188
1172 return false; 1189 return false;
1173} 1190}
1174 1191
1175void 1192void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1194{
1178 SET_R (this); 1195 make_current ();
1179 SET_LOCALE (locale);
1180 1196
1181 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1184 if (cmd_parse ()) 1200 cmd_parse ();
1185 break;
1186 1201
1187 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1188 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1189} 1206}
1190 1207
1191void 1208void
1192rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1193{ 1210{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1212 recolour_cursor ();
1196 1213
1197#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1215 hidden_pointer = 0;
1199 1216
1200 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1202#endif 1219#endif
1203} 1220}
1204 1221
1205#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1206void 1223void
1207rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1208{ 1225{
1209 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1210 return; 1227 return;
1211 1228
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1230 XFlush (dpy);
1214 1231
1215 hidden_pointer = 1; 1232 hidden_pointer = 1;
1216} 1233}
1217 1234
1218void 1235void
1219rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1237{
1221 SET_R (this); 1238 make_current ();
1222 SET_LOCALE (locale);
1223 1239
1224 pointer_blank (); 1240 pointer_blank ();
1225} 1241}
1226#endif 1242#endif
1227 1243
1228void 1244void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1246{
1231 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1232 int x, y; 1248 int x, y;
1249 int code = 32;
1233 1250
1234 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1235 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1236 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1237 1263
1238 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1239 button_number = 3; 1265 button_number = 3;
1240 else 1266 else
1241 { 1267 {
1242 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1243 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1244 if (button_number >= 3) 1270 if (button_number >= 3)
1245 button_number += (64 - 3); 1271 button_number += 64 - 3;
1246 } 1272 }
1247 1273
1248 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1249 { 1275 {
1250 /* 1276 /*
… …
1282 fputc ('A', stderr); 1308 fputc ('A', stderr);
1283 if (key_state & 32) 1309 if (key_state & 32)
1284 fputc ('2', stderr); 1310 fputc ('2', stderr);
1285 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1286 button_number, 1312 button_number,
1287 x + 1, 1313 x,
1288 y + 1); 1314 y);
1289#endif 1315#endif
1290 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1291 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1331 code + button_number + key_state,
1293 (32 + x + 1), 1332 32 + x,
1294 (32 + y + 1)); 1333 32 + y);
1295} 1334}
1296
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306 1335
1307/*{{{ process an X event */ 1336/*{{{ process an X event */
1308void 1337void
1309rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
1310{ 1339{
1311 dDisp; 1340 make_current ();
1312 1341
1313 SET_R (this); 1342 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1343
1316 if (ev.xany.window == vt 1344 if (ev.xany.window == vt
1345 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1346 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1347 return;
1319 1348
1349 // for XQueryPointer
1320 Window unused_root, unused_child; 1350 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1351 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1352 unsigned int unused_mask;
1323 1353
1324 switch (ev.type) 1354 switch (ev.type)
1325 { 1355 {
1326 case KeyPress: 1356 case KeyPress:
1327#if ISO_14755 1357 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1358 break;
1333 1359
1334 case KeyRelease: 1360 case KeyRelease:
1335 { 1361 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1362 break;
1407 }
1408 1363
1409 case ButtonPress: 1364 case ButtonPress:
1410 button_press (ev.xbutton); 1365 button_press (ev.xbutton);
1411 break; 1366 break;
1412 1367
… …
1414 button_release (ev.xbutton); 1369 button_release (ev.xbutton);
1415 break; 1370 break;
1416 1371
1417 case ClientMessage: 1372 case ClientMessage:
1418 if (ev.xclient.format == 32 1373 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1374 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 1375 {
1376 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1378 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1379 {
1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1380 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1381 {
1382 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422 destroy (); 1383 destroy ();
1384 }
1423#if ENABLE_EWMH 1385#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1386 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1387 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1388 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev); 1389 &ev);
1390#endif
1391 }
1392 }
1393#if ENABLE_XEMBED
1394 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1395 {
1396 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1397 focus_in ();
1398 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1399 focus_out ();
1400 }
1428#endif 1401#endif
1429 } 1402 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1403 break;
1470 1404
1471 /* 1405 /*
1472 * XXX: this is not the _current_ arrangement 1406 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1407 * Here's my conclusion:
… …
1492 break; 1426 break;
1493 } 1427 }
1494 break; 1428 break;
1495 1429
1496 case FocusIn: 1430 case FocusIn:
1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1434 focus_in ();
1498 break; 1435 break;
1499 1436
1500 case FocusOut: 1437 case FocusOut:
1438 if (ev.xfocus.detail != NotifyInferior
1439 && ev.xfocus.detail != NotifyPointer
1440 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1441 focus_out ();
1502 break; 1442 break;
1503 1443
1504 case ConfigureNotify: 1444 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1506 { 1446 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1509 1468
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1470 {
1512 seen_resize = 1; 1471 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1473 }
1515 1474 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1475 {
1517 if (OPTION (Opt_transparent)) 1476#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1477 if (moved)
1478 update_background ();
1519#endif 1479#endif
1480 }
1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1483 }
1521 break; 1484 break;
1522 1485
1523 case PropertyNotify: 1486 case PropertyNotify:
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527
1528 break; 1488 break;
1529 1489
1530 case SelectionClear: 1490 case SelectionClear:
1531 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1532 break;
1533
1534 case SelectionNotify:
1535 if (selection_wait == Sel_normal)
1536 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1537 break; 1492 break;
1538 1493
1539 case SelectionRequest: 1494 case SelectionRequest:
1540 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1541 break; 1496 break;
1542 1497
1543 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1544 mapped = 1; 1515 mapped = 1;
1545#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1547#endif 1518#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break; 1520 break;
1550 1521
1551 case UnmapNotify: 1522 case UnmapNotify:
… …
1553#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1555#endif 1526#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1528 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1529
1565 case GraphicsExpose: 1530 case GraphicsExpose:
1566 case Expose: 1531 case Expose:
1567 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1568 { 1533 {
1569 do 1534 do
1535 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1538 }
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1540
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1542
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1547 }
1579 1548
1580 want_refresh = 1; 1549 want_refresh = 1;
1581 } 1550 }
1582 else 1551 else
1583 { 1552 {
1584 XEvent unused_event; 1553 XEvent unused_event;
1585 1554
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1556 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1558 ;
1590 1559
1591 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1592 { 1561 {
1593 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1594 scrollbar_show (0); 1563 scrollBar.show (0);
1595 } 1564 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1565 }
1606 break; 1566 break;
1607 1567
1608 case MotionNotify: 1568 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1570 if (hidden_pointer)
1612 pointer_unblank (); 1571 pointer_unblank ();
1613#endif 1572#endif
1614#if MENUBAR 1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 if (isMenuBarWindow (ev.xany.window)) 1574 || priv_modes & PrivMode_MouseAnyEvent)
1616 {
1617 menubar_control (ev.xbutton); 1575 mouse_report (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1577 break;
1623 1578
1624 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1625 { 1580 {
1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1583 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1585 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1587 ;
1632 1588
1633 XQueryPointer (disp, vt, 1589 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1593 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1658 int dist; 1614 int dist;
1659 1615
1660 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1661 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1662 */ 1618 */
1663 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1664 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1665 1621
1666 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1667 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1668 */ 1624 */
1669 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1691 else 1647 else
1692 { 1648 {
1693 /* we are within the text window, so we 1649 /* we are within the text window, so we
1694 * shouldn't be scrolling 1650 * shouldn't be scrolling
1695 */ 1651 */
1696 if (sel_scroll_ev.active)
1697 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1698 } 1653 }
1699#endif 1654#endif
1700#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1701 } 1656 }
1702#endif 1657#endif
1703 } 1658 }
1704 } 1659 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1706 { 1661 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1709 ; 1664 ;
1710 1665
1711 XQueryPointer (disp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1670 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1717 scrollbar_size ()); 1672 scrollBar.size ());
1718 want_refresh = 1; 1673 want_refresh = 1;
1719 refresh_limit = 0;
1720 scrollbar_show (1); 1674 scrollBar.show (1);
1721 } 1675 }
1722 break; 1676 break;
1723 } 1677 }
1724 1678
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1729 { 1681 {
1730 if (hidden_cursor) 1682 if (hidden_cursor)
1731 { 1683 {
1732 hidden_cursor = 0; 1684 hidden_cursor = 0;
1733 want_refresh = 1; 1685 want_refresh = 1;
1734 } 1686 }
1735 1687
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1737 } 1689 }
1738#endif 1690#endif
1739 1691
1740#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1694 {
1743 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1748 1700
1749 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank (); 1702 pointer_blank ();
1751 } 1703 }
1752#endif 1704#endif
1705
1706 refresh_check ();
1753} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1754 1724
1755void 1725void
1756rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1757{ 1727{
1758 if (!focus) 1728 if (!focus)
1759 { 1729 {
1760 focus = 1; 1730 focus = 1;
1761 want_refresh = 1; 1731 want_refresh = 1;
1762 1732
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if USE_XIM 1733#if USE_XIM
1766 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1767 { 1735 {
1768 IMSetStatusPosition (); 1736 im_set_position ();
1769 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1770 } 1738 }
1771#endif 1739#endif
1772#if CURSOR_BLINK 1740#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1742 cursor_blink_ev.again ();
1775#endif 1743#endif
1776#if OFF_FOCUS_FADING 1744#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1745 if (rs[Rs_fade])
1778 { 1746 {
1779 pix_colors = pix_colors_focused; 1747 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1748 scr_recolour ();
1781 } 1749 }
1782#endif 1750#endif
1751#if ENABLE_FRILLS
1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 } 1757 }
1784} 1758}
1785 1759
1786void 1760void
1787rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1789 if (focus) 1763 if (focus)
1790 { 1764 {
1791 focus = 0; 1765 focus = 0;
1792 want_refresh = 1; 1766 want_refresh = 1;
1793 1767
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1795 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1796#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1773 if (iso14755buf)
1798 { 1774 {
1799 iso14755buf = 0; 1775 iso14755buf = 0;
1800# if ENABLE_OVERLAY 1776# if ISO_14755
1801 scr_overlay_off (); 1777 scr_overlay_off ();
1802# endif 1778# endif
1803 } 1779 }
1804#endif 1780#endif
1805#if USE_XIM 1781#if USE_XIM
1806 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1808#endif 1784#endif
1809#if CURSOR_BLINK 1785#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1788
1812 hidden_cursor = 0; 1789 hidden_cursor = 0;
1813#endif 1790#endif
1814#if OFF_FOCUS_FADING 1791#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1792 if (rs[Rs_fade])
1816 { 1793 {
1817 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1818 scr_recolour (); 1795 scr_recolour ();
1819 } 1796 }
1820#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 }
1801}
1802
1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1821 } 1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1822} 1814}
1823 1815
1824#if TRANSPARENT 1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1825void 1817void
1826rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1819{
1828 SET_R (this); 1820 make_current ();
1829 SET_LOCALE (locale);
1830 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1827 switch (ev.type)
1832 { 1828 {
1833 case PropertyNotify: 1829 case PropertyNotify:
1834 /* 1830 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1837 */ 1833 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1836 {
1837 bg_set_root_pixmap ();
1838 update_background ();
1839 }
1841 1840
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1841 break;
1847 } 1842 }
1843# endif
1844
1845 refresh_check ();
1848} 1846}
1849#endif 1847#endif
1850 1848
1851void 1849void
1852rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1859 /*
1862 * VT window processing of button press 1860 * VT window processing of button press
1863 */ 1861 */
1864 if (ev.window == vt) 1862 if (ev.window == vt)
1865 { 1863 {
1864 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1865 return;
1866
1866#if ISO_14755 1867#if ISO_14755
1867 // 5.4 1868 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1870 {
1870 iso14755_54 (ev.x, ev.y); 1871 iso14755_54 (ev.x, ev.y);
… …
1880 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1881 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1882#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1883 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1884 { 1885 {
1885 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1886 MEvent.clicks++; 1887 MEvent.clicks++;
1887 1888
1888 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1889 { 1890 {
1890 /* only report double clicks */ 1891 /* only report double clicks */
… …
1904 mouse_report (ev); 1905 mouse_report (ev);
1905 } 1906 }
1906#else 1907#else
1907 MEvent.button = ev.button; 1908 MEvent.button = ev.button;
1908 mouse_report (ev); 1909 mouse_report (ev);
1909#endif /* MOUSE_REPORT_DOUBLECLICK */ 1910#endif /* MOUSE_REPORT_DOUBLECLICK */
1910 1911
1911 } 1912 }
1912 else 1913 else
1913 { 1914 {
1914 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1916 1917
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1918 switch (ev.button)
1919 { 1919 {
1920 case Button1: 1920 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1925#else
1926 selection.rect = false; 1926 selection.rect = false;
1927#endif 1927#endif
1928 1928
1929 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1931 {
1932 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1934 else 1934 else
1935 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1936 } 1936 }
1937 else 1937 else
1938 { 1938 {
1939 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1940 MEvent.clicks++;
1941 else 1941 else
1942 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1943 1943
1944 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 1945 }
1946 1946
1947 MEvent.button = Button1; 1947 MEvent.button = Button1;
1948 break; 1948 break;
1949 1949
1950 case Button3: 1950 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1953 else 1953 else
1954 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1955 1955
1956 MEvent.button = Button3; 1956 MEvent.button = Button3;
1957 break; 1957 break;
1958 } 1958 }
1959 } 1959 }
1960 1960
1961 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1962 return; 1962 return;
1963 } 1963 }
1964 1964
1965 /* 1965 /*
1966 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1967 */ 1967 */
1968 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1969 { 1969 {
1970 scrollBar.setIdle (); 1970 page_dirn direction = NO_DIR;
1971
1972 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */
1976
1977 scrollBar.state = STATE_IDLE;
1971 /* 1978 /*
1972 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1973 * move up if mouse is above slider 1980 * move up if mouse is above slider
1974 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1975 * 1982 *
… …
1984 /* 1991 /*
1985 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1986 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1987 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1988 */ 1995 */
1989 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1990 && scrollbarnext_upButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_upButton (ev.y)))
1993 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1994 else if ((scrollBar.style == R_SB_NEXT 1998 else if (direction == DN)
1995 && scrollbarnext_dnButton (ev.y))
1996 || (scrollBar.style == R_SB_RXVT
1997 && scrollbarrxvt_dnButton (ev.y)))
1998 tt_printf ("\033[B"); 1999 tt_printf ("\033[B");
1999 else 2000 else
2000 switch (ev.button) 2001 switch (ev.button)
2001 { 2002 {
2002 case Button2: 2003 case Button2:
… …
2009 tt_printf ("\033[5~"); 2010 tt_printf ("\033[5~");
2010 break; 2011 break;
2011 } 2012 }
2012 } 2013 }
2013 else 2014 else
2014#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
2015
2016 {
2017 char upordown = 0;
2018
2019 if (scrollBar.style == R_SB_NEXT)
2020 { 2016 {
2021 if (scrollbarnext_upButton (ev.y)) 2017 if (direction != NO_DIR)
2022 upordown = -1; /* up */
2023 else if (scrollbarnext_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 else if (scrollBar.style == R_SB_RXVT)
2027 {
2028 if (scrollbarrxvt_upButton (ev.y))
2029 upordown = -1; /* up */
2030 else if (scrollbarrxvt_dnButton (ev.y))
2031 upordown = 1; /* down */
2032 }
2033 if (upordown)
2034 { 2018 {
2035#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2020 if (!cont_scroll_ev.is_active ())
2036 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2037#endif 2022#endif
2038 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
2039 { 2024 {
2040 if (upordown < 0) 2025 if (direction == UP)
2041 scrollBar.setUp (); 2026 scrollBar.state = STATE_UP;
2042 else 2027 else
2043 scrollBar.setDn (); 2028 scrollBar.state = STATE_DOWN;
2044 } 2029 }
2045 } 2030 }
2046 else 2031 else
2047 switch (ev.button) 2032 switch (ev.button)
2048 { 2033 {
2049 case Button2: 2034 case Button2:
2050 switch (scrollbar_align) 2035 switch (scrollBar.align)
2051 { 2036 {
2052 case R_SB_ALIGN_TOP: 2037 case R_SB_ALIGN_TOP:
2053 csrO = 0; 2038 csrO = 0;
2054 break; 2039 break;
2055 case R_SB_ALIGN_CENTRE: 2040 case R_SB_ALIGN_CENTRE:
… …
2059 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2060 break; 2045 break;
2061 } 2046 }
2062 2047
2063 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2064 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2065 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2066 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2067 2052
2068 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2069 break; 2054 break;
2070 2055
2071 case Button1: 2056 case Button1:
2072 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2073 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2074 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2075 2060
2076 case Button3: 2061 case Button3:
2077 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2078 { 2063 {
2079 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2080# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2081 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2082# else 2067# else
2083 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2084# endif 2069# endif
2085 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2086# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2087 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2088# else 2073# else
2089 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2090# endif 2075# endif
2091 else 2076 else
2092 scrollBar.setMotion (); 2077 scrollBar.state = STATE_MOTION;
2093 } 2078 }
2094 else 2079 else
2095 { 2080 {
2096 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2097 (nrow 2082 (nrow
2098 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2099 / scrollbar_size ())); 2084 / scrollBar.size ()));
2100 } 2085 }
2101 2086
2102 break; 2087 break;
2103 } 2088 }
2104 } 2089 }
2105 2090
2106 return; 2091 return;
2107 } 2092 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2093}
2117 2094
2118void 2095void
2119rxvt_term::button_release (XButtonEvent &ev) 2096rxvt_term::button_release (XButtonEvent &ev)
2120{ 2097{
… …
2122 2099
2123 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2101 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2103
2127 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2105 {
2129 scrollBar.setIdle (); 2106 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2107 scrollBar.show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2108 }
2135 2109
2136#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2139#endif 2112#endif
2140 2113
2141 if (ev.window == vt) 2114 if (ev.window == vt)
2142 { 2115 {
2116 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2117 return;
2118
2143#if ISO_14755 2119#if ISO_14755
2144 // 5.4 2120 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2121 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2122 return;
2147#endif 2123#endif
2124
2148 if (reportmode) 2125 if (reportmode)
2149 { 2126 {
2150 /* mouse report from vt window */ 2127 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2128 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2129 if (ev.button >= 4)
… …
2163 mouse_report (ev); 2140 mouse_report (ev);
2164 } 2141 }
2165#else /* MOUSE_REPORT_DOUBLECLICK */ 2142#else /* MOUSE_REPORT_DOUBLECLICK */
2166 MEvent.button = AnyButton; 2143 MEvent.button = AnyButton;
2167 mouse_report (ev); 2144 mouse_report (ev);
2168#endif /* MOUSE_REPORT_DOUBLECLICK */ 2145#endif /* MOUSE_REPORT_DOUBLECLICK */
2169 return; 2146 return;
2170 } 2147 }
2171 2148
2172 /* 2149 /*
2173 * dumb hack to compensate for the failure of click-and-drag 2150 * dumb hack to compensate for the failure of click-and-drag
… …
2176 if (priv_modes & PrivMode_mouse_report 2153 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2154 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2155 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2156 selection_extend (ev.x, ev.y, 0);
2180 2157
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2158 switch (ev.button)
2185 { 2159 {
2186 case Button1: 2160 case Button1:
2187 case Button3: 2161 case Button3:
2188 selection_make (ev.time); 2162 selection_make (ev.time);
2189 break; 2163 break;
2164
2190 case Button2: 2165 case Button2:
2191 selection_request (ev.time, ev.x, ev.y); 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2168 break;
2169
2193#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2194 case Button4: 2171 case Button4:
2195 case Button5: 2172 case Button5:
2196 { 2173 {
2197 int i; 2174 int i;
… …
2199 2176
2200 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2201 2178
2202 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2203 i = 1; 2180 i = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2181 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2182 i = nrow - 1;
2206 else 2183 else
2207 i = 5; 2184 i = 5;
2208 2185
2209# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
… …
2211 { 2188 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2192
2216 if (slip_wheel_ev.at < NOW) 2193 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218
2219 slip_wheel_ev.start ();
2220 } 2195 }
2221 else 2196 else
2197# endif
2222 { 2198 {
2223# endif
2224 scr_page (v, i); 2199 scr_page (v, i);
2225 scrollbar_show (1); 2200 scrollBar.show (1);
2226# ifdef MOUSE_SLIP_WHEELING
2227 } 2201 }
2228# endif
2229 } 2202 }
2230 break; 2203 break;
2231#endif 2204#endif
2232 } 2205 }
2233 } 2206 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2207}
2239
2240#ifdef TRANSPARENT
2241#if TINTING
2242/* taken from aterm-0.4.2 */
2243
2244typedef uint32_t RUINT32T;
2245
2246void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2247{
2248 int sh_r, sh_g, sh_b;
2249 RUINT32T mask_r, mask_g, mask_b;
2250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253 int i;
2254
2255 Visual *visual = display->visual;
2256
2257 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258
2259 /* for convenience */
2260 mask_r = visual->red_mask;
2261 mask_g = visual->green_mask;
2262 mask_b = visual->blue_mask;
2263
2264 /* boring lookup table pre-initialization */
2265 switch (srcImage->bits_per_pixel) {
2266 case 15:
2267 if ((mask_r != 0x7c00) ||
2268 (mask_g != 0x03e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+32;
2275 sh_r = 10;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 16:
2280 if ((mask_r != 0xf800) ||
2281 (mask_g != 0x07e0) ||
2282 (mask_b != 0x001f))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2285 lookup_r = lookup;
2286 lookup_g = lookup+32;
2287 lookup_b = lookup+32+64;
2288 sh_r = 11;
2289 sh_g = 5;
2290 sh_b = 0;
2291 break;
2292 case 24:
2293 if ((mask_r != 0xff0000) ||
2294 (mask_g != 0x00ff00) ||
2295 (mask_b != 0x0000ff))
2296 return;
2297 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2298 lookup_r = lookup;
2299 lookup_g = lookup+256;
2300 lookup_b = lookup+256+256;
2301 sh_r = 16;
2302 sh_g = 8;
2303 sh_b = 0;
2304 break;
2305 case 32:
2306 if ((mask_r != 0xff0000) ||
2307 (mask_g != 0x00ff00) ||
2308 (mask_b != 0x0000ff))
2309 return;
2310 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2311 lookup_r = lookup;
2312 lookup_g = lookup+256;
2313 lookup_b = lookup+256+256;
2314 sh_r = 16;
2315 sh_g = 8;
2316 sh_b = 0;
2317 break;
2318 default:
2319 return; /* we do not support this color depth */
2320 }
2321
2322 /* prepare limits for color transformation (each channel is handled separately) */
2323 if (shade < 0) {
2324 shade = -shade;
2325 if (shade < 0) shade = 0;
2326 if (shade > 100) shade = 100;
2327
2328 lower_lim_r = 65535-rm;
2329 lower_lim_g = 65535-gm;
2330 lower_lim_b = 65535-bm;
2331
2332 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2333 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2334 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2335
2336 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2337 } else {
2338 if (shade < 0) shade = 0;
2339 if (shade > 100) shade = 100;
2340
2341 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2342
2343 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2344 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2345 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2346 }
2347
2348 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2349 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2350 {
2351 unsigned int tmp;
2352
2353 tmp = lower_lim_r;
2354 lower_lim_r = lower_lim_b;
2355 lower_lim_b = tmp;
2356
2357 tmp = upper_lim_r;
2358 upper_lim_r = upper_lim_b;
2359 upper_lim_b = tmp;
2360 }
2361
2362 /* fill our lookup tables */
2363 for (i = 0; i <= mask_r>>sh_r; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2367 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2368 lookup_r[i] = (tmp/65535)<<sh_r;
2369 }
2370 for (i = 0; i <= mask_g>>sh_g; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2374 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2375 lookup_g[i] = (tmp/65535)<<sh_g;
2376 }
2377 for (i = 0; i <= mask_b>>sh_b; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2381 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2382 lookup_b[i] = (tmp/65535)<<sh_b;
2383 }
2384
2385 /* apply table to input image (replacing colors by newly calculated ones) */
2386 switch (srcImage->bits_per_pixel)
2387 {
2388 case 15:
2389 {
2390 unsigned short *p1, *pf, *p, *pl;
2391 p1 = (unsigned short *) srcImage->data;
2392 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0x7c00)>>10] |
2400 lookup_g[(*p & 0x03e0)>> 5] |
2401 lookup_b[(*p & 0x001f)];
2402 }
2403 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2404 }
2405 break;
2406 }
2407 case 16:
2408 {
2409 unsigned short *p1, *pf, *p, *pl;
2410 p1 = (unsigned short *) srcImage->data;
2411 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2412 while (p1 < pf)
2413 {
2414 p = p1;
2415 pl = p1 + srcImage->width;
2416 for (; p < pl; p++)
2417 {
2418 *p = lookup_r[(*p & 0xf800)>>11] |
2419 lookup_g[(*p & 0x07e0)>> 5] |
2420 lookup_b[(*p & 0x001f)];
2421 }
2422 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2423 }
2424 break;
2425 }
2426 case 24:
2427 {
2428 unsigned char *p1, *pf, *p, *pl;
2429 p1 = (unsigned char *) srcImage->data;
2430 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2431 while (p1 < pf)
2432 {
2433 p = p1;
2434 pl = p1 + srcImage->width * 3;
2435 for (; p < pl; p += 3)
2436 {
2437 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2438 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2439 p[2] = lookup_r[(p[2] & 0x0000ff)];
2440 }
2441 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2442 }
2443 break;
2444 }
2445 case 32:
2446 {
2447 RUINT32T *p1, *pf, *p, *pl;
2448 p1 = (RUINT32T *) srcImage->data;
2449 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2450
2451 while (p1 < pf)
2452 {
2453 p = p1;
2454 pl = p1 + srcImage->width;
2455 for (; p < pl; p++)
2456 {
2457 *p = lookup_r[(*p & 0xff0000)>>16] |
2458 lookup_g[(*p & 0x00ff00)>> 8] |
2459 lookup_b[(*p & 0x0000ff)] |
2460 (*p & ~0xffffff);
2461 }
2462 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2463 }
2464 break;
2465 }
2466 }
2467
2468 free (lookup);
2469}
2470#endif
2471
2472/*
2473 * Check our parents are still who we think they are.
2474 * Do transparency updates if required
2475 */
2476int
2477rxvt_term::check_our_parents ()
2478{
2479 int i, pchanged, aformat, have_pixmap, rootdepth;
2480 unsigned long nitems, bytes_after;
2481 Atom atype;
2482 unsigned char *prop = NULL;
2483 Window root, oldp, *list;
2484 Pixmap rootpixmap = None;
2485 XWindowAttributes wattr, wrootattr;
2486 dDisp;
2487
2488 pchanged = 0;
2489
2490 if (!OPTION (Opt_transparent))
2491 return pchanged; /* Don't try any more */
2492
2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2494 rootdepth = wrootattr.depth;
2495
2496 XGetWindowAttributes (disp, parent[0], &wattr);
2497
2498 if (rootdepth != wattr.depth)
2499 {
2500 if (am_transparent)
2501 {
2502 pchanged = 1;
2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2504 am_transparent = am_pixmap_trans = 0;
2505 }
2506
2507 return pchanged; /* Don't try any more */
2508 }
2509
2510 /* Get all X ops out of the queue so that our information is up-to-date. */
2511 XSync (disp, False);
2512
2513 /*
2514 * Make the frame window set by the window manager have
2515 * the root background. Some window managers put multiple nested frame
2516 * windows for each client, so we have to take care about that.
2517 */
2518 i = (xa[XA_XROOTPMAP_ID]
2519 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2520 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521 &nitems, &bytes_after, &prop) == Success);
2522
2523 if (!i || prop == NULL)
2524 i = (xa[XA_ESETROOT_PMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success);
2528
2529 if (!i || prop == NULL
2530#if TINTING
2531 || !rs[Rs_color + Color_tint]
2532#endif
2533 )
2534 have_pixmap = 0;
2535 else
2536 {
2537 have_pixmap = 1;
2538 rootpixmap = *(Pixmap *)prop;
2539 XFree (prop);
2540 }
2541
2542 if (have_pixmap)
2543 {
2544 /*
2545 * Copy display->root pixmap transparency
2546 */
2547 int sx, sy, nx, ny;
2548 unsigned int nw, nh;
2549 Window cr;
2550 XImage *image;
2551 GC gc;
2552 XGCValues gcvalue;
2553
2554 XTranslateCoordinates (disp, parent[0], display->root,
2555 0, 0, &sx, &sy, &cr);
2556 nw = (unsigned int)szHint.width;
2557 nh = (unsigned int)szHint.height;
2558 nx = ny = 0;
2559
2560 if (sx < 0)
2561 {
2562 nw += sx;
2563 nx = -sx;
2564 sx = 0;
2565 }
2566
2567 if (sy < 0)
2568 {
2569 nh += sy;
2570 ny = -sy;
2571 sy = 0;
2572 }
2573
2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2576
2577 XSync (disp, False);
2578 allowedxerror = -1;
2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580
2581 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2582 /* XXX: may need a delay here? */
2583 allowedxerror = 0;
2584
2585 if (image == NULL)
2586 {
2587 if (am_transparent && am_pixmap_trans)
2588 {
2589 pchanged = 1;
2590 if (pixmap != None)
2591 {
2592 XFreePixmap (disp, pixmap);
2593 pixmap = None;
2594 }
2595 }
2596
2597 am_pixmap_trans = 0;
2598 }
2599 else
2600 {
2601 if (pixmap != None)
2602 XFreePixmap (disp, pixmap);
2603
2604#if TINTING
2605 if (ISSET_PIXCOLOR (Color_tint))
2606 {
2607 unsigned short rm, gm, bm;
2608 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609
2610 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2611
2612 ShadeXImage (display, image, shade, rm, gm, bm);
2613 }
2614#endif
2615
2616 pixmap = XCreatePixmap (disp, vt,
2617 szHint.width, szHint.height, image->depth);
2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2620 nx, ny, image->width, image->height);
2621 XFreeGC (disp, gc);
2622 XDestroyImage (image);
2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2624 XClearWindow (disp, parent[0]);
2625
2626 if (!am_transparent || !am_pixmap_trans)
2627 pchanged = 1;
2628
2629 am_transparent = am_pixmap_trans = 1;
2630 }
2631 }
2632
2633 if (am_pixmap_trans)
2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2635 else
2636 {
2637 unsigned int n;
2638 /*
2639 * InheritPixmap transparency
2640 */
2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642 {
2643 oldp = parent[i];
2644 XQueryTree (disp, parent[i - 1], &root,
2645 &parent[i], &list, &n);
2646 XFree (list);
2647
2648 if (parent[i] == display->root)
2649 {
2650 if (oldp != None)
2651 pchanged = 1;
2652
2653 break;
2654 }
2655
2656 if (oldp != parent[i])
2657 pchanged = 1;
2658 }
2659
2660 n = 0;
2661
2662 if (pchanged)
2663 {
2664 for (; n < (unsigned int)i; n++)
2665 {
2666 XGetWindowAttributes (disp, parent[n], &wattr);
2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668 {
2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670 break;
2671 }
2672 }
2673 }
2674
2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2676 {
2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2679 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */
2681 }
2682 else
2683 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++)
2690 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]);
2693 }
2694
2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2696 am_transparent = 1;
2697 }
2698
2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700 parent[i] = None;
2701 }
2702
2703 if (scrollBar.win)
2704 {
2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2706 scrollBar.setIdle ();
2707 scrollbar_show (0);
2708 }
2709
2710 if (am_transparent)
2711 {
2712 want_refresh = want_full_refresh = 1;
2713 if (am_pixmap_trans)
2714 flush ();
2715 }
2716
2717 return pchanged;
2718}
2719#endif
2720 2208
2721/*}}} */ 2209/*}}} */
2722 2210
2723bool 2211void
2724rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2725{ 2213{
2726 bool flag = false;
2727 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2728 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2729 2216
2730 for (;;) 2217 for (;;)
2731 { 2218 {
2732 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2733 { 2220 {
2734 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2735 ch = next_char (); 2222 ch = next_char ();
2736 2223
2737 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2738 break; 2225 break;
2739 } 2226 }
2740 2227
2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2742 { 2229 {
2743 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2744 { 2231 {
2745 seen_input = 1; 2232 seen_input = 1;
2746 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2747 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2748 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2761 wchar_t *str = buf; 2248 wchar_t *str = buf;
2762 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2763 2250
2764 for (;;) 2251 for (;;)
2765 { 2252 {
2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2767 break; 2254 break;
2768 2255
2769 *str++ = ch; 2256 *str++ = ch;
2770 2257
2771 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2772 { 2259 {
2773 if (ch == C0_LF) 2260 if (ch == C0_LF)
2774 nlines++; 2261 nlines++;
2775 2262
2776 refresh_count++; 2263 refresh_count++;
2777 2264
2778 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2266 {
2781 refreshnow = true;
2782 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2783 ch = NOCHAR; 2272 ch = NOCHAR;
2784 break; 2273 break;
2274 }
2785 } 2275 }
2786 2276
2787 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2789 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2282 scr_add_lines (buf, str - buf, nlines);
2792 2283
2793 nlines = 0; 2284 nlines = 0;
2794 str = buf; 2285 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
… …
2810 2301
2811 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2303 ch = next_char ();
2813 } 2304 }
2814 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2817 2309
2818 /* 2310 /*
2819 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2821 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2822 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2314 */
2824 if (refreshnow) 2315 if (refreshnow)
2825 { 2316 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++;
2828 else
2829 {
2830 flag = true;
2831 scr_refresh (refresh_type); 2317 scr_refresh ();
2832 want_refresh = 1; 2318 want_refresh = 1;
2833 }
2834 } 2319 }
2835
2836 } 2320 }
2837 else 2321 else
2838 { 2322 {
2839 try 2323 try
2840 { 2324 {
… …
2848 } 2332 }
2849 2333
2850 ch = NOCHAR; 2334 ch = NOCHAR;
2851 } 2335 }
2852 } 2336 }
2853
2854 return flag;
2855} 2337}
2856 2338
2857// read the next character 2339// read the next character
2858wchar_t 2340wchar_t
2859rxvt_term::next_char () 2341rxvt_term::next_char () NOTHROW
2860{ 2342{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2344 {
2863 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2865 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2866 2348
2867 wchar_t wc; 2349 wchar_t wc;
2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2869 2351
… …
2873 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2874 break; 2356 break;
2875 } 2357 }
2876 2358
2877 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2879 2364
2880 // assume wchar == unicode 2365 // assume wchar == unicode
2881 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2882 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2883 } 2368 }
… …
2885 return NOCHAR; 2370 return NOCHAR;
2886} 2371}
2887 2372
2888// read the next octet 2373// read the next octet
2889uint32_t 2374uint32_t
2890rxvt_term::next_octet () 2375rxvt_term::next_octet () NOTHROW
2891{ 2376{
2892 return cmdbuf_ptr < cmdbuf_endp 2377 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2378 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2379 : NOCHAR;
2895} 2380}
2896 2381
2897/* rxvt_cmd_getc () - Return next input character */ 2382static class out_of_input out_of_input;
2898/* 2383
2899 * Return the next input character after first passing any keyboard input
2900 * to the command.
2901 */
2902wchar_t 2384wchar_t
2903rxvt_term::cmd_getc () 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2386{
2905 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2906 2388
2907 if (c == NOCHAR) 2389 if (c == NOCHAR)
2908 throw out_of_input; 2390 throw out_of_input;
2909 2391
2910 return c; 2392 return c;
2911} 2393}
2912 2394
2913uint32_t 2395uint32_t
2914rxvt_term::cmd_get8 () 2396rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2397{
2916 uint32_t c = next_octet (); 2398 uint32_t c = next_octet ();
2917 2399
2918 if (c == NOCHAR) 2400 if (c == NOCHAR)
2919 throw out_of_input; 2401 throw out_of_input;
… …
2925/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2926#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2927FILE * 2409FILE *
2928rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2929{ 2411{
2930 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2931 2413
2932 if (stream == NULL) 2414 if (stream == NULL)
2933 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2934 2416
2935 return stream; 2417 return stream;
… …
2946 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2947 */ 2429 */
2948void 2430void
2949rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2950{ 2432{
2951 int done; 2433 FILE *fd = popen_printer ();
2952 FILE *fd;
2953 2434
2954 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2955 return; 2436 return;
2956 2437
2957 /* 2438 /*
2958 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2959 * is received. 2440 * is received.
2960 */ 2441 */
2961 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2962 { 2443 {
2963 unsigned char buf[8]; 2444 unsigned char buf[8];
2964 unicode_t ch; 2445 unicode_t ch;
2965 unsigned int i, len; 2446 unsigned int i, len;
2966 2447
… …
2985 { 2466 {
2986 if ((buf[len++] = cmd_getc ()) == 'i') 2467 if ((buf[len++] = cmd_getc ()) == 'i')
2987 break; /* done = 1 */ 2468 break; /* done = 1 */
2988 } 2469 }
2989 } 2470 }
2990 2471
2991 for (i = 0; i < len; i++) 2472 for (i = 0; i < len; i++)
2992 if (putc (buf[i], fd) == EOF) 2473 if (putc (buf[i], fd) == EOF)
2993 { 2474 {
2994 done = 1; 2475 done = 1;
2995 break; 2476 break;
… …
2997 } 2478 }
2998 } 2479 }
2999 2480
3000 pclose_printer (fd); 2481 pclose_printer (fd);
3001} 2482}
3002#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
3003/*}}} */ 2484/*}}} */
3004 2485
3005/* *INDENT-OFF* */
3006enum { 2486enum {
3007 C1_40 = 0x40, 2487 C1_40 = 0x40,
3008 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
3009 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
3010 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
3011 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
3012}; 2492};
3013/* *INDENT-ON* */
3014 2493
3015/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
3016void 2495void
3017rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
3018{ 2497{
… …
3057 process_dcs_seq (); 2536 process_dcs_seq ();
3058 break; 2537 break;
3059 case 0x9b: /* CSI */ 2538 case 0x9b: /* CSI */
3060 process_csi_seq (); 2539 process_csi_seq ();
3061 break; 2540 break;
3062 case 0x9d: /* CSI */ 2541 case 0x9d: /* OSC */
3063 process_osc_seq (); 2542 process_osc_seq ();
3064 break; 2543 break;
3065#endif 2544#endif
3066 } 2545 }
3067} 2546}
… …
3111 break; 2590 break;
3112 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
3113 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3114 break; 2593 break;
3115 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
3116 PrivMode (0, PrivMode_vt52); 2595 priv_modes &= ~PrivMode_vt52;
3117 break; 2596 break;
3118 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
3119 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
3120 /* unimplemented */ 2599 /* unimplemented */
3121 break; 2600 break;
… …
3140 return; 2619 return;
3141 } 2620 }
3142 2621
3143 switch (ch) 2622 switch (ch)
3144 { 2623 {
3145 /* case 1: do_tek_mode (); break; */
3146 case '#': 2624 case '#':
3147 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
3148 scr_E (); 2626 scr_E ();
3149 break; 2627 break;
3150 case '(': 2628 case '(':
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 2635 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 2636 break;
3159 case '+': 2637 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 2638 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 2639 break;
3162#if ENABLE_FRILLS 2640#if !ENABLE_MINIMAL
3163 case '6': 2641 case '6':
3164 scr_backindex (); 2642 scr_backindex ();
3165 break; 2643 break;
3166#endif 2644#endif
3167 case '7': 2645 case '7':
3168 scr_cursor (SAVE); 2646 scr_cursor (SAVE);
3169 break; 2647 break;
3170 case '8': 2648 case '8':
3171 scr_cursor (RESTORE); 2649 scr_cursor (RESTORE);
3172 break; 2650 break;
3173#if ENABLE_FRILLS 2651#if !ENABLE_MINIMAL
3174 case '9': 2652 case '9':
3175 scr_forwardindex (); 2653 scr_forwardindex ();
3176 break; 2654 break;
3177#endif 2655#endif
2656 // DECPAM/DECPNM
3178 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
3179 case '>': 2660 case '>':
3180 PrivMode ((ch == '='), PrivMode_aplKP); 2661 priv_modes &= ~PrivMode_aplKP;
3181 break; 2662 break;
3182 2663
3183 case C1_40: 2664 case C1_40:
3184 cmd_getc (); 2665 cmd_getc ();
3185 break; 2666 break;
… …
3189 2670
3190 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
3191 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
3192 { 2673 {
3193 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3195 } 2676 }
3196 break; 2677 break;
3197 2678
3198 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
3199 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
3200 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3201 break; 2684 break;
3202 2685
3203 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
3204 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
3205 scr_set_tab (1); 2688 scr_set_tab (1);
… …
3209 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
3210 scr_index (DN); 2693 scr_index (DN);
3211 break; 2694 break;
3212 2695
3213 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
3214 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
3215 2698
3216 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
3217 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
3218 2701
3219 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
3220 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
3221 process_dcs_seq (); 2704 process_dcs_seq ();
3222 break; 2705 break;
… …
3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3225 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3227 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
3228 2711
3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3230 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
3231 process_csi_seq (); 2714 process_csi_seq ();
3232 break; 2715 break;
3233 2716
3234 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3235 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
3236 process_osc_seq (); 2719 process_osc_seq ();
3237 break; 2720 break;
3238 2721
3239 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3240 case 'c': 2723 case 'c':
3241 mbstate.reset (); 2724 mbstate.reset ();
3242 scr_poweron (); 2725 scr_poweron ();
3243 scrollbar_show (1); 2726 scrollBar.show (1);
3244 break; 2727 break;
3245 2728
3246 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2729 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3247 case 'n': 2730 case 'n':
3248 scr_charset_choose (2); 2731 scr_charset_choose (2);
… …
3255 } 2738 }
3256} 2739}
3257/*}}} */ 2740/*}}} */
3258 2741
3259/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3260/* *INDENT-OFF* */
3261enum { 2743enum {
3262 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
3263 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3264 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2746 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3265 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2747 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3268 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2750 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3269 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2751 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3270 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2752 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3271}; 2753};
3272 2754
3273#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3274 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3275 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3276#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
3277 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3278 2760
3279const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
3280 { 2762 {
3281 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2763 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3282 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2764 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3283 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2765 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3284 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2766 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3285 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2767 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3286 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3287 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3288 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3289 }; 2771 };
3290/* *INDENT-ON* */
3291 2772
3292void 2773void
3293rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
3294{ 2775{
3295 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
3296 unsigned int nargs, p; 2777 unsigned int nargs, p;
3297 int n, ndef; 2778 int n, ndef;
3298 int arg[ESC_ARGS]; 2779 int arg[ESC_ARGS] = { };
3299 2780
3300 for (nargs = ESC_ARGS; nargs > 0;) 2781 nargs = 0;
3301 arg[--nargs] = 0;
3302 2782
3303 priv = 0; 2783 priv = 0;
3304 ch = cmd_getc (); 2784 ch = cmd_getc ();
3305 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2786 {
3306 { /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
3307 priv = ch; 2788 priv = ch;
3308 ch = cmd_getc (); 2789 ch = cmd_getc ();
3309 } 2790 }
3310 2791
3311 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 2821 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 2822 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 2823 if (arg[p] == -1)
3343 arg[p] = ndef; 2824 arg[p] = ndef;
3344 2825
3345#ifdef DEBUG_CMD
3346 fprintf (stderr, "CSI ");
3347 for (p = 0; p < nargs; p++)
3348 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349 fprintf (stderr, "%c\n", ch);
3350#endif
3351
3352 /* 2826 /*
3353 * private mode handling 2827 * private mode handling
3354 */ 2828 */
3355 if (priv) 2829 if (priv)
3356 { 2830 {
3357 switch (priv) 2831 switch (priv)
3358 { 2832 {
3359 case '>': 2833 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 2834 if (ch == CSI_DA) /* secondary device attributes */
3361 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2835 {
2836 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2837 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2838 //
2839 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2840 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2841 // versions.
2842 //
2843 tt_printf ("\033[>%d;95;0c", 'U');
2844 }
3362 break; 2845 break;
2846
3363 case '?': 2847 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
3366 break; 2850 break;
2851
2852 case '!':
2853 if (ch == CSI_70)
2854 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset ();
2857
2858 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2860
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3367 } 2863 }
2864 break;
2865 }
2866
3368 return; 2867 return;
3369 } 2868 }
3370 2869
3371 switch (ch) 2870 switch (ch)
3372 { 2871 {
… …
3492 break; 2991 break;
3493 case 6: /* CPR requested */ 2992 case 6: /* CPR requested */
3494 scr_report_position (); 2993 scr_report_position ();
3495 break; 2994 break;
3496 case 7: /* unofficial extension */ 2995 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 2996 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2997 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 2998 break;
3500 case 8: /* unofficial extension */ 2999 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3000 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 3001 break;
… …
3569 break; 3068 break;
3570 case CSI_75: 3069 case CSI_75:
3571 scr_cursor (RESTORE); 3070 scr_cursor (RESTORE);
3572 break; 3071 break;
3573 3072
3574#if ENABLE_FRILLS 3073#if !ENABLE_MINIMAL
3575 case CSI_74: 3074 case CSI_74:
3576 process_window_ops (arg, nargs); 3075 process_window_ops (arg, nargs);
3577 break; 3076 break;
3578#endif 3077#endif
3579 3078
… …
3586 break; 3085 break;
3587 } 3086 }
3588} 3087}
3589/*}}} */ 3088/*}}} */
3590 3089
3591#if ENABLE_FRILLS 3090#if !ENABLE_MINIMAL
3592/* ARGSUSED */
3593void 3091void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3093{
3596 int x, y; 3094 int x, y;
3597 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
3598 Window wdummy; 3096 Window wdummy;
3599 dDisp; 3097
3098 dLocal (Display *, dpy);
3600 3099
3601 if (nargs == 0) 3100 if (nargs == 0)
3602 return; 3101 return;
3603 3102
3604 switch (args[0]) 3103 switch (args[0])
3605 { 3104 {
3606 /* 3105 /*
3607 * commands 3106 * commands
3608 */ 3107 */
3609 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3109 XMapWindow (dpy, parent);
3611 break; 3110 break;
3612 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3614 break; 3113 break;
3615 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3617 break; 3116 break;
3618 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3119 break;
3621 case 5: /* raise window */ 3120 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3121 XRaiseWindow (dpy, parent);
3623 break; 3122 break;
3624 case 6: /* lower window */ 3123 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3124 XLowerWindow (dpy, parent);
3626 break; 3125 break;
3627 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3628 scr_touch (true); 3127 scr_touch (true);
3629 break; 3128 break;
3630 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3637 if (args[0] >= 24) /* set height (chars) */ 3136 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3137 set_widthheight ((unsigned int)width,
3639 (unsigned int) (args[1] * fheight)); 3138 (unsigned int) (args[1] * fheight));
3640 break; 3139 break;
3641 3140
3642
3643 /* 3141 /*
3644 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3645 */ 3143 */
3646 case 11: /* report window state */ 3144 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3147 break;
3650 case 13: /* report window position */ 3148 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3154 break;
3657 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3158 break;
3661 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3161 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3164 break;
3667 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3668 { 3166 {
3669 char *s; 3167 char *s;
3670 XGetIconName (disp, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672 XFree (s); 3170 XFree (s);
3673 } 3171 }
3674 break; 3172 break;
3675 case 21: /* report window title */ 3173 case 21: /* report window title */
3676 { 3174 {
3677 char *s; 3175 char *s;
3678 XFetchName (disp, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680 XFree (s); 3178 XFree (s);
3681 } 3179 }
3682 break; 3180 break;
3683 } 3181 }
3684} 3182}
… …
3711 seen_esc = true; 3209 seen_esc = true;
3712 continue; 3210 continue;
3713 } 3211 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3212 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3213 break;
3214 else if (ch == C0_SYN)
3215 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3216 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3217 return NULL; /* other control character - exit */
3718 3218
3719 seen_esc = false; 3219 seen_esc = false;
3720 3220
3721 if (n >= STRING_MAX - 1) 3221 if (n >= STRING_MAX - 1)
3722 // stop at some sane length 3222 // stop at some sane length
3723 return NULL; 3223 return NULL;
3724 3224
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3225 string[n++] = ch;
3729 } 3226 }
3730 3227
3731 string[n++] = '\0'; 3228 string[n++] = '\0';
3732 3229
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3230 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3237 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3741 */ 3238 */
3742void 3239void
3743rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3744{ 3241{
3745 char *s;
3746 unicode_t eh;
3747
3748 /* 3242 /*
3749 * Not handled yet 3243 * Not handled yet
3750 */ 3244 */
3245
3246 unicode_t eh;
3751 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3752 if (s) 3248 if (s)
3753 free (s); 3249 free (s);
3754 3250
3755 return; 3251 return;
3756} 3252}
… …
3760 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3761 */ 3257 */
3762void 3258void
3763rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3764{ 3260{
3765 unicode_t ch, eh;
3766 int arg; 3261 int arg;
3767 3262
3768 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3769 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3770 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3771 3266
3772 if (ch == ';') 3267 if (ch == ';')
3773 { 3268 {
3269 unicode_t eh;
3774 char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3775 3271
3776 if (s) 3272 if (s)
3777 { 3273 {
3778 process_xterm_seq (arg, s, eh); 3274 process_xterm_seq (arg, s, eh);
… …
3784void 3280void
3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786{ 3282{
3787 if (str[0] == '?' && !str[1]) 3283 if (str[0] == '?' && !str[1])
3788 { 3284 {
3789 unsigned short r, g, b; 3285 rgba c;
3790 pix_colors_focused[color].get (display, r, g, b); 3286 pix_colors_focused[color].get (c);
3287
3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3791 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792 } 3294 }
3793 else 3295 else
3794 set_window_color (color, str); 3296 set_window_color (color, str);
3795} 3297}
3796 3298
3797/* 3299/*
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3301 */
3800void 3302void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3802{ 3304{
3803 int changed = 0;
3804 int color; 3305 int color;
3805 char *buf, *name; 3306 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3308 int saveop = op;
3808 dDisp; 3309
3310 dLocal (Display *, dpy);
3809 3311
3810 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3811 switch (op) 3317 switch (op)
3812 { 3318 {
3813 case XTerm_name: 3319 case XTerm_name:
3814 set_title (str); 3320 set_title (str);
3815 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3335 unsigned long bytes_after;
3830 unsigned char *value = 0; 3336 unsigned char *value = 0;
3831 const char *str = ""; 3337 const char *str = "";
3832 3338
3833 if (prop 3339 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3344 && actual_type != None
3839 && actual_format == 8) 3345 && actual_format == 8)
3840 str = (const char *)(value); 3346 str = (const char *)(value);
3841 3347
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3843 3349
3844 XFree (value); 3350 XFree (value);
3845 } 3351 }
3846 else 3352 else
3847 { 3353 {
3848 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3849 3355
3850 if (eq) 3356 if (eq)
3851 { 3357 {
3852 *eq = 0; 3358 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3854 } 3360 }
3855 else 3361 else
3856 XDeleteProperty (disp, parent[0], 3362 XDeleteProperty (dpy, parent,
3857 display->atom (str)); 3363 display->atom (str));
3858 } 3364 }
3859 break; 3365 break;
3860 3366
3861 case XTerm_Color: 3367 case XTerm_Color:
… …
3871 break; 3377 break;
3872 3378
3873 if ((buf = strchr (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3380 *buf++ = '\0';
3875 3381
3876 if (name[0] == '?' && !name[1]) 3382 process_color_seq (op, color, name, resp);
3383 }
3384 break;
3385 case Rxvt_restoreFG:
3386 case XTerm_Color00:
3387 process_color_seq (op, Color_fg, str, resp);
3388 break;
3389 case Rxvt_restoreBG:
3390 case XTerm_Color01:
3391 process_color_seq (op, Color_bg, str, resp);
3392 break;
3393#ifndef NO_CURSORCOLOR
3394 case XTerm_Color_cursor:
3395 process_color_seq (op, Color_cursor, str, resp);
3396 break;
3397#endif
3398 case XTerm_Color_pointer_fg:
3399 process_color_seq (op, Color_pointer_fg, str, resp);
3400 break;
3401 case XTerm_Color_pointer_bg:
3402 process_color_seq (op, Color_pointer_bg, str, resp);
3403 break;
3404#ifdef OPTION_HC
3405 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp);
3407 break;
3408 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp);
3410 break;
3411#endif
3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3413 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp);
3415 break;
3416 case URxvt_Color_UL:
3417 process_color_seq (op, Color_UL, str, resp);
3418 break;
3419 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp);
3421 break;
3422#endif
3423 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp);
3425 break;
3426#if ENABLE_TRANSPARENCY
3427 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp);
3429 {
3430 bool changed = false;
3431
3432 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3434
3435 if (changed)
3436 update_background ();
3437 }
3438
3439 break;
3440#endif
3441
3442#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?"))
3445 {
3446 char str[256];
3447
3448 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767),
3450 min (h_align, 32767), min (v_align, 32767));
3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 }
3453 else
3454 {
3455 bool changed = false;
3456
3457 if (*str != ';')
3877 { 3458 {
3878 unsigned short r, g, b; 3459 if (bg_set_file (str)) /* change pixmap */
3879 pix_colors_focused[color].get (display, r, g, b); 3460 changed = true;
3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881 } 3461 }
3882 else 3462 else
3883 set_window_color (color, name); 3463 {
3464 str++;
3465 if (bg_set_geometry (str, true))
3466 changed = true;
3467 }
3468
3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3477 update_background ();
3478 }
3884 } 3479 }
3885 break; 3480 break;
3886 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3888 break;
3889 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3891 break;
3892#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3895 break;
3896#endif 3481#endif
3897 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3899 break;
3900 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3902 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3914 break;
3915 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917 break;
3918#endif
3919#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3922 check_our_parents ();
3923 if (am_transparent)
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927
3928 case Rxvt_Pixmap:
3929 if (*str != ';')
3930 {
3931#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */
3934 scr_touch (true);
3935#endif
3936 }
3937
3938 while ((str = strchr (str, ';')) != NULL)
3939 {
3940 str++;
3941#if XPM_BACKGROUND
3942 changed += scale_pixmap (str);
3943#endif
3944 }
3945
3946 if (changed)
3947 {
3948#ifdef XPM_BACKGROUND
3949 resize_pixmap ();
3950 scr_touch (true);
3951#endif
3952 }
3953 break;
3954
3955 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str);
3957 break;
3958 case Rxvt_restoreBG:
3959 set_window_color (Color_bg, str);
3960 break;
3961 3482
3962 case XTerm_logfile: 3483 case XTerm_logfile:
3963 // TODO, when secure mode? 3484 // TODO, when secure mode?
3964 break; 3485 break;
3965 3486
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3487#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3488 case Rxvt_dumpscreen: /* no error notices */
3974 { 3489 {
3975 int fd; 3490 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3491 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3989 case URxvt_italicFont: 3504 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3505 case URxvt_boldItalicFont:
3991#endif 3506#endif
3992 if (query) 3507 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3508 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3509 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3510 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3511 resp);
3997 else 3512 else
3998 { 3513 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3514 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3517 allocated.push_back ((void *)res);
4003 set_fonts (); 3518 set_fonts ();
4004 } 3519 }
4005 break; 3520 break;
4006 3521
4007#if ENABLE_FRILLS 3522 case URxvt_version:
3523 if (query)
3524 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3525 op,
3526 rs[Rs_name], VERSION[0], VERSION[2],
3527 resp);
3528 break;
3529
3530#if !ENABLE_MINIMAL
4008 case URxvt_locale: 3531 case URxvt_locale:
4009 if (query) 3532 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3533 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4011 else 3534 else
4012 { 3535 {
4013 set_locale (str); 3536 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3537 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3538 init_xlocale ();
4016 } 3539 }
4017 break; 3540 break;
4018 3541
4019 case URxvt_view_up: 3542 case URxvt_view_up:
… …
4030 break; 3553 break;
4031#endif 3554#endif
4032 3555
4033#if ENABLE_PERL 3556#if ENABLE_PERL
4034 case URxvt_perl: 3557 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3558 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4036 ; // no responses yet
4037 break; 3559 break;
4038#endif 3560#endif
4039 } 3561 }
4040} 3562}
4041/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
… …
4064 { 3586 {
4065 if (mode == 'r') 3587 if (mode == 'r')
4066 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4067 else 3589 else
4068 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4069 PrivMode (state, bit); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
4070 } 3596 }
4071 3597
4072 return state; 3598 return state;
4073} 3599}
4074 3600
4075/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4076void 3602void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4078{ 3604{
4079 unsigned int i, j; 3605 unsigned int i, j;
4080 int state; 3606 int state;
4081 3607
4082 static const struct 3608 static const struct
4083 { 3609 {
4084 const int argval; 3610 const int argval;
4085 const unsigned long bit; 3611 const unsigned long bit;
4086 }
4087
4088 argtopriv[] = { 3612 } argtopriv[] = {
4089 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
4090 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
4091 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
4092 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
4093 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
4094 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
4095 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
4096 // 8, bi-directional support mode 3620 // 8, auto-repeat keys // DECARM
4097 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc 3622 // 18 end FF to printer after print screen
4099 { menuBar_esc, PrivMode_menuBar }, 3623 // 19 Print screen prints full screen/scroll region
4100#endif
4101 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4103#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 3627#endif
4106 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
4107 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
4108 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
4109 // 45 margin bell NYI 3632 // 45 margin bell NYI
4110 // 46 start logging 3633 // 46 start logging
4111 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
4112 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
4113#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
4114 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
4115#endif 3638#endif
4116 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
4117 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3640 { 1002, PrivMode_MouseBtnEvent },
4118 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3641 { 1003, PrivMode_MouseAnyEvent },
4119 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
4120 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4121 { 1011, PrivMode_Keypress }, // rxvt extension 3646 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3649#endif
4122 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
4123 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
4124 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
4125 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
4126 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
4127 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4128 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3657 { 2004, PrivMode_BracketPaste },
4129 }; 3658 };
4130 3659
4131 if (nargs == 0) 3660 if (nargs == 0)
4132 return; 3661 return;
4133 3662
… …
4140 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
4141 { 3670 {
4142 state = -1; 3671 state = -1;
4143 3672
4144 /* basic handling */ 3673 /* basic handling */
4145 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
4146 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
4147 { 3676 {
4148 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
4149 break; 3678 break;
4150 } 3679 }
… …
4158 3687
4159 scr_touch (true); 3688 scr_touch (true);
4160 break; 3689 break;
4161#endif 3690#endif
4162 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
4163 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 3693 if (mode == 0)
4166 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
4167 else if (mode == 1) 3695 else if (mode == 1)
4168 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
4169 break; 3697 break;
… …
4177 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
4178 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
4179 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
4180 * within VT52 mode 3708 * within VT52 mode
4181 */ 3709 */
4182 PrivMode (1, PrivMode_vt52); 3710 priv_modes |= PrivMode_vt52;
4183 break; 3711 break;
4184 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
4185 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
4186 set_widthheight (((state ? 132 : 80) * fwidth), height); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4187 break; 3715 break;
4188 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
4189 set_option (Opt_jumpScroll, !state); 3717 set_option (Opt_jumpScroll, !state);
4190 break; 3718 break;
4191 case 5: /* reverse video */ 3719 case 5: /* reverse video */
… …
4198 scr_autowrap (state); 3726 scr_autowrap (state);
4199 break; 3727 break;
4200 /* case 8: - auto repeat, can't do on a per window basis */ 3728 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 3729 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3732 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
4213 case scrollBar_esc: 3734 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 3735 scrollBar.map (state);
4215 {
4216 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
4217 scr_touch (true); 3737 scr_touch (true);
4218 }
4219 break; 3738 break;
4220#endif 3739#endif
4221 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
4222 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
4223 break; 3742 break;
… …
4228 break; 3747 break;
4229 /* case 66: - application key pad */ 3748 /* case 66: - application key pad */
4230 /* case 67: - backspace key */ 3749 /* case 67: - backspace key */
4231 case 1000: /* X11 mouse reporting */ 3750 case 1000: /* X11 mouse reporting */
4232 if (state) /* orthogonal */ 3751 if (state) /* orthogonal */
4233 priv_modes &= ~PrivMode_MouseX10; 3752 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4234 break; 3753 break;
4235#if 0
4236 case 1001: 3754 case 1002:
4237 break; /* X11 mouse highlighting */ 3755 case 1003:
4238#endif 3756 if (state)
3757 {
3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3759 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3760 mouse_row = mouse_col = 0;
3761 vt_emask_mouse = PointerMotionMask;
3762 }
3763 else
3764 vt_emask_mouse = NoEventMask;
3765
3766 vt_select_input ();
3767 break;
4239 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
4240 set_option (Opt_scrollTtyOutput, !state); 3769 set_option (Opt_scrollTtyOutput, !state);
4241 break; 3770 break;
4242 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 3772 set_option (Opt_scrollTtyKeypress, state);
4244 break; 3773 break;
4245 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3776 if (!state)
4248 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
4249 scr_change_screen (state); 3779 scr_change_screen (state);
4250 break; 3780 break;
4251 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3782 if (option (Opt_secondaryScreen))
3783 if (state)
3784 scr_cursor (SAVE);
3785
4252 scr_change_screen (state); 3786 scr_change_screen (state);
3787
4253 if (OPTION (Opt_secondaryScreen)) 3788 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3789 if (state)
4255 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
4256 break; 3793 break;
4257 default: 3794 default:
4258 break; 3795 break;
4259 } 3796 }
4260 } 3797 }
… …
4386 scr_color (Color_bg, Color_bg); 3923 scr_color (Color_bg, Color_bg);
4387 break; 3924 break;
4388 3925
4389 //case 50: // not variable spacing 3926 //case 50: // not variable spacing
4390 3927
4391#if ENABLE_FRILLS 3928#if !ENABLE_MINIMAL
4392 case 90: 3929 case 90:
4393 case 91: /* set bright fg color */ 3930 case 91: /* set bright fg color */
4394 case 92: 3931 case 92:
4395 case 93: 3932 case 93:
4396 case 94: 3933 case 94:
… …
4413 } 3950 }
4414 } 3951 }
4415} 3952}
4416/*}}} */ 3953/*}}} */
4417 3954
4418/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4419void
4420rxvt_term::process_graphics ()
4421{
4422 unicode_t ch, cmd = cmd_getc ();
4423
4424 if (cmd == 'Q')
4425 { /* query graphics */
4426 tt_printf ("\033G0\012"); /* no graphics */
4427 return;
4428 }
4429 /* swallow other graphics sequences until terminating ':' */
4430 do
4431 ch = cmd_getc ();
4432 while (ch != ':');
4433}
4434/*}}} */
4435
4436/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
4437 3956
4438/* 3957/*
4439 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
4440 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
4453 3972
4454/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
4455/* Write data to the pty as typed by the user, pasted with the mouse, 3974/* Write data to the pty as typed by the user, pasted with the mouse,
4456 * or generated by us in response to a query ESC sequence. 3975 * or generated by us in response to a query ESC sequence.
4457 */ 3976 */
4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4459 3978
4460void 3979void
4461rxvt_term::tt_write (const char *data, unsigned int len) 3980rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 3981{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 3983 return;
4465 3984
4466 if (pty.pty < 0) 3985 if (pty->pty < 0)
4467 return; 3986 return;
4468 3987
4469 if (v_buflen == 0) 3988 if (v_buflen == 0)
4470 { 3989 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 3991
3992 max_it (written, 0);
3993
4473 if ((unsigned int)written == len) 3994 if (written == len)
4474 return; 3995 return;
4475 3996
4476 data += written; 3997 data += written;
4477 len -= written; 3998 len -= written;
4478 } 3999 }
4479 4000
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4481 4002
4482 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len; 4004 v_buflen += len;
4484 4005
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4006 pty_ev.set (ev::READ | ev::WRITE);
4486} 4007}
4487 4008
4488void rxvt_term::pty_write () 4009void rxvt_term::pty_write ()
4489{ 4010{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4012
4492 if (written > 0) 4013 if (written > 0)
4493 { 4014 {
4494 v_buflen -= written; 4015 v_buflen -= written;
4495 4016
4496 if (v_buflen == 0) 4017 if (v_buflen == 0)
4497 { 4018 {
4498 free (v_buffer); 4019 free (v_buffer);
4499 v_buffer = 0; 4020 v_buffer = 0;
4500 v_buflen = 0;
4501 4021
4502 pty_ev.set (EVENT_READ); 4022 pty_ev.set (ev::READ);
4503 return; 4023 return;
4504 } 4024 }
4505 4025
4506 memmove (v_buffer, v_buffer + written, v_buflen); 4026 memmove (v_buffer, v_buffer + written, v_buflen);
4507 } 4027 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ); 4029 pty_ev.set (ev::READ);
4510} 4030}
4511 4031
4512/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
4513 4033

Diff Legend

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