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

Diff Legend

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