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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.493 by sf-exg, Sun Aug 21 20:17:40 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,
… …
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 }
… …
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)
… …
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 == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0;
1108
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1079 want_refresh = 1;
1111 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)
1112 } 1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1087 }
1113} 1088}
1114#endif 1089#endif
1115 1090
1116#if HAVE_SCHED_YIELD 1091#if LINUX_YIELD_HACK
1117static struct event_handler 1092static struct event_handler
1118{ 1093{
1119 check_watcher cw_yield; 1094 ev::prepare yield_ev;
1120 1095
1121 void yield (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1122 { 1097 {
1123 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
1124 w.stop (); 1109 w.stop ();
1125 } 1110 }
1126 1111
1127 event_handler () 1112 event_handler ()
1128 : cw_yield (this, &event_handler::yield) 1113 : yield_ev (this, &event_handler::yield_cb)
1129 { 1114 {
1130 } 1115 }
1131} event_handler; 1116} event_handler;
1132#endif 1117#endif
1133 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
1134bool 1152bool
1135rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1136{ 1154{
1137 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1138 1156
1139 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1140 { 1158
1141 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1142 n = 0;
1143 } 1160 {
1144 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1145 memmove (cmdbuf_base, cmdbuf_ptr, n);
1146 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1147 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1148 1166
1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1150 1168
1151 if (r > 0) 1169 if (r > 0)
1152 { 1170 {
1153 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1154 return true; 1172 return true;
1155 } 1173 }
1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1174 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 { 1175 {
1158#if HAVE_SCHED_YIELD 1176#if LINUX_YIELD_HACK
1159 if (display->is_local) 1177 if (display->is_local)
1160 event_handler.cw_yield.start (); 1178 event_handler.yield_ev.start ();
1161#endif 1179#endif
1162 } 1180 }
1163 else 1181 else
1164 { 1182 {
1165 pty_ev.stop (); 1183 pty_ev.stop ();
1166 1184
1167 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1168 destroy (); 1186 destroy ();
1169 } 1187 }
1170 1188
1171 return false; 1189 return false;
1172} 1190}
1173 1191
1174void 1192void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1176{ 1194{
1177 SET_R (this); 1195 make_current ();
1178 SET_LOCALE (locale);
1179 1196
1180 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1181 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1183 if (cmd_parse ()) 1200 cmd_parse ();
1184 break;
1185 1201
1186 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1187 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1188} 1206}
1189 1207
1190void 1208void
1191rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1192{ 1210{
1193 XDefineCursor (display->display, vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
1194 recolour_cursor (); 1212 recolour_cursor ();
1195 1213
1196#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1197 hidden_pointer = 0; 1215 hidden_pointer = 0;
1198 1216
1199 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1200 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1201#endif 1219#endif
1202} 1220}
1203 1221
1204#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1205void 1223void
1206rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1207{ 1225{
1208 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1209 return; 1227 return;
1210 1228
1211 XDefineCursor (display->display, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1212 XFlush (display->display); 1230 XFlush (dpy);
1213 1231
1214 hidden_pointer = 1; 1232 hidden_pointer = 1;
1215} 1233}
1216 1234
1217void 1235void
1218rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1219{ 1237{
1220 SET_R (this); 1238 make_current ();
1221 SET_LOCALE (locale);
1222 1239
1223 pointer_blank (); 1240 pointer_blank ();
1224} 1241}
1225#endif 1242#endif
1226 1243
1227void 1244void
1228rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1229{ 1246{
1230 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1231 int x, y; 1248 int x, y;
1249 int code = 32;
1232 1250
1233 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1234 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1235 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 }
1236 1263
1237 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1238 button_number = 3; 1265 button_number = 3;
1239 else 1266 else
1240 { 1267 {
1241 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1242 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1243 if (button_number >= 3) 1270 if (button_number >= 3)
1244 button_number += (64 - 3); 1271 button_number += 64 - 3;
1245 } 1272 }
1246 1273
1247 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1248 { 1275 {
1249 /* 1276 /*
… …
1281 fputc ('A', stderr); 1308 fputc ('A', stderr);
1282 if (key_state & 32) 1309 if (key_state & 32)
1283 fputc ('2', stderr); 1310 fputc ('2', stderr);
1284 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1285 button_number, 1312 button_number,
1286 x + 1, 1313 x,
1287 y + 1); 1314 y);
1288#endif 1315#endif
1289 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
1290 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1291 (32 + button_number + key_state), 1331 code + button_number + key_state,
1292 (32 + x + 1), 1332 32 + x,
1293 (32 + y + 1)); 1333 32 + y);
1294} 1334}
1295
1296#ifdef USING_W11LIB
1297void
1298rxvt_W11_process_x_event (XEvent *ev)
1299{
1300 rxvt_t *r = rxvt_get_r ();
1301
1302 x_cb (*ev);
1303}
1304#endif
1305 1335
1306/*{{{ process an X event */ 1336/*{{{ process an X event */
1307void 1337void
1308rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
1309{ 1339{
1310 dDisp; 1340 make_current ();
1311 1341
1312 SET_R (this); 1342 dLocal (Display *, dpy);
1313 SET_LOCALE (locale);
1314 1343
1315 if (ev.xany.window == vt 1344 if (ev.xany.window == vt
1345 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1346 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1347 return;
1318 1348
1319 // for XQueryPointer 1349 // for XQueryPointer
1320 Window unused_root, unused_child; 1350 Window unused_root, unused_child;
… …
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#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1570 if (hidden_pointer)
1611 pointer_unblank (); 1571 pointer_unblank ();
1612#endif 1572#endif
1613#if MENUBAR 1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1614 if (isMenuBarWindow (ev.xany.window)) 1574 || priv_modes & PrivMode_MouseAnyEvent)
1615 {
1616 menubar_control (ev.xbutton); 1575 mouse_report (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1577 break;
1622 1578
1623 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1624 { 1580 {
1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1583 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1585 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1630 ; 1587 ;
1631 1588
1632 XQueryPointer (disp, vt, 1589 XQueryPointer (dpy, vt,
1633 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1636 &ev.xbutton.state); 1593 &ev.xbutton.state);
1637#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1657 int dist; 1614 int dist;
1658 1615
1659 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1660 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1661 */ 1618 */
1662 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1663 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1664 1621
1665 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1666 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1667 */ 1624 */
1668 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1690 else 1647 else
1691 { 1648 {
1692 /* we are within the text window, so we 1649 /* we are within the text window, so we
1693 * shouldn't be scrolling 1650 * shouldn't be scrolling
1694 */ 1651 */
1695 if (sel_scroll_ev.active)
1696 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1697 } 1653 }
1698#endif 1654#endif
1699#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1700 } 1656 }
1701#endif 1657#endif
1702 } 1658 }
1703 } 1659 }
1704 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1705 { 1661 {
1706 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1707 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1708 ; 1664 ;
1709 1665
1710 XQueryPointer (disp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1711 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1712 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1713 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1714 &unused_mask); 1670 &unused_mask);
1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1716 scrollbar_size ()); 1672 scrollBar.size ());
1717 want_refresh = 1; 1673 want_refresh = 1;
1718 refresh_limit = 0;
1719 scrollbar_show (1); 1674 scrollBar.show (1);
1720 } 1675 }
1721 break; 1676 break;
1722 } 1677 }
1723 1678
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1728 { 1681 {
1729 if (hidden_cursor) 1682 if (hidden_cursor)
1730 { 1683 {
1731 hidden_cursor = 0; 1684 hidden_cursor = 0;
1732 want_refresh = 1; 1685 want_refresh = 1;
1733 } 1686 }
1734 1687
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1736 } 1689 }
1737#endif 1690#endif
1738 1691
1739#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 { 1694 {
1742 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1745 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1747 1700
1748 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1749 pointer_blank (); 1702 pointer_blank ();
1750 } 1703 }
1751#endif 1704#endif
1705
1706 refresh_check ();
1752} 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
1753 1724
1754void 1725void
1755rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1756{ 1727{
1757 if (!focus) 1728 if (!focus)
1758 { 1729 {
1759 focus = 1; 1730 focus = 1;
1760 want_refresh = 1; 1731 want_refresh = 1;
1761 1732
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763
1764#if USE_XIM 1733#if USE_XIM
1765 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1766 { 1735 {
1767 IMSetStatusPosition (); 1736 im_set_position ();
1768 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1769 } 1738 }
1770#endif 1739#endif
1771#if CURSOR_BLINK 1740#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1742 cursor_blink_ev.again ();
1774#endif 1743#endif
1775#if OFF_FOCUS_FADING 1744#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1745 if (rs[Rs_fade])
1777 { 1746 {
1778 pix_colors = pix_colors_focused; 1747 pix_colors = pix_colors_focused;
1779 scr_recolour (); 1748 scr_recolour ();
1780 } 1749 }
1781#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));
1782 } 1757 }
1783} 1758}
1784 1759
1785void 1760void
1786rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1788 if (focus) 1763 if (focus)
1789 { 1764 {
1790 focus = 0; 1765 focus = 0;
1791 want_refresh = 1; 1766 want_refresh = 1;
1792 1767
1793 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1794 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1795#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf) 1773 if (iso14755buf)
1797 { 1774 {
1798 iso14755buf = 0; 1775 iso14755buf = 0;
1799# if ENABLE_OVERLAY 1776# if ISO_14755
1800 scr_overlay_off (); 1777 scr_overlay_off ();
1801# endif 1778# endif
1802 } 1779 }
1803#endif 1780#endif
1804#if USE_XIM 1781#if USE_XIM
1805 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1806 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1807#endif 1784#endif
1808#if CURSOR_BLINK 1785#if CURSOR_BLINK
1809 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1810 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1788
1811 hidden_cursor = 0; 1789 hidden_cursor = 0;
1812#endif 1790#endif
1813#if OFF_FOCUS_FADING 1791#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1792 if (rs[Rs_fade])
1815 { 1793 {
1816 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1817 scr_recolour (); 1795 scr_recolour ();
1818 } 1796 }
1819#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])
1820 } 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
1821} 1814}
1822 1815
1823#if TRANSPARENT 1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1824void 1817void
1825rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1819{
1827 SET_R (this); 1820 make_current ();
1828 SET_LOCALE (locale);
1829 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
1830 switch (ev.type) 1827 switch (ev.type)
1831 { 1828 {
1832 case PropertyNotify: 1829 case PropertyNotify:
1833 /* 1830 /*
1834 * 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,
1835 * 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.
1836 */ 1833 */
1837 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1839 return; 1836 {
1837 bg_set_root_pixmap ();
1838 update_background ();
1839 }
1840 1840
1841 /* FALLTHROUGH */
1842 case ReparentNotify:
1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1844 want_refresh = want_full_refresh = 1;
1845 break; 1841 break;
1846 } 1842 }
1843# endif
1844
1845 refresh_check ();
1847} 1846}
1848#endif 1847#endif
1849 1848
1850void 1849void
1851rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* 1859 /*
1861 * VT window processing of button press 1860 * VT window processing of button press
1862 */ 1861 */
1863 if (ev.window == vt) 1862 if (ev.window == vt)
1864 { 1863 {
1864 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1865 return;
1866
1865#if ISO_14755 1867#if ISO_14755
1866 // 5.4 1868 // 5.4
1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868 { 1870 {
1869 iso14755_54 (ev.x, ev.y); 1871 iso14755_54 (ev.x, ev.y);
… …
1879 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1880 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1881#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1882 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1883 { 1885 {
1884 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1885 MEvent.clicks++; 1887 MEvent.clicks++;
1886 1888
1887 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1888 { 1890 {
1889 /* only report double clicks */ 1891 /* only report double clicks */
… …
1903 mouse_report (ev); 1905 mouse_report (ev);
1904 } 1906 }
1905#else 1907#else
1906 MEvent.button = ev.button; 1908 MEvent.button = ev.button;
1907 mouse_report (ev); 1909 mouse_report (ev);
1908#endif /* MOUSE_REPORT_DOUBLECLICK */ 1910#endif /* MOUSE_REPORT_DOUBLECLICK */
1909 1911
1910 } 1912 }
1911 else 1913 else
1912 { 1914 {
1913 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1914 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1915 1917
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917 switch (ev.button) 1918 switch (ev.button)
1918 { 1919 {
1919 case Button1: 1920 case Button1:
1920 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1921 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1922#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1923 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1924#else 1925#else
1925 selection.rect = false; 1926 selection.rect = false;
1926#endif 1927#endif
1927 1928
1928 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930 { 1931 {
1931 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1932 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1933 else 1934 else
1934 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1935 } 1936 }
1936 else 1937 else
1937 { 1938 {
1938 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1939 MEvent.clicks++; 1940 MEvent.clicks++;
1940 else 1941 else
1941 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1942 1943
1943 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1944 } 1945 }
1945 1946
1946 MEvent.button = Button1; 1947 MEvent.button = Button1;
1947 break; 1948 break;
1948 1949
1949 case Button3: 1950 case Button3:
1950 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1951 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1952 else 1953 else
1953 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1954 1955
1955 MEvent.button = Button3; 1956 MEvent.button = Button3;
1956 break; 1957 break;
1957 } 1958 }
1958 } 1959 }
1959 1960
1960 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1961 return; 1962 return;
1962 } 1963 }
1963 1964
1964 /* 1965 /*
1965 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1966 */ 1967 */
1967 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1968 { 1969 {
1969 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;
1970 /* 1978 /*
1971 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1972 * move up if mouse is above slider 1980 * move up if mouse is above slider
1973 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1974 * 1982 *
… …
1983 /* 1991 /*
1984 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1985 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1986 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1987 */ 1995 */
1988 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1989 && scrollbarnext_upButton (ev.y))
1990 || (scrollBar.style == R_SB_RXVT
1991 && scrollbarrxvt_upButton (ev.y)))
1992 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1993 else if ((scrollBar.style == R_SB_NEXT 1998 else if (direction == DN)
1994 && scrollbarnext_dnButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_dnButton (ev.y)))
1997 tt_printf ("\033[B"); 1999 tt_printf ("\033[B");
1998 else 2000 else
1999 switch (ev.button) 2001 switch (ev.button)
2000 { 2002 {
2001 case Button2: 2003 case Button2:
… …
2008 tt_printf ("\033[5~"); 2010 tt_printf ("\033[5~");
2009 break; 2011 break;
2010 } 2012 }
2011 } 2013 }
2012 else 2014 else
2013#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
2014
2015 {
2016 char upordown = 0;
2017
2018 if (scrollBar.style == R_SB_NEXT)
2019 { 2016 {
2020 if (scrollbarnext_upButton (ev.y)) 2017 if (direction != NO_DIR)
2021 upordown = -1; /* up */
2022 else if (scrollbarnext_dnButton (ev.y))
2023 upordown = 1; /* down */
2024 }
2025 else if (scrollBar.style == R_SB_RXVT)
2026 {
2027 if (scrollbarrxvt_upButton (ev.y))
2028 upordown = -1; /* up */
2029 else if (scrollbarrxvt_dnButton (ev.y))
2030 upordown = 1; /* down */
2031 }
2032 if (upordown)
2033 { 2018 {
2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2020 if (!cont_scroll_ev.is_active ())
2035 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2036#endif 2022#endif
2037 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
2038 { 2024 {
2039 if (upordown < 0) 2025 if (direction == UP)
2040 scrollBar.setUp (); 2026 scrollBar.state = STATE_UP;
2041 else 2027 else
2042 scrollBar.setDn (); 2028 scrollBar.state = STATE_DOWN;
2043 } 2029 }
2044 } 2030 }
2045 else 2031 else
2046 switch (ev.button) 2032 switch (ev.button)
2047 { 2033 {
2048 case Button2: 2034 case Button2:
2049 switch (scrollbar_align) 2035 switch (scrollBar.align)
2050 { 2036 {
2051 case R_SB_ALIGN_TOP: 2037 case R_SB_ALIGN_TOP:
2052 csrO = 0; 2038 csrO = 0;
2053 break; 2039 break;
2054 case R_SB_ALIGN_CENTRE: 2040 case R_SB_ALIGN_CENTRE:
… …
2060 } 2046 }
2061 2047
2062 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2063 || scrollbar_above_slider (ev.y) 2049 || scrollbar_above_slider (ev.y)
2064 || scrollbar_below_slider (ev.y)) 2050 || scrollbar_below_slider (ev.y))
2065 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2066 2052
2067 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2068 break; 2054 break;
2069 2055
2070 case Button1: 2056 case Button1:
2071 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2072 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2073 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2074 2060
2075 case Button3: 2061 case Button3:
2076 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
… …
2086 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2087# else 2073# else
2088 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2089# endif 2075# endif
2090 else 2076 else
2091 scrollBar.setMotion (); 2077 scrollBar.state = STATE_MOTION;
2092 } 2078 }
2093 else 2079 else
2094 { 2080 {
2095 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2096 (nrow 2082 (nrow
2097 * scrollbar_position (ev.y) 2083 * scrollbar_position (ev.y)
2098 / scrollbar_size ())); 2084 / scrollBar.size ()));
2099 } 2085 }
2100 2086
2101 break; 2087 break;
2102 } 2088 }
2103 } 2089 }
2104 2090
2105 return; 2091 return;
2106 } 2092 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2093}
2116 2094
2117void 2095void
2118rxvt_term::button_release (XButtonEvent &ev) 2096rxvt_term::button_release (XButtonEvent &ev)
2119{ 2097{
… …
2121 2099
2122 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2123 if (!bypass_keystate) 2101 if (!bypass_keystate)
2124 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2125 2103
2126 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2127 { 2105 {
2128 scrollBar.setIdle (); 2106 scrollBar.state = STATE_IDLE;
2129 scrollbar_show (0); 2107 scrollBar.show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2108 }
2134 2109
2135#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2138#endif 2112#endif
2139 2113
2140 if (ev.window == vt) 2114 if (ev.window == vt)
2141 { 2115 {
2116 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2117 return;
2118
2142#if ISO_14755 2119#if ISO_14755
2143 // 5.4 2120 // 5.4
2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2121 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145 return; 2122 return;
2146#endif 2123#endif
2124
2147 if (reportmode) 2125 if (reportmode)
2148 { 2126 {
2149 /* mouse report from vt window */ 2127 /* mouse report from vt window */
2150 /* don't report release of wheel "buttons" */ 2128 /* don't report release of wheel "buttons" */
2151 if (ev.button >= 4) 2129 if (ev.button >= 4)
… …
2162 mouse_report (ev); 2140 mouse_report (ev);
2163 } 2141 }
2164#else /* MOUSE_REPORT_DOUBLECLICK */ 2142#else /* MOUSE_REPORT_DOUBLECLICK */
2165 MEvent.button = AnyButton; 2143 MEvent.button = AnyButton;
2166 mouse_report (ev); 2144 mouse_report (ev);
2167#endif /* MOUSE_REPORT_DOUBLECLICK */ 2145#endif /* MOUSE_REPORT_DOUBLECLICK */
2168 return; 2146 return;
2169 } 2147 }
2170 2148
2171 /* 2149 /*
2172 * dumb hack to compensate for the failure of click-and-drag 2150 * dumb hack to compensate for the failure of click-and-drag
… …
2175 if (priv_modes & PrivMode_mouse_report 2153 if (priv_modes & PrivMode_mouse_report
2176 && bypass_keystate 2154 && bypass_keystate
2177 && ev.button == Button1 && MEvent.clicks <= 1) 2155 && ev.button == Button1 && MEvent.clicks <= 1)
2178 selection_extend (ev.x, ev.y, 0); 2156 selection_extend (ev.x, ev.y, 0);
2179 2157
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2183 switch (ev.button) 2158 switch (ev.button)
2184 { 2159 {
2185 case Button1: 2160 case Button1:
2186 case Button3: 2161 case Button3:
2187 selection_make (ev.time); 2162 selection_make (ev.time);
2188 break; 2163 break;
2164
2189 case Button2: 2165 case Button2:
2190 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);
2191 break; 2168 break;
2169
2192#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2193 case Button4: 2171 case Button4:
2194 case Button5: 2172 case Button5:
2195 { 2173 {
2196 int i; 2174 int i;
… …
2198 2176
2199 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2200 2178
2201 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2202 i = 1; 2180 i = 1;
2203 else if (OPTION (Opt_mouseWheelScrollPage)) 2181 else if (option (Opt_mouseWheelScrollPage))
2204 i = nrow - 1; 2182 i = nrow - 1;
2205 else 2183 else
2206 i = 5; 2184 i = 5;
2207 2185
2208# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
… …
2210 { 2188 {
2211 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2212 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2213 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2214 2192
2215 if (slip_wheel_ev.at < NOW) 2193 if (!slip_wheel_ev.is_active ())
2216 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2217
2218 slip_wheel_ev.start ();
2219 } 2195 }
2220 else 2196 else
2197# endif
2221 { 2198 {
2222# endif
2223 scr_page (v, i); 2199 scr_page (v, i);
2224 scrollbar_show (1); 2200 scrollBar.show (1);
2225# ifdef MOUSE_SLIP_WHEELING
2226 } 2201 }
2227# endif
2228 } 2202 }
2229 break; 2203 break;
2230#endif 2204#endif
2231 } 2205 }
2232 } 2206 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2207}
2238
2239#ifdef TRANSPARENT
2240#if TINTING
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = display->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478 int i, pchanged, aformat, have_pixmap, rootdepth;
2479 unsigned long nitems, bytes_after;
2480 Atom atype;
2481 unsigned char *prop = NULL;
2482 Window root, oldp, *list;
2483 Pixmap rootpixmap = None;
2484 XWindowAttributes wattr, wrootattr;
2485 dDisp;
2486
2487 pchanged = 0;
2488
2489 if (!OPTION (Opt_transparent))
2490 return pchanged; /* Don't try any more */
2491
2492 XGetWindowAttributes (disp, display->root, &wrootattr);
2493 rootdepth = wrootattr.depth;
2494
2495 XGetWindowAttributes (disp, parent[0], &wattr);
2496
2497 if (rootdepth != wattr.depth)
2498 {
2499 if (am_transparent)
2500 {
2501 pchanged = 1;
2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2503 am_transparent = am_pixmap_trans = 0;
2504 }
2505
2506 return pchanged; /* Don't try any more */
2507 }
2508
2509 /* Get all X ops out of the queue so that our information is up-to-date. */
2510 XSync (disp, False);
2511
2512 /*
2513 * Make the frame window set by the window manager have
2514 * the root background. Some window managers put multiple nested frame
2515 * windows for each client, so we have to take care about that.
2516 */
2517 i = (xa[XA_XROOTPMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL)
2523 i = (xa[XA_ESETROOT_PMAP_ID]
2524 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526 &nitems, &bytes_after, &prop) == Success);
2527
2528 if (!i || prop == NULL
2529#if TINTING
2530 || !rs[Rs_color + Color_tint]
2531#endif
2532 )
2533 have_pixmap = 0;
2534 else
2535 {
2536 have_pixmap = 1;
2537 rootpixmap = *(Pixmap *)prop;
2538 XFree (prop);
2539 }
2540
2541 if (have_pixmap)
2542 {
2543 /*
2544 * Copy display->root pixmap transparency
2545 */
2546 int sx, sy, nx, ny;
2547 unsigned int nw, nh;
2548 Window cr;
2549 XImage *image;
2550 GC gc;
2551 XGCValues gcvalue;
2552
2553 XTranslateCoordinates (disp, parent[0], display->root,
2554 0, 0, &sx, &sy, &cr);
2555 nw = (unsigned int)szHint.width;
2556 nh = (unsigned int)szHint.height;
2557 nx = ny = 0;
2558
2559 if (sx < 0)
2560 {
2561 nw += sx;
2562 nx = -sx;
2563 sx = 0;
2564 }
2565
2566 if (sy < 0)
2567 {
2568 nh += sy;
2569 ny = -sy;
2570 sy = 0;
2571 }
2572
2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2575
2576 XSync (disp, False);
2577 allowedxerror = -1;
2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579
2580 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2581 /* XXX: may need a delay here? */
2582 allowedxerror = 0;
2583
2584 if (image == NULL)
2585 {
2586 if (am_transparent && am_pixmap_trans)
2587 {
2588 pchanged = 1;
2589 if (pixmap != None)
2590 {
2591 XFreePixmap (disp, pixmap);
2592 pixmap = None;
2593 }
2594 }
2595
2596 am_pixmap_trans = 0;
2597 }
2598 else
2599 {
2600 if (pixmap != None)
2601 XFreePixmap (disp, pixmap);
2602
2603#if TINTING
2604 if (ISSET_PIXCOLOR (Color_tint))
2605 {
2606 unsigned short rm, gm, bm;
2607 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608
2609 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2610
2611 ShadeXImage (display, image, shade, rm, gm, bm);
2612 }
2613#endif
2614
2615 pixmap = XCreatePixmap (disp, vt,
2616 szHint.width, szHint.height, image->depth);
2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2619 nx, ny, image->width, image->height);
2620 XFreeGC (disp, gc);
2621 XDestroyImage (image);
2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2623 XClearWindow (disp, parent[0]);
2624
2625 if (!am_transparent || !am_pixmap_trans)
2626 pchanged = 1;
2627
2628 am_transparent = am_pixmap_trans = 1;
2629 }
2630 }
2631
2632 if (am_pixmap_trans)
2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2634 else
2635 {
2636 unsigned int n;
2637 /*
2638 * InheritPixmap transparency
2639 */
2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641 {
2642 oldp = parent[i];
2643 XQueryTree (disp, parent[i - 1], &root,
2644 &parent[i], &list, &n);
2645 XFree (list);
2646
2647 if (parent[i] == display->root)
2648 {
2649 if (oldp != None)
2650 pchanged = 1;
2651
2652 break;
2653 }
2654
2655 if (oldp != parent[i])
2656 pchanged = 1;
2657 }
2658
2659 n = 0;
2660
2661 if (pchanged)
2662 {
2663 for (; n < (unsigned int)i; n++)
2664 {
2665 XGetWindowAttributes (disp, parent[n], &wattr);
2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2667 {
2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669 break;
2670 }
2671 }
2672 }
2673
2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2675 {
2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2677 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2678 am_transparent = 0;
2679 /* XXX: also turn off Opt_transparent? */
2680 }
2681 else
2682 {
2683#if WAIT_FOR_WM
2684 /* wait (an arbitrary period) for the WM to do its thing
2685 * needed for fvwm2.2.2 (and before?) */
2686 sleep (1);
2687#endif
2688 for (n = 0; n < (unsigned int)i; n++)
2689 {
2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2691 XClearWindow (disp, parent[n]);
2692 }
2693
2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2695 am_transparent = 1;
2696 }
2697
2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699 parent[i] = None;
2700 }
2701
2702 if (scrollBar.win)
2703 {
2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2705 scrollBar.setIdle ();
2706 scrollbar_show (0);
2707 }
2708
2709 if (am_transparent)
2710 {
2711 want_refresh = want_full_refresh = 1;
2712 if (am_pixmap_trans)
2713 flush ();
2714 }
2715
2716 return pchanged;
2717}
2718#endif
2719 2208
2720/*}}} */ 2209/*}}} */
2721 2210
2722bool 2211void
2723rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2724{ 2213{
2725 bool flag = false;
2726 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2727 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2728 2216
2729 for (;;) 2217 for (;;)
2730 { 2218 {
2731 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2732 { 2220 {
2733 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2734 ch = next_char (); 2222 ch = next_char ();
2735 2223
2736 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2737 break; 2225 break;
2738 } 2226 }
2739 2227
2740 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))
2741 { 2229 {
2742 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2743 { 2231 {
2744 seen_input = 1; 2232 seen_input = 1;
2745 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2746 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2747 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2760 wchar_t *str = buf; 2248 wchar_t *str = buf;
2761 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2762 2250
2763 for (;;) 2251 for (;;)
2764 { 2252 {
2765 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)))
2766 break; 2254 break;
2767 2255
2768 *str++ = ch; 2256 *str++ = ch;
2769 2257
2770 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2771 { 2259 {
2772 if (ch == C0_LF) 2260 if (ch == C0_LF)
2773 nlines++; 2261 nlines++;
2774 2262
2775 refresh_count++; 2263 refresh_count++;
2776 2264
2777 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2779 { 2266 {
2780 refreshnow = true;
2781 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2782 ch = NOCHAR; 2272 ch = NOCHAR;
2783 break; 2273 break;
2274 }
2784 } 2275 }
2785 2276
2786 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2788 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 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))))
2790 scr_add_lines (buf, str - buf, nlines); 2282 scr_add_lines (buf, str - buf, nlines);
2791 2283
2792 nlines = 0; 2284 nlines = 0;
2793 str = buf; 2285 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
… …
2809 2301
2810 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2303 ch = next_char ();
2812 } 2304 }
2813 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 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))))
2815 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2816 2309
2817 /* 2310 /*
2818 * 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
2819 * 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.
2820 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2821 * is incremented here because we must be doing flat-out scrolling.
2822 */ 2314 */
2823 if (refreshnow) 2315 if (refreshnow)
2824 { 2316 {
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++;
2827 else
2828 {
2829 flag = true;
2830 scr_refresh (refresh_type); 2317 scr_refresh ();
2831 want_refresh = 1; 2318 want_refresh = 1;
2832 }
2833 } 2319 }
2834
2835 } 2320 }
2836 else 2321 else
2837 { 2322 {
2838 try 2323 try
2839 { 2324 {
… …
2847 } 2332 }
2848 2333
2849 ch = NOCHAR; 2334 ch = NOCHAR;
2850 } 2335 }
2851 } 2336 }
2852
2853 return flag;
2854} 2337}
2855 2338
2856// read the next character 2339// read the next character
2857wchar_t 2340wchar_t
2858rxvt_term::next_char () 2341rxvt_term::next_char () NOTHROW
2859{ 2342{
2860 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2861 { 2344 {
2862 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2864 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2865 2348
2866 wchar_t wc; 2349 wchar_t wc;
2867 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);
2868 2351
… …
2872 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2873 break; 2356 break;
2874 } 2357 }
2875 2358
2876 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2877 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 }
2878 2364
2879 // assume wchar == unicode 2365 // assume wchar == unicode
2880 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2881 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2882 } 2368 }
… …
2884 return NOCHAR; 2370 return NOCHAR;
2885} 2371}
2886 2372
2887// read the next octet 2373// read the next octet
2888uint32_t 2374uint32_t
2889rxvt_term::next_octet () 2375rxvt_term::next_octet () NOTHROW
2890{ 2376{
2891 return cmdbuf_ptr < cmdbuf_endp 2377 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++ 2378 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR; 2379 : NOCHAR;
2894} 2380}
2895 2381
2896/* rxvt_cmd_getc () - Return next input character */ 2382static class out_of_input out_of_input;
2897/* 2383
2898 * Return the next input character after first passing any keyboard input
2899 * to the command.
2900 */
2901wchar_t 2384wchar_t
2902rxvt_term::cmd_getc () 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2903{ 2386{
2904 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2905 2388
2906 if (c == NOCHAR) 2389 if (c == NOCHAR)
2907 throw out_of_input; 2390 throw out_of_input;
2908 2391
2909 return c; 2392 return c;
2910} 2393}
2911 2394
2912uint32_t 2395uint32_t
2913rxvt_term::cmd_get8 () 2396rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914{ 2397{
2915 uint32_t c = next_octet (); 2398 uint32_t c = next_octet ();
2916 2399
2917 if (c == NOCHAR) 2400 if (c == NOCHAR)
2918 throw out_of_input; 2401 throw out_of_input;
… …
2924/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2925#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2926FILE * 2409FILE *
2927rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2928{ 2411{
2929 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2930 2413
2931 if (stream == NULL) 2414 if (stream == NULL)
2932 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2933 2416
2934 return stream; 2417 return stream;
… …
2945 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2946 */ 2429 */
2947void 2430void
2948rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2949{ 2432{
2950 int done; 2433 FILE *fd = popen_printer ();
2951 FILE *fd;
2952 2434
2953 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2954 return; 2436 return;
2955 2437
2956 /* 2438 /*
2957 * 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
2958 * is received. 2440 * is received.
2959 */ 2441 */
2960 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2961 { 2443 {
2962 unsigned char buf[8]; 2444 unsigned char buf[8];
2963 unicode_t ch; 2445 unicode_t ch;
2964 unsigned int i, len; 2446 unsigned int i, len;
2965 2447
… …
2984 { 2466 {
2985 if ((buf[len++] = cmd_getc ()) == 'i') 2467 if ((buf[len++] = cmd_getc ()) == 'i')
2986 break; /* done = 1 */ 2468 break; /* done = 1 */
2987 } 2469 }
2988 } 2470 }
2989 2471
2990 for (i = 0; i < len; i++) 2472 for (i = 0; i < len; i++)
2991 if (putc (buf[i], fd) == EOF) 2473 if (putc (buf[i], fd) == EOF)
2992 { 2474 {
2993 done = 1; 2475 done = 1;
2994 break; 2476 break;
… …
2996 } 2478 }
2997 } 2479 }
2998 2480
2999 pclose_printer (fd); 2481 pclose_printer (fd);
3000} 2482}
3001#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
3002/*}}} */ 2484/*}}} */
3003 2485
3004/* *INDENT-OFF* */
3005enum { 2486enum {
3006 C1_40 = 0x40, 2487 C1_40 = 0x40,
3007 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,
3008 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,
3009 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,
3010 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,
3011}; 2492};
3012/* *INDENT-ON* */
3013 2493
3014/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
3015void 2495void
3016rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
3017{ 2497{
… …
3056 process_dcs_seq (); 2536 process_dcs_seq ();
3057 break; 2537 break;
3058 case 0x9b: /* CSI */ 2538 case 0x9b: /* CSI */
3059 process_csi_seq (); 2539 process_csi_seq ();
3060 break; 2540 break;
3061 case 0x9d: /* CSI */ 2541 case 0x9d: /* OSC */
3062 process_osc_seq (); 2542 process_osc_seq ();
3063 break; 2543 break;
3064#endif 2544#endif
3065 } 2545 }
3066} 2546}
… …
3110 break; 2590 break;
3111 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
3112 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3113 break; 2593 break;
3114 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
3115 PrivMode (0, PrivMode_vt52); 2595 set_privmode (PrivMode_vt52, 0);
3116 break; 2596 break;
3117 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
3118 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
3119 /* unimplemented */ 2599 /* unimplemented */
3120 break; 2600 break;
… …
3139 return; 2619 return;
3140 } 2620 }
3141 2621
3142 switch (ch) 2622 switch (ch)
3143 { 2623 {
3144 /* case 1: do_tek_mode (); break; */
3145 case '#': 2624 case '#':
3146 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
3147 scr_E (); 2626 scr_E ();
3148 break; 2627 break;
3149 case '(': 2628 case '(':
… …
3156 scr_charset_set (2, (unsigned int)cmd_getc ()); 2635 scr_charset_set (2, (unsigned int)cmd_getc ());
3157 break; 2636 break;
3158 case '+': 2637 case '+':
3159 scr_charset_set (3, (unsigned int)cmd_getc ()); 2638 scr_charset_set (3, (unsigned int)cmd_getc ());
3160 break; 2639 break;
3161#if ENABLE_FRILLS 2640#if !ENABLE_MINIMAL
3162 case '6': 2641 case '6':
3163 scr_backindex (); 2642 scr_backindex ();
3164 break; 2643 break;
3165#endif 2644#endif
3166 case '7': 2645 case '7':
3167 scr_cursor (SAVE); 2646 scr_cursor (SAVE);
3168 break; 2647 break;
3169 case '8': 2648 case '8':
3170 scr_cursor (RESTORE); 2649 scr_cursor (RESTORE);
3171 break; 2650 break;
3172#if ENABLE_FRILLS 2651#if !ENABLE_MINIMAL
3173 case '9': 2652 case '9':
3174 scr_forwardindex (); 2653 scr_forwardindex ();
3175 break; 2654 break;
3176#endif 2655#endif
2656 // DECPAM/DECPNM
3177 case '=': 2657 case '=':
3178 case '>': 2658 case '>':
3179 PrivMode ((ch == '='), PrivMode_aplKP); 2659 set_privmode (PrivMode_aplKP, ch == '=');
3180 break; 2660 break;
3181 2661
3182 case C1_40: 2662 case C1_40:
3183 cmd_getc (); 2663 cmd_getc ();
3184 break; 2664 break;
… …
3188 2668
3189 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
3190 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
3191 { 2671 {
3192 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
3193 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3194 } 2674 }
3195 break; 2675 break;
3196 2676
3197 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
3198 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
3199 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3200 break; 2682 break;
3201 2683
3202 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
3203 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
3204 scr_set_tab (1); 2686 scr_set_tab (1);
… …
3208 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
3209 scr_index (DN); 2691 scr_index (DN);
3210 break; 2692 break;
3211 2693
3212 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
3213 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
3214 2696
3215 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
3216 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
3217 2699
3218 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
3219 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
3220 process_dcs_seq (); 2702 process_dcs_seq ();
3221 break; 2703 break;
… …
3223 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2705 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3224 case C1_SCI: /* ESC Z */ 2706 case C1_SCI: /* ESC Z */
3225 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2707 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3226 break; /* steal obsolete ESC [ c */ 2708 break; /* steal obsolete ESC [ c */
3227 2709
3228 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2710 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3229 case C1_CSI: /* ESC [ */ 2711 case C1_CSI: /* ESC [ */
3230 process_csi_seq (); 2712 process_csi_seq ();
3231 break; 2713 break;
3232 2714
3233 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2715 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3234 case C1_OSC: /* ESC ] */ 2716 case C1_OSC: /* ESC ] */
3235 process_osc_seq (); 2717 process_osc_seq ();
3236 break; 2718 break;
3237 2719
3238 /* 8.3.106: RESET TO INITIAL STATE */ 2720 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3239 case 'c': 2721 case 'c':
3240 mbstate.reset (); 2722 mbstate.reset ();
3241 scr_poweron (); 2723 scr_poweron ();
3242 scrollbar_show (1); 2724 scrollBar.show (1);
3243 break; 2725 break;
3244 2726
3245 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2727 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3246 case 'n': 2728 case 'n':
3247 scr_charset_choose (2); 2729 scr_charset_choose (2);
… …
3254 } 2736 }
3255} 2737}
3256/*}}} */ 2738/*}}} */
3257 2739
3258/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3259/* *INDENT-OFF* */
3260enum { 2741enum {
3261 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
3262 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3263 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3264 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3267 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3268 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3269 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3270}; 2751};
3271 2752
3272#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3273 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3274 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3275#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
3276 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3277 2758
3278const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
3279 { 2760 {
3280 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3281 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3282 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3283 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3284 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3285 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3286 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3287 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3288 }; 2769 };
3289/* *INDENT-ON* */
3290 2770
3291void 2771void
3292rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
3293{ 2773{
3294 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
3295 unsigned int nargs, p; 2775 unsigned int nargs, p;
3296 int n, ndef; 2776 int n, ndef;
3297 int arg[ESC_ARGS]; 2777 int arg[ESC_ARGS] = { };
3298 2778
3299 for (nargs = ESC_ARGS; nargs > 0;) 2779 nargs = 0;
3300 arg[--nargs] = 0;
3301 2780
3302 priv = 0; 2781 priv = 0;
3303 ch = cmd_getc (); 2782 ch = cmd_getc ();
3304 if (ch >= '<' && ch <= '?') 2783 if ((ch >= '<' && ch <= '?') || ch == '!')
2784 {
3305 { /* '<' '=' '>' '?' */ 2785 /* '<' '=' '>' '?' '!' */
3306 priv = ch; 2786 priv = ch;
3307 ch = cmd_getc (); 2787 ch = cmd_getc ();
3308 } 2788 }
3309 2789
3310 /* read any numerical arguments */ 2790 /* read any numerical arguments */
… …
3339 ndef = get_byte_array_bit (csi_defaults, i); 2819 ndef = get_byte_array_bit (csi_defaults, i);
3340 for (p = 0; p < nargs; p++) 2820 for (p = 0; p < nargs; p++)
3341 if (arg[p] == -1) 2821 if (arg[p] == -1)
3342 arg[p] = ndef; 2822 arg[p] = ndef;
3343 2823
3344#ifdef DEBUG_CMD
3345 fprintf (stderr, "CSI ");
3346 for (p = 0; p < nargs; p++)
3347 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348 fprintf (stderr, "%c\n", ch);
3349#endif
3350
3351 /* 2824 /*
3352 * private mode handling 2825 * private mode handling
3353 */ 2826 */
3354 if (priv) 2827 if (priv)
3355 { 2828 {
3356 switch (priv) 2829 switch (priv)
3357 { 2830 {
3358 case '>': 2831 case '>':
3359 if (ch == CSI_DA) /* secondary device attributes */ 2832 if (ch == CSI_DA) /* secondary device attributes */
3360 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2833 {
2834 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2835 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2836 //
2837 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2838 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2839 // versions.
2840 //
2841 tt_printf ("\033[>%d;95;0c", 'U');
2842 }
3361 break; 2843 break;
2844
3362 case '?': 2845 case '?':
3363 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2846 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3364 process_terminal_mode (ch, priv, nargs, arg); 2847 process_terminal_mode (ch, priv, nargs, arg);
3365 break; 2848 break;
2849
2850 case '!':
2851 if (ch == CSI_70)
2852 {
2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2854 scr_soft_reset ();
2855
2856 static const int pm_h[] = { 7, 25 };
2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2858
2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3366 } 2861 }
2862 break;
2863 }
2864
3367 return; 2865 return;
3368 } 2866 }
3369 2867
3370 switch (ch) 2868 switch (ch)
3371 { 2869 {
… …
3491 break; 2989 break;
3492 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
3493 scr_report_position (); 2991 scr_report_position ();
3494 break; 2992 break;
3495 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
3496 if (OPTION (Opt_insecure)) 2994 if (option (Opt_insecure))
3497 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3498 break; 2996 break;
3499 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3501 break; 2999 break;
… …
3568 break; 3066 break;
3569 case CSI_75: 3067 case CSI_75:
3570 scr_cursor (RESTORE); 3068 scr_cursor (RESTORE);
3571 break; 3069 break;
3572 3070
3573#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3574 case CSI_74: 3072 case CSI_74:
3575 process_window_ops (arg, nargs); 3073 process_window_ops (arg, nargs);
3576 break; 3074 break;
3577#endif 3075#endif
3578 3076
… …
3585 break; 3083 break;
3586 } 3084 }
3587} 3085}
3588/*}}} */ 3086/*}}} */
3589 3087
3590#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3591/* ARGSUSED */
3592void 3089void
3593rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594{ 3091{
3595 int x, y; 3092 int x, y;
3596 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
3597 Window wdummy; 3094 Window wdummy;
3598 dDisp; 3095
3096 dLocal (Display *, dpy);
3599 3097
3600 if (nargs == 0) 3098 if (nargs == 0)
3601 return; 3099 return;
3602 3100
3603 switch (args[0]) 3101 switch (args[0])
3604 { 3102 {
3605 /* 3103 /*
3606 * commands 3104 * commands
3607 */ 3105 */
3608 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3609 XMapWindow (disp, parent[0]); 3107 XMapWindow (dpy, parent);
3610 break; 3108 break;
3611 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3612 XIconifyWindow (disp, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3613 break; 3111 break;
3614 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3615 XMoveWindow (disp, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3616 break; 3114 break;
3617 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619 break; 3117 break;
3620 case 5: /* raise window */ 3118 case 5: /* raise window */
3621 XRaiseWindow (disp, parent[0]); 3119 XRaiseWindow (dpy, parent);
3622 break; 3120 break;
3623 case 6: /* lower window */ 3121 case 6: /* lower window */
3624 XLowerWindow (disp, parent[0]); 3122 XLowerWindow (dpy, parent);
3625 break; 3123 break;
3626 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3627 scr_touch (true); 3125 scr_touch (true);
3628 break; 3126 break;
3629 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3636 if (args[0] >= 24) /* set height (chars) */ 3134 if (args[0] >= 24) /* set height (chars) */
3637 set_widthheight ((unsigned int)width, 3135 set_widthheight ((unsigned int)width,
3638 (unsigned int) (args[1] * fheight)); 3136 (unsigned int) (args[1] * fheight));
3639 break; 3137 break;
3640 3138
3641
3642 /* 3139 /*
3643 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3644 */ 3141 */
3645 case 11: /* report window state */ 3142 case 11: /* report window state */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648 break; 3145 break;
3649 case 13: /* report window position */ 3146 case 13: /* report window position */
3650 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3651 XTranslateCoordinates (disp, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3652 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3653 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3654 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3655 break; 3152 break;
3656 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659 break; 3156 break;
3660 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3661 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662 break; 3159 break;
… …
3664 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665 break; 3162 break;
3666 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3667 { 3164 {
3668 char *s; 3165 char *s;
3669 XGetIconName (disp, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671 XFree (s); 3168 XFree (s);
3672 } 3169 }
3673 break; 3170 break;
3674 case 21: /* report window title */ 3171 case 21: /* report window title */
3675 { 3172 {
3676 char *s; 3173 char *s;
3677 XFetchName (disp, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679 XFree (s); 3176 XFree (s);
3680 } 3177 }
3681 break; 3178 break;
3682 } 3179 }
3683} 3180}
… …
3710 seen_esc = true; 3207 seen_esc = true;
3711 continue; 3208 continue;
3712 } 3209 }
3713 else if (ch == C0_BEL || ch == CHAR_ST) 3210 else if (ch == C0_BEL || ch == CHAR_ST)
3714 break; 3211 break;
3212 else if (ch == C0_SYN)
3213 ch = cmd_get8 ();
3715 else if (ch < 0x20) 3214 else if (ch < 0x20)
3716 return NULL; /* other control character - exit */ 3215 return NULL; /* other control character - exit */
3717 3216
3718 seen_esc = false; 3217 seen_esc = false;
3719 3218
3720 if (n >= STRING_MAX - 1) 3219 if (n >= STRING_MAX - 1)
3721 // stop at some sane length 3220 // stop at some sane length
3722 return NULL; 3221 return NULL;
3723 3222
3724 if (ch == C0_SYN)
3725 string[n++] = cmd_get8 ();
3726 else
3727 string[n++] = ch; 3223 string[n++] = ch;
3728 } 3224 }
3729 3225
3730 string[n++] = '\0'; 3226 string[n++] = '\0';
3731 3227
3732 ends_how = (ch == 0x5c ? C0_ESC : ch); 3228 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3739 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3740 */ 3236 */
3741void 3237void
3742rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3743{ 3239{
3744 char *s;
3745 unicode_t eh;
3746
3747 /* 3240 /*
3748 * Not handled yet 3241 * Not handled yet
3749 */ 3242 */
3243
3244 unicode_t eh;
3750 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3751 if (s) 3246 if (s)
3752 free (s); 3247 free (s);
3753 3248
3754 return; 3249 return;
3755} 3250}
… …
3759 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3760 */ 3255 */
3761void 3256void
3762rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3763{ 3258{
3764 unicode_t ch, eh;
3765 int arg; 3259 int arg;
3766 3260
3767 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3768 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3769 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3770 3264
3771 if (ch == ';') 3265 if (ch == ';')
3772 { 3266 {
3267 unicode_t eh;
3773 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3774 3269
3775 if (s) 3270 if (s)
3776 { 3271 {
3777 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3783void 3278void
3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3279rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785{ 3280{
3786 if (str[0] == '?' && !str[1]) 3281 if (str[0] == '?' && !str[1])
3787 { 3282 {
3788 unsigned short r, g, b; 3283 rgba c;
3789 pix_colors_focused[color].get (display, r, g, b); 3284 pix_colors_focused[color].get (c);
3285
3286#if XFT
3287 if (c.a != rgba::MAX_CC)
3288 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3289 else
3290#endif
3790 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3291 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791 } 3292 }
3792 else 3293 else
3793 set_window_color (color, str); 3294 set_window_color (color, str);
3794} 3295}
3795 3296
3796/* 3297/*
3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3298 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798 */ 3299 */
3799void 3300void
3800rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3301rxvt_term::process_xterm_seq (int op, char *str, char resp)
3801{ 3302{
3802 int changed = 0;
3803 int color; 3303 int color;
3804 char *buf, *name; 3304 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1]; 3305 bool query = str[0] == '?' && !str[1];
3806 int saveop = op; 3306 int saveop = op;
3807 dDisp; 3307
3308 dLocal (Display *, dpy);
3808 3309
3809 assert (str != NULL); 3310 assert (str != NULL);
3311
3312 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3313 return;
3314
3810 switch (op) 3315 switch (op)
3811 { 3316 {
3812 case XTerm_name: 3317 case XTerm_name:
3813 set_title (str); 3318 set_title (str);
3814 /* FALLTHROUGH */ 3319 /* FALLTHROUGH */
… …
3828 unsigned long bytes_after; 3333 unsigned long bytes_after;
3829 unsigned char *value = 0; 3334 unsigned char *value = 0;
3830 const char *str = ""; 3335 const char *str = "";
3831 3336
3832 if (prop 3337 if (prop
3833 && XGetWindowProperty (disp, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3834 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3835 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3836 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3837 && actual_type != None 3342 && actual_type != None
3838 && actual_format == 8) 3343 && actual_format == 8)
3839 str = (const char *)(value); 3344 str = (const char *)(value);
3840 3345
3841 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3346 tt_printf ("\033]%d;%s%c", op, str, resp);
3842 3347
3843 XFree (value); 3348 XFree (value);
3844 } 3349 }
3845 else 3350 else
3846 { 3351 {
3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3352 char *eq = strchr (str, '=');
3848 3353
3849 if (eq) 3354 if (eq)
3850 { 3355 {
3851 *eq = 0; 3356 *eq = 0;
3852 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3853 } 3358 }
3854 else 3359 else
3855 XDeleteProperty (disp, parent[0], 3360 XDeleteProperty (dpy, parent,
3856 display->atom (str)); 3361 display->atom (str));
3857 } 3362 }
3858 break; 3363 break;
3859 3364
3860 case XTerm_Color: 3365 case XTerm_Color:
… …
3870 break; 3375 break;
3871 3376
3872 if ((buf = strchr (name, ';')) != NULL) 3377 if ((buf = strchr (name, ';')) != NULL)
3873 *buf++ = '\0'; 3378 *buf++ = '\0';
3874 3379
3875 if (name[0] == '?' && !name[1]) 3380 process_color_seq (op, color, name, resp);
3381 }
3382 break;
3383 case Rxvt_restoreFG:
3384 case XTerm_Color00:
3385 process_color_seq (op, Color_fg, str, resp);
3386 break;
3387 case Rxvt_restoreBG:
3388 case XTerm_Color01:
3389 process_color_seq (op, Color_bg, str, resp);
3390 break;
3391#ifndef NO_CURSORCOLOR
3392 case XTerm_Color_cursor:
3393 process_color_seq (op, Color_cursor, str, resp);
3394 break;
3395#endif
3396 case XTerm_Color_pointer_fg:
3397 process_color_seq (op, Color_pointer_fg, str, resp);
3398 break;
3399 case XTerm_Color_pointer_bg:
3400 process_color_seq (op, Color_pointer_bg, str, resp);
3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3411 case URxvt_Color_BD:
3412 process_color_seq (op, Color_BD, str, resp);
3413 break;
3414 case URxvt_Color_UL:
3415 process_color_seq (op, Color_UL, str, resp);
3416 break;
3417 case URxvt_Color_IT:
3418 process_color_seq (op, Color_IT, str, resp);
3419 break;
3420#endif
3421 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp);
3423 break;
3424#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3429
3430 if (ISSET_PIXCOLOR (Color_tint))
3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3432
3433 if (changed)
3434 update_background ();
3435 }
3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?"))
3443 {
3444 char str[256];
3445
3446 sprintf (str, "[%dx%d+%d+%d]",
3447 min (h_scale, 32767), min (v_scale, 32767),
3448 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 }
3451 else
3452 {
3453 bool changed = false;
3454
3455 if (*str != ';')
3876 { 3456 {
3877 unsigned short r, g, b; 3457 if (bg_set_file (str)) /* change pixmap */
3878 pix_colors_focused[color].get (display, r, g, b); 3458 changed = true;
3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880 } 3459 }
3881 else 3460 else
3882 set_window_color (color, name); 3461 {
3462 str++;
3463 if (bg_set_geometry (str, true))
3464 changed = true;
3465 }
3466
3467 if (changed)
3468 {
3469 if (bg_window_position_sensitive ())
3470 {
3471 int x, y;
3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3475 update_background ();
3476 }
3883 } 3477 }
3884 break; 3478 break;
3885 case XTerm_Color00:
3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3887 break;
3888 case XTerm_Color01:
3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3890 break;
3891#ifndef NO_CURSORCOLOR
3892 case XTerm_Color_cursor:
3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3894 break;
3895#endif 3479#endif
3896 case XTerm_Color_pointer_fg:
3897 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3898 break;
3899 case XTerm_Color_pointer_bg:
3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3901 break;
3902#ifndef NO_BOLD_UNDERLINE_REVERSE
3903 case XTerm_Color_RV:
3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3905 break;
3906 case Rxvt_Color_BD:
3907 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp);
3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3913 break;
3914 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3916 break;
3917#endif
3918#if TRANSPARENT && TINTING
3919 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3921 check_our_parents ();
3922 if (am_transparent)
3923 want_full_refresh = want_refresh = 1;
3924 break;
3925#endif
3926
3927 case Rxvt_Pixmap:
3928 if (*str != ';')
3929 {
3930#if XPM_BACKGROUND
3931 scale_pixmap (""); /* reset to default scaling */
3932 set_bgPixmap (str); /* change pixmap */
3933 scr_touch (true);
3934#endif
3935 }
3936
3937 while ((str = strchr (str, ';')) != NULL)
3938 {
3939 str++;
3940#if XPM_BACKGROUND
3941 changed += scale_pixmap (str);
3942#endif
3943 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949 scr_touch (true);
3950#endif
3951 }
3952 break;
3953
3954 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str);
3956 break;
3957 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str);
3959 break;
3960 3480
3961 case XTerm_logfile: 3481 case XTerm_logfile:
3962 // TODO, when secure mode? 3482 // TODO, when secure mode?
3963 break; 3483 break;
3964 3484
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3485#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3486 case Rxvt_dumpscreen: /* no error notices */
3973 { 3487 {
3974 int fd; 3488 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3489 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3988 case URxvt_italicFont: 3502 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3503 case URxvt_boldItalicFont:
3990#endif 3504#endif
3991 if (query) 3505 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3506 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3507 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3508 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3509 resp);
3996 else 3510 else
3997 { 3511 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3512 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3515 allocated.push_back ((void *)res);
4002 set_fonts (); 3516 set_fonts ();
4003 } 3517 }
4004 break; 3518 break;
4005 3519
4006#if ENABLE_FRILLS 3520 case URxvt_version:
3521 if (query)
3522 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3523 op,
3524 rs[Rs_name], VERSION[0], VERSION[2],
3525 resp);
3526 break;
3527
3528#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3529 case URxvt_locale:
4008 if (query) 3530 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3531 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3532 else
4011 { 3533 {
4012 set_locale (str); 3534 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3535 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3536 init_xlocale ();
4015 } 3537 }
4016 break; 3538 break;
4017 3539
4018 case URxvt_view_up: 3540 case URxvt_view_up:
… …
4029 break; 3551 break;
4030#endif 3552#endif
4031 3553
4032#if ENABLE_PERL 3554#if ENABLE_PERL
4033 case URxvt_perl: 3555 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3556 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4035 ; // no responses yet
4036 break; 3557 break;
4037#endif 3558#endif
4038 } 3559 }
4039} 3560}
4040/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
… …
4063 { 3584 {
4064 if (mode == 'r') 3585 if (mode == 'r')
4065 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4066 else 3587 else
4067 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4068 PrivMode (state, bit); 3589
3590 set_privmode (bit, state);
4069 } 3591 }
4070 3592
4071 return state; 3593 return state;
4072} 3594}
4073 3595
4074/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
4075void 3597void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4077{ 3599{
4078 unsigned int i, j; 3600 unsigned int i, j;
4079 int state; 3601 int state;
4080 3602
4081 static const struct 3603 static const struct
4082 { 3604 {
4083 const int argval; 3605 const int argval;
4084 const unsigned long bit; 3606 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3607 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3608 { 1, PrivMode_aplCUR }, // DECCKM
4089 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
4090 { 3, PrivMode_132 }, 3610 { 3, PrivMode_132 }, // DECCOLM
4091 { 4, PrivMode_smoothScroll }, 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
4092 { 5, PrivMode_rVideo }, 3612 { 5, PrivMode_rVideo }, // DECSCNM
4093 { 6, PrivMode_relOrigin }, 3613 { 6, PrivMode_relOrigin }, // DECOM
4094 { 7, PrivMode_Autowrap }, 3614 { 7, PrivMode_Autowrap }, // DECAWM
4095 // 8, bi-directional support mode 3615 // 8, auto-repeat keys // DECARM
4096 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc 3617 // 18 end FF to printer after print screen
4098 { menuBar_esc, PrivMode_menuBar }, 3618 // 19 Print screen prints full screen/scroll region
4099#endif
4100 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4102#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3622#endif
4105 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3624 // 38, tektronix mode // DECTEK
4106 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
4107 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
4108 // 45 margin bell NYI 3627 // 45 margin bell NYI
4109 // 46 start logging 3628 // 46 start logging
4110 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
4111 { 66, PrivMode_aplKP }, 3630 { 66, PrivMode_aplKP }, // DECNKM
4112#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
4113 { 67, PrivMode_BackSpace }, 3632 { 67, PrivMode_BackSpace }, // DECBKM
4114#endif 3633#endif
4115 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
4116 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3635 { 1002, PrivMode_MouseBtnEvent },
4117 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3636 { 1003, PrivMode_MouseAnyEvent },
4118 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
4119 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4120 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
4121 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
4122 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
4123 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
4124 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
4125 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
4126 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4127 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3652 { 2004, PrivMode_BracketPaste },
4128 }; 3653 };
4129 3654
4130 if (nargs == 0) 3655 if (nargs == 0)
4131 return; 3656 return;
4132 3657
… …
4139 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
4140 { 3665 {
4141 state = -1; 3666 state = -1;
4142 3667
4143 /* basic handling */ 3668 /* basic handling */
4144 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
4145 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
4146 { 3671 {
4147 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
4148 break; 3673 break;
4149 } 3674 }
… …
4157 3682
4158 scr_touch (true); 3683 scr_touch (true);
4159 break; 3684 break;
4160#endif 3685#endif
4161 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4162 case 1049:
4163 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4164 if (mode == 0) 3688 if (mode == 0)
4165 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4166 else if (mode == 1) 3690 else if (mode == 1)
4167 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4168 break; 3692 break;
… …
4176 case 2: /* VT52 mode */ 3700 case 2: /* VT52 mode */
4177 /* oddball mode. should be set regardless of set/reset 3701 /* oddball mode. should be set regardless of set/reset
4178 * parameter. Return from VT52 mode with an ESC < from 3702 * parameter. Return from VT52 mode with an ESC < from
4179 * within VT52 mode 3703 * within VT52 mode
4180 */ 3704 */
4181 PrivMode (1, PrivMode_vt52); 3705 set_privmode (PrivMode_vt52, 1);
4182 break; 3706 break;
4183 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
4184 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
4185 set_widthheight (((state ? 132 : 80) * fwidth), height); 3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4186 break; 3710 break;
4187 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
4188 set_option (Opt_jumpScroll, !state); 3712 set_option (Opt_jumpScroll, !state);
4189 break; 3713 break;
4190 case 5: /* reverse video */ 3714 case 5: /* reverse video */
… …
4197 scr_autowrap (state); 3721 scr_autowrap (state);
4198 break; 3722 break;
4199 /* case 8: - auto repeat, can't do on a per window basis */ 3723 /* case 8: - auto repeat, can't do on a per window basis */
4200 case 9: /* X10 mouse reporting */ 3724 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4203 break; 3727 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
4212 case scrollBar_esc: 3729 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 3730 if (scrollBar.map (state))
4214 { 3731 {
4215 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
4216 scr_touch (true); 3733 scr_touch (true);
4217 } 3734 }
4218 break; 3735 break;
… …
4227 break; 3744 break;
4228 /* case 66: - application key pad */ 3745 /* case 66: - application key pad */
4229 /* case 67: - backspace key */ 3746 /* case 67: - backspace key */
4230 case 1000: /* X11 mouse reporting */ 3747 case 1000: /* X11 mouse reporting */
4231 if (state) /* orthogonal */ 3748 if (state) /* orthogonal */
4232 priv_modes &= ~PrivMode_MouseX10; 3749 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4233 break; 3750 break;
4234#if 0
4235 case 1001: 3751 case 1002:
4236 break; /* X11 mouse highlighting */ 3752 case 1003:
4237#endif 3753 if (state)
3754 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 mouse_row = mouse_col = 0;
3758 vt_emask_mouse = PointerMotionMask;
3759 }
3760 else
3761 vt_emask_mouse = NoEventMask;
3762
3763 vt_select_input ();
3764 break;
4238 case 1010: /* scroll to bottom on TTY output inhibit */ 3765 case 1010: /* scroll to bottom on TTY output inhibit */
4239 set_option (Opt_scrollTtyOutput, !state); 3766 set_option (Opt_scrollTtyOutput, !state);
4240 break; 3767 break;
4241 case 1011: /* scroll to bottom on key press */ 3768 case 1011: /* scroll to bottom on key press */
4242 set_option (Opt_scrollTtyKeypress, state); 3769 set_option (Opt_scrollTtyKeypress, state);
4243 break; 3770 break;
4244 case 1047: /* secondary screen w/ clearing last */ 3771 case 1047: /* secondary screen w/ clearing last */
4245 if (OPTION (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
4246 if (current_screen != PRIMARY) 3773 if (!state)
4247 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775
4248 scr_change_screen (state); 3776 scr_change_screen (state);
4249 break; 3777 break;
4250 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
3779 if (option (Opt_secondaryScreen))
3780 if (state)
3781 scr_cursor (SAVE);
3782
4251 scr_change_screen (state); 3783 scr_change_screen (state);
3784
4252 if (OPTION (Opt_secondaryScreen)) 3785 if (option (Opt_secondaryScreen))
4253 if (current_screen != PRIMARY) 3786 if (state)
4254 scr_erase_screen (2); 3787 scr_erase_screen (2);
3788 else
3789 scr_cursor (RESTORE);
4255 break; 3790 break;
4256 default: 3791 default:
4257 break; 3792 break;
4258 } 3793 }
4259 } 3794 }
… …
4385 scr_color (Color_bg, Color_bg); 3920 scr_color (Color_bg, Color_bg);
4386 break; 3921 break;
4387 3922
4388 //case 50: // not variable spacing 3923 //case 50: // not variable spacing
4389 3924
4390#if ENABLE_FRILLS 3925#if !ENABLE_MINIMAL
4391 case 90: 3926 case 90:
4392 case 91: /* set bright fg color */ 3927 case 91: /* set bright fg color */
4393 case 92: 3928 case 92:
4394 case 93: 3929 case 93:
4395 case 94: 3930 case 94:
… …
4412 } 3947 }
4413 } 3948 }
4414} 3949}
4415/*}}} */ 3950/*}}} */
4416 3951
4417/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4418void
4419rxvt_term::process_graphics ()
4420{
4421 unicode_t ch, cmd = cmd_getc ();
4422
4423 if (cmd == 'Q')
4424 { /* query graphics */
4425 tt_printf ("\033G0\012"); /* no graphics */
4426 return;
4427 }
4428 /* swallow other graphics sequences until terminating ':' */
4429 do
4430 ch = cmd_getc ();
4431 while (ch != ':');
4432}
4433/*}}} */
4434
4435/* ------------------------------------------------------------------------- */ 3952/* ------------------------------------------------------------------------- */
4436 3953
4437/* 3954/*
4438 * Send printf () formatted output to the command. 3955 * Send printf () formatted output to the command.
4439 * Only use for small amounts of data. 3956 * Only use for small amounts of data.
… …
4452 3969
4453/* ---------------------------------------------------------------------- */ 3970/* ---------------------------------------------------------------------- */
4454/* Write data to the pty as typed by the user, pasted with the mouse, 3971/* Write data to the pty as typed by the user, pasted with the mouse,
4455 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
4456 */ 3973 */
4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4458 3975
4459void 3976void
4460rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4461{ 3978{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return; 3980 return;
4464 3981
4465 if (pty.pty < 0) 3982 if (pty->pty < 0)
4466 return; 3983 return;
4467 3984
4468 if (v_buflen == 0) 3985 if (v_buflen == 0)
4469 { 3986 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 3988
3989 max_it (written, 0);
3990
4472 if ((unsigned int)written == len) 3991 if (written == len)
4473 return; 3992 return;
4474 3993
4475 data += written; 3994 data += written;
4476 len -= written; 3995 len -= written;
4477 } 3996 }
4478 3997
4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3998 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4480 3999
4481 memcpy (v_buffer + v_buflen, data, len); 4000 memcpy (v_buffer + v_buflen, data, len);
4482 v_buflen += len; 4001 v_buflen += len;
4483 4002
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4003 pty_ev.set (ev::READ | ev::WRITE);
4485} 4004}
4486 4005
4487void rxvt_term::pty_write () 4006void rxvt_term::pty_write ()
4488{ 4007{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4008 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4009
4491 if (written > 0) 4010 if (written > 0)
4492 { 4011 {
4493 v_buflen -= written; 4012 v_buflen -= written;
4494 4013
4495 if (v_buflen == 0) 4014 if (v_buflen == 0)
4496 { 4015 {
4497 free (v_buffer); 4016 free (v_buffer);
4498 v_buffer = 0; 4017 v_buffer = 0;
4499 v_buflen = 0;
4500 4018
4501 pty_ev.set (EVENT_READ); 4019 pty_ev.set (ev::READ);
4502 return; 4020 return;
4503 } 4021 }
4504 4022
4505 memmove (v_buffer, v_buffer + written, v_buflen); 4023 memmove (v_buffer, v_buffer + written, v_buflen);
4506 } 4024 }
4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4025 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4508 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4509} 4027}
4510 4028
4511/*----------------------- end-of-file (C source) -----------------------*/ 4029/*----------------------- end-of-file (C source) -----------------------*/
4512 4030

Diff Legend

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