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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

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

Diff Legend

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