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.302 by root, Tue Jan 31 21:35:39 2006 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 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,
… …
127 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
128#endif 132#endif
129 0, 133 0,
130}; 134};
131 135
132void 136void ecb_cold
133rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
134{ 138{
135 x = Pixel2Col (x); 139 x = Pixel2Col (x);
136 y = Pixel2Row (y); 140 y = Pixel2Row (y);
137 141
… …
154 158
155 x--; 159 x--;
156 } 160 }
157} 161}
158 162
159void 163void ecb_cold
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
246} 256}
247#endif 257#endif
248 258
249void 259void ecb_cold
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 ecb_cold
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 ecb_cold
300void 307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int ecb_cold
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
401void ecb_cold
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 *
… …
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 423
319 if (numlock_state || (ev.state & ModNumLockMask))
320 {
321 numlock_state = (ev.state & ModNumLockMask);
322 PrivMode ((!numlock_state), PrivMode_aplKP);
323 }
324
325 kbuf[0] = 0; 424 kbuf[0] = 0;
326 425
327#ifdef USE_XIM 426#if USE_XIM
328 if (Input_Context) 427 if (Input_Context)
329 { 428 {
330 Status status_return; 429 Status status_return;
331 430
332#if 0 431#if 0
… …
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 ecb_cold
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#if 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
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1037{
1032 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1039 want_refresh = 1;
1034 1040 refresh_check ();
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1041}
1037#endif 1042#endif
1038 1043
1039#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1040void 1045void
1041rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1047{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1049 {
1045 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1046 want_refresh = 1; 1051 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1048 } 1053 }
1054 else
1055 w.stop ();
1049} 1056}
1050#endif 1057#endif
1051 1058
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1060void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1062{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1058 { 1065 {
1059 want_refresh = 1; 1066 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1061 } 1068 }
1069 else
1070 w.stop ();
1062} 1071}
1063#endif 1072#endif
1064 1073
1065#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1066void 1075void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1077{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1079 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1081 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1074 } 1083 }
1084 else
1085 w.stop ();
1075} 1086}
1076#endif 1087#endif
1077 1088
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1090void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1092{
1082 if (mouse_slip_wheel_speed == 0 1093 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 { 1094 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1; 1095 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1097 }
1098
1099 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1100 {
1101 mouse_slip_wheel_speed = 0;
1102 w.stop ();
1091 } 1103 }
1092} 1104}
1093#endif 1105#endif
1094 1106
1095#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1096static struct event_handler 1108static struct event_handler
1097{ 1109{
1098 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1099 1111
1100 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1101 { 1113 {
1102 usleep (0); 1114 // this should really be sched_yield(), but the linux guys thought
1115 // that giving a process calling sched_yield () less cpu time than
1116 // ones with high nice levels is a useful thing to do. It surely is is
1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1121
1122 struct timespec ts = { 0, 1000 };
1123 nanosleep (&ts, 0);
1124
1103 w.stop (); 1125 w.stop ();
1104 } 1126 }
1105 1127
1106 event_handler () 1128 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb) 1129 : yield_ev (this, &event_handler::yield_cb)
1108 { 1130 {
1109 } 1131 }
1110} event_handler; 1132} event_handler;
1111#endif 1133#endif
1112 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1113bool 1168bool
1114rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1115{ 1170{
1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1117 1172
1118 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1119 { 1174
1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1121 n = 0;
1122 } 1176 {
1123 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1125 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1126 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1127 1182
1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1129 1184
1130 if (r > 0) 1185 if (r > 0)
1131 { 1186 {
1132 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1133 return true; 1188 return true;
… …
1141 } 1196 }
1142 else 1197 else
1143 { 1198 {
1144 pty_ev.stop (); 1199 pty_ev.stop ();
1145 1200
1146 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1147 destroy (); 1202 destroy ();
1148 } 1203 }
1149 1204
1150 return false; 1205 return false;
1151} 1206}
1152 1207
1153void 1208void
1154rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1155{ 1210{
1156 make_current (); 1211 make_current ();
1157 1212
1158 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1159 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1160 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1161 if (cmd_parse ()) 1216 cmd_parse ();
1162 break;
1163 1217
1164 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1165 pty_write (); 1219 pty_write ();
1166}
1167 1220
1168void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1169rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1170{ 1226{
1171 XDefineCursor (xdisp, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1172 recolour_cursor (); 1228 recolour_cursor ();
1173 1229
1174#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1175 hidden_pointer = 0; 1231 hidden_pointer = 0;
1176 1232
1177 if (OPTION (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1178 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1179#endif 1235#endif
1180} 1236}
1181 1237
1182#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1183void 1239void ecb_cold
1184rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1185{ 1241{
1186 if (!OPTION (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1187 return; 1243 return;
1188 1244
1189 XDefineCursor (xdisp, vt, display->blank_cursor); 1245 XDefineCursor (dpy, vt, display->blank_cursor);
1190 XFlush (xdisp); 1246 XFlush (dpy);
1191 1247
1192 hidden_pointer = 1; 1248 hidden_pointer = 1;
1193} 1249}
1194 1250
1195void 1251void ecb_cold
1196rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1197{ 1253{
1198 make_current (); 1254 make_current ();
1199 1255
1200 pointer_blank (); 1256 pointer_blank ();
1201} 1257}
… …
1204void 1260void
1205rxvt_term::mouse_report (XButtonEvent &ev) 1261rxvt_term::mouse_report (XButtonEvent &ev)
1206{ 1262{
1207 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1208 int x, y; 1264 int x, y;
1265 int code = 32;
1209 1266
1210 x = ev.x; 1267 x = Pixel2Col (ev.x) + 1;
1211 y = ev.y; 1268 y = Pixel2Row (ev.y) + 1;
1212 pixel_position (&x, &y); 1269
1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274
1275 mouse_row = x;
1276 mouse_col = y;
1277 code += 32;
1278 }
1213 1279
1214 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1215 button_number = 3; 1281 button_number = 3;
1216 else 1282 else
1217 { 1283 {
1218 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1219 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1220 if (button_number >= 3) 1286 if (button_number >= 3)
1221 button_number += (64 - 3); 1287 button_number += 64 - 3;
1222 } 1288 }
1223 1289
1224 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1225 { 1291 {
1226 /* 1292 /*
… …
1258 fputc ('A', stderr); 1324 fputc ('A', stderr);
1259 if (key_state & 32) 1325 if (key_state & 32)
1260 fputc ('2', stderr); 1326 fputc ('2', stderr);
1261 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1262 button_number, 1328 button_number,
1263 x + 1, 1329 x,
1264 y + 1); 1330 y);
1265#endif 1331#endif
1266 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1267 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1268 (32 + button_number + key_state), 1347 code + button_number + key_state,
1269 (32 + x + 1), 1348 32 + x,
1270 (32 + y + 1)); 1349 32 + y);
1271} 1350}
1272 1351
1273/*{{{ process an X event */ 1352/*{{{ process an X event */
1274void 1353void ecb_hot
1275rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1276{ 1355{
1277 make_current (); 1356 make_current ();
1278 1357
1279 dLocal (Display *, xdisp); 1358 dLocal (Display *, dpy);
1280 1359
1281 if (ev.xany.window == vt 1360 if (ev.xany.window == vt
1282 && SHOULD_INVOKE (HOOK_X_EVENT) 1361 && SHOULD_INVOKE (HOOK_X_EVENT)
1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1362 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1284 return; 1363 return;
… …
1289 unsigned int unused_mask; 1368 unsigned int unused_mask;
1290 1369
1291 switch (ev.type) 1370 switch (ev.type)
1292 { 1371 {
1293 case KeyPress: 1372 case KeyPress:
1294#if ISO_14755 1373 key_press (ev.xkey);
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1297 lookup_key (ev.xkey);
1298
1299 break; 1374 break;
1300 1375
1301 case KeyRelease: 1376 case KeyRelease:
1302 { 1377 key_release (ev.xkey);
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1368 if (!(ev.xkey.state & ControlMask))
1369 slip_wheel_ev.stop ();
1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1371 mouse_slip_wheel_speed = 0;
1372#endif
1373 break; 1378 break;
1374 }
1375 1379
1376 case ButtonPress: 1380 case ButtonPress:
1377 button_press (ev.xbutton); 1381 button_press (ev.xbutton);
1378 break; 1382 break;
1379 1383
… …
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1398 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1395 destroy (); 1399 destroy ();
1396 } 1400 }
1397#if ENABLE_EWMH 1401#if ENABLE_EWMH
1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1399 XSendEvent (xdisp, ev.xclient.window = display->root, 1403 XSendEvent (dpy, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask, 1404 False, SubstructureRedirectMask | SubstructureNotifyMask,
1401 &ev); 1405 &ev);
1402#endif 1406#endif
1403 } 1407 }
1404 } 1408 }
… …
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1414 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out (); 1415 focus_out ();
1412 } 1416 }
1413#endif 1417#endif
1414 } 1418 }
1415 break;
1416
1417 case MappingNotify:
1418 XRefreshKeyboardMapping (&ev.xmapping);
1419 break; 1419 break;
1420 1420
1421 /* 1421 /*
1422 * XXX: this is not the _current_ arrangement 1422 * XXX: this is not the _current_ arrangement
1423 * Here's my conclusion: 1423 * Here's my conclusion:
… …
1442 break; 1442 break;
1443 } 1443 }
1444 break; 1444 break;
1445 1445
1446 case FocusIn: 1446 case FocusIn:
1447 if (ev.xfocus.detail != NotifyInferior
1448 && ev.xfocus.detail != NotifyPointer
1449 && ev.xfocus.mode != NotifyGrab)
1447 focus_in (); 1450 focus_in ();
1448 break; 1451 break;
1449 1452
1450 case FocusOut: 1453 case FocusOut:
1454 if (ev.xfocus.detail != NotifyInferior
1455 && ev.xfocus.detail != NotifyPointer
1456 && ev.xfocus.mode != NotifyGrab)
1451 focus_out (); 1457 focus_out ();
1452 break; 1458 break;
1453 1459
1454 case ConfigureNotify: 1460 case ConfigureNotify:
1455 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1456 { 1462 {
1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1458 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1459 1498
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1500 {
1462 seen_resize = 1; 1501 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1503 }
1504 else
1505 {
1506#ifdef HAVE_BG_PIXMAP
1507 if (moved)
1508 update_background ();
1509#endif
1510 }
1465 1511
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1469 if (OPTION (Opt_transparent))
1470 check_our_parents ();
1471#endif
1472 } 1513 }
1473 break; 1514 break;
1474 1515
1475 case PropertyNotify: 1516 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1478 && ev.xproperty.state == PropertyNewValue)
1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1480
1481 break; 1518 break;
1482 1519
1483 case SelectionClear: 1520 case SelectionClear:
1484 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1485 break;
1486
1487 case SelectionNotify:
1488 if (selection_wait == Sel_normal)
1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1490 break; 1522 break;
1491 1523
1492 case SelectionRequest: 1524 case SelectionRequest:
1493 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1494 break; 1526 break;
1495 1527
1496 case MapNotify: 1528 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a
1531 * non-reparenting window manager. In those cases we never get first
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1534 * reparenting.
1535 * We should not render background immediately, as there could be several
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1537 * by scheduling background redraw as soon as we can, but giving a short
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025);
1544#endif
1497 mapped = 1; 1545 mapped = 1;
1498#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1500#endif 1548#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break; 1550 break;
1503 1551
1504 case UnmapNotify: 1552 case UnmapNotify:
… …
1506#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1507 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1508#endif 1556#endif
1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1558 break;
1511
1512#ifdef TRANSPARENT
1513 case ReparentNotify:
1514 rootwin_cb (ev);
1515 break;
1516#endif /* TRANSPARENT */
1517 1559
1518 case GraphicsExpose: 1560 case GraphicsExpose:
1519 case Expose: 1561 case Expose:
1520 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1521 { 1563 {
1522 do 1564 do
1565 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1568 }
1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1570
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1572
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1577 }
1532 1578
1533 want_refresh = 1; 1579 want_refresh = 1;
1534 } 1580 }
1535 else 1581 else
1536 { 1582 {
1537 XEvent unused_event; 1583 XEvent unused_event;
1538 1584
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1586 ;
1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1588 ;
1543 1589
1544 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1545 { 1591 {
1546 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1547 scrollbar_show (0); 1593 scrollBar.show (0);
1548 } 1594 }
1549
1550#ifdef TRANSPARENT
1551 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window);
1553#endif
1554 } 1595 }
1555 break; 1596 break;
1556 1597
1557 case MotionNotify: 1598 case MotionNotify:
1558#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1559 if (hidden_pointer) 1600 if (hidden_pointer)
1560 pointer_unblank (); 1601 pointer_unblank ();
1561#endif 1602#endif
1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent)
1605 mouse_report (ev.xbutton);
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1607 break;
1564 1608
1565 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1566 { 1610 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1611 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1612 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop 1613 ; // nop
1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1614 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1615 {
1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1616 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1617 ;
1574 1618
1575 XQueryPointer (xdisp, vt, 1619 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1620 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1623 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
… …
1600 int dist; 1644 int dist;
1601 1645
1602 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1604 */ 1648 */
1605 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1607 1651
1608 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1609 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1610 */ 1654 */
1611 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
… …
1619 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1620 } 1664 }
1621 else 1665 else
1622 { 1666 {
1623 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1624 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1625 } 1669 }
1626 1670
1627 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1628 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1629 + 1; 1673 + 1;
… …
1633 else 1677 else
1634 { 1678 {
1635 /* we are within the text window, so we 1679 /* we are within the text window, so we
1636 * shouldn't be scrolling 1680 * shouldn't be scrolling
1637 */ 1681 */
1638 if (sel_scroll_ev.active)
1639 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1640 } 1683 }
1641#endif 1684#endif
1642#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1643 } 1686 }
1644#endif 1687#endif
1645 } 1688 }
1646 } 1689 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1648 { 1691 {
1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1651 ; 1694 ;
1652 1695
1653 XQueryPointer (xdisp, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1700 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1702 scrollBar.size ());
1660 want_refresh = 1; 1703 want_refresh = 1;
1661 refresh_limit = 0;
1662 scrollbar_show (1); 1704 scrollBar.show (1);
1663 } 1705 }
1664 break; 1706 break;
1665 } 1707 }
1666 1708
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1671 { 1711 cursor_blink_reset ();
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif 1712#endif
1681 1713
1682#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1716 {
1685 if (ev.type == MotionNotify 1717 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress 1718 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease) 1719 || ev.type == ButtonRelease)
1688 if (hidden_pointer) 1720 if (hidden_pointer)
… …
1690 1722
1691 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank (); 1724 pointer_blank ();
1693 } 1725 }
1694#endif 1726#endif
1695}
1696 1727
1697void 1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1698rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1699{ 1750{
1700 if (!focus) 1751 if (!focus)
1701 { 1752 {
1702 focus = 1; 1753 focus = 1;
1703 want_refresh = 1; 1754 want_refresh = 1;
1704 1755
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM 1756#if USE_XIM
1708 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1709 { 1758 {
1710 IMSetStatusPosition (); 1759 im_set_position ();
1711 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1712 } 1761 }
1713#endif 1762#endif
1714#if CURSOR_BLINK 1763#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1717#endif 1766#endif
1718#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1720 { 1769 {
1721 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1771 scr_recolour ();
1723 } 1772 }
1724#endif 1773#endif
1725 } 1774#if ENABLE_FRILLS
1726} 1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1777#endif
1727 1778
1728void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1729rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1730{ 1785{
1731 if (focus) 1786 if (focus)
1732 { 1787 {
1733 focus = 0; 1788 focus = 0;
1734 want_refresh = 1; 1789 want_refresh = 1;
1735 1790
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1737 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1738#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1796 if (iso14755buf)
1740 { 1797 {
1741 iso14755buf = 0; 1798 iso14755buf = 0;
1742# if ENABLE_OVERLAY 1799# if ISO_14755
1743 scr_overlay_off (); 1800 scr_overlay_off ();
1744# endif 1801# endif
1745 } 1802 }
1746#endif 1803#endif
1747#if USE_XIM 1804#if USE_XIM
1748 if (Input_Context != NULL) 1805 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1750#endif 1807#endif
1751#if CURSOR_BLINK 1808#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1809 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1754 hidden_cursor = 0; 1812 hidden_cursor = 0;
1755#endif 1813#endif
1756#if OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1758 { 1816 {
1759 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1760 scr_recolour (); 1818 scr_recolour ();
1761 } 1819 }
1762#endif 1820#endif
1821
1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1827rxvt_term::update_fade_color (unsigned int idx)
1828{
1829#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade])
1763 } 1831 {
1832 rgba c;
1833 pix_colors [Color_fade].get (c);
1834 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835 }
1836#endif
1764} 1837}
1765 1838
1766#if TRANSPARENT 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1840void ecb_hot
1768rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1842{
1770 make_current (); 1843 make_current ();
1844
1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847 return;
1771 1848
1772 switch (ev.type) 1849 switch (ev.type)
1773 { 1850 {
1774 case PropertyNotify: 1851 case PropertyNotify:
1775 /* 1852 /*
1776 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1777 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1778 */ 1855 */
1779 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1781 return; 1858 {
1859# if ENABLE_TRANSPARENCY
1860 bg_set_root_pixmap ();
1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1866 }
1782 1867
1783 /* FALLTHROUGH */
1784 case ReparentNotify:
1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1786 want_refresh = want_full_refresh = 1;
1787 break; 1868 break;
1788 } 1869 }
1870
1871 refresh_check ();
1789} 1872}
1790#endif 1873#endif
1791 1874
1792void 1875void
1793rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1824 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1825 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1828 { 1911 {
1829 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1830 MEvent.clicks++; 1913 MEvent.clicks++;
1831 1914
1832 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1833 { 1916 {
1834 /* only report double clicks */ 1917 /* only report double clicks */
… …
1848 mouse_report (ev); 1931 mouse_report (ev);
1849 } 1932 }
1850#else 1933#else
1851 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1852 mouse_report (ev); 1935 mouse_report (ev);
1853#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1854 1937
1855 } 1938 }
1856 else 1939 else
1857 { 1940 {
1858 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1906 } 1989 }
1907 1990
1908 /* 1991 /*
1909 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1910 */ 1993 */
1911 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1912 { 1995 {
1913 scrollBar.setIdle (); 1996 page_dirn direction = NO_DIR;
1997
1998 if (scrollBar.upButton (ev.y))
1999 direction = UP; /* up */
2000 else if (scrollBar.dnButton (ev.y))
2001 direction = DN; /* down */
2002
2003 scrollBar.state = SB_STATE_IDLE;
1914 /* 2004 /*
1915 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1916 * move up if mouse is above slider 2006 * move up if mouse is above slider
1917 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1918 * 2008 *
… …
1927 /* 2017 /*
1928 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1929 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1930 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1931 */ 2021 */
1932 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1933 && scrollbarnext_upButton (ev.y))
1934 || (scrollBar.style == R_SB_RXVT
1935 && scrollbarrxvt_upButton (ev.y)))
1936 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1937 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1938 && scrollbarnext_dnButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_dnButton (ev.y)))
1941 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1942 else 2026 else
1943 switch (ev.button) 2027 switch (ev.button)
1944 { 2028 {
1945 case Button2: 2029 case Button2:
… …
1952 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1953 break; 2037 break;
1954 } 2038 }
1955 } 2039 }
1956 else 2040 else
1957#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1958
1959 {
1960 char upordown = 0;
1961
1962 if (scrollBar.style == R_SB_NEXT)
1963 { 2042 {
1964 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
1965 upordown = -1; /* up */
1966 else if (scrollbarnext_dnButton (ev.y))
1967 upordown = 1; /* down */
1968 }
1969 else if (scrollBar.style == R_SB_RXVT)
1970 {
1971 if (scrollbarrxvt_upButton (ev.y))
1972 upordown = -1; /* up */
1973 else if (scrollbarrxvt_dnButton (ev.y))
1974 upordown = 1; /* down */
1975 }
1976 if (upordown)
1977 { 2044 {
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1980#endif 2048#endif
1981 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
1982 { 2050 {
1983 if (upordown < 0) 2051 if (direction == UP)
1984 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
1985 else 2053 else
1986 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
1987 } 2055 }
1988 } 2056 }
1989 else 2057 else
1990 switch (ev.button) 2058 switch (ev.button)
1991 { 2059 {
1992 case Button2: 2060 case Button2:
1993 switch (scrollbar_align) 2061 switch (scrollBar.align)
1994 { 2062 {
1995 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
1996 csrO = 0; 2064 csrO = 0;
1997 break; 2065 break;
1998 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
1999 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2000 break; 2068 break;
2001 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2002 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2003 break; 2071 break;
2004 } 2072 }
2005 2073
2006 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2007 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2008 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2009 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2010 2078
2011 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2012 break; 2080 break;
2013 2081
2014 case Button1: 2082 case Button1:
2015 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2016 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2017 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2018 2086
2019 case Button3: 2087 case Button3:
2020 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2021 { 2089 {
2022 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2023# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2024 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2025# else 2093# else
2026 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2027# endif 2095# endif
2028 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2030 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2031# else 2099# else
2032 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2033# endif 2101# endif
2034 else 2102 else
2035 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2036 } 2104 }
2037 else 2105 else
2038 { 2106 {
2039 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2040 (nrow 2108 (nrow
2041 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2042 / scrollbar_size ())); 2110 / scrollBar.size ()));
2043 } 2111 }
2044 2112
2045 break; 2113 break;
2046 } 2114 }
2047 } 2115 }
… …
2057 2125
2058 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2059 if (!bypass_keystate) 2127 if (!bypass_keystate)
2060 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2061 2129
2062 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2063 { 2131 {
2064 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2065 scrollbar_show (0); 2133 scrollBar.show (0);
2066 } 2134 }
2067 2135
2068#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2069 if (sel_scroll_ev.active)
2070 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2071#endif 2138#endif
2072 2139
2073 if (ev.window == vt) 2140 if (ev.window == vt)
2074 { 2141 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2099 mouse_report (ev); 2166 mouse_report (ev);
2100 } 2167 }
2101#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2102 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2103 mouse_report (ev); 2170 mouse_report (ev);
2104#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2105 return; 2172 return;
2106 } 2173 }
2107 2174
2108 /* 2175 /*
2109 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2120 case Button3: 2187 case Button3:
2121 selection_make (ev.time); 2188 selection_make (ev.time);
2122 break; 2189 break;
2123 2190
2124 case Button2: 2191 case Button2:
2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2194 break;
2128 2195
2129#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2130 case Button4: 2197 case Button4:
2131 case Button5: 2198 case Button5:
… …
2135 2202
2136 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2137 2204
2138 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2139 i = 1; 2206 i = 1;
2140 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2141 i = nrow - 1; 2208 i = nrow - 1;
2142 else 2209 else
2143 i = 5; 2210 i = 5;
2144 2211
2145# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2147 { 2214 {
2148 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2149 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2150 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2151 2218
2152 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2153 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2154
2155 slip_wheel_ev.start ();
2156 } 2221 }
2157 else 2222 else
2223# endif
2158 { 2224 {
2159# endif
2160 scr_page (v, i); 2225 scr_page (v, i);
2161 scrollbar_show (1); 2226 scrollBar.show (1);
2162# ifdef MOUSE_SLIP_WHEELING
2163 } 2227 }
2164# endif
2165 } 2228 }
2166 break; 2229 break;
2167#endif 2230#endif
2168 } 2231 }
2169 } 2232 }
2170} 2233}
2171 2234
2172#ifdef TRANSPARENT
2173#if TINTING
2174/* taken from aterm-0.4.2 */
2175
2176typedef uint32_t RUINT32T;
2177
2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2179{
2180 int sh_r, sh_g, sh_b;
2181 RUINT32T mask_r, mask_g, mask_b;
2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2185 int i;
2186
2187 Visual *visual = term->visual;
2188
2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2190
2191 /* for convenience */
2192 mask_r = visual->red_mask;
2193 mask_g = visual->green_mask;
2194 mask_b = visual->blue_mask;
2195
2196 /* boring lookup table pre-initialization */
2197 switch (srcImage->bits_per_pixel) {
2198 case 15:
2199 if ((mask_r != 0x7c00) ||
2200 (mask_g != 0x03e0) ||
2201 (mask_b != 0x001f))
2202 return;
2203 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2204 lookup_r = lookup;
2205 lookup_g = lookup+32;
2206 lookup_b = lookup+32+32;
2207 sh_r = 10;
2208 sh_g = 5;
2209 sh_b = 0;
2210 break;
2211 case 16:
2212 if ((mask_r != 0xf800) ||
2213 (mask_g != 0x07e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+64;
2220 sh_r = 11;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 24:
2225 if ((mask_r != 0xff0000) ||
2226 (mask_g != 0x00ff00) ||
2227 (mask_b != 0x0000ff))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2230 lookup_r = lookup;
2231 lookup_g = lookup+256;
2232 lookup_b = lookup+256+256;
2233 sh_r = 16;
2234 sh_g = 8;
2235 sh_b = 0;
2236 break;
2237 case 32:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 default:
2251 return; /* we do not support this color depth */
2252 }
2253
2254 /* prepare limits for color transformation (each channel is handled separately) */
2255 if (shade < 0) {
2256 shade = -shade;
2257 if (shade < 0) shade = 0;
2258 if (shade > 100) shade = 100;
2259
2260 lower_lim_r = 65535-rm;
2261 lower_lim_g = 65535-gm;
2262 lower_lim_b = 65535-bm;
2263
2264 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2265 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2266 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2267
2268 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2269 } else {
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2274
2275 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2276 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2277 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2278 }
2279
2280 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2281 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2282 {
2283 unsigned int tmp;
2284
2285 tmp = lower_lim_r;
2286 lower_lim_r = lower_lim_b;
2287 lower_lim_b = tmp;
2288
2289 tmp = upper_lim_r;
2290 upper_lim_r = upper_lim_b;
2291 upper_lim_b = tmp;
2292 }
2293
2294 /* fill our lookup tables */
2295 for (i = 0; i <= mask_r>>sh_r; i++)
2296 {
2297 RUINT32T tmp;
2298 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2299 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2300 lookup_r[i] = (tmp/65535)<<sh_r;
2301 }
2302 for (i = 0; i <= mask_g>>sh_g; i++)
2303 {
2304 RUINT32T tmp;
2305 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2306 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2307 lookup_g[i] = (tmp/65535)<<sh_g;
2308 }
2309 for (i = 0; i <= mask_b>>sh_b; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2313 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2314 lookup_b[i] = (tmp/65535)<<sh_b;
2315 }
2316
2317 /* apply table to input image (replacing colors by newly calculated ones) */
2318 switch (srcImage->bits_per_pixel)
2319 {
2320 case 15:
2321 {
2322 unsigned short *p1, *pf, *p, *pl;
2323 p1 = (unsigned short *) srcImage->data;
2324 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2325 while (p1 < pf)
2326 {
2327 p = p1;
2328 pl = p1 + srcImage->width;
2329 for (; p < pl; p++)
2330 {
2331 *p = lookup_r[(*p & 0x7c00)>>10] |
2332 lookup_g[(*p & 0x03e0)>> 5] |
2333 lookup_b[(*p & 0x001f)];
2334 }
2335 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2336 }
2337 break;
2338 }
2339 case 16:
2340 {
2341 unsigned short *p1, *pf, *p, *pl;
2342 p1 = (unsigned short *) srcImage->data;
2343 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2344 while (p1 < pf)
2345 {
2346 p = p1;
2347 pl = p1 + srcImage->width;
2348 for (; p < pl; p++)
2349 {
2350 *p = lookup_r[(*p & 0xf800)>>11] |
2351 lookup_g[(*p & 0x07e0)>> 5] |
2352 lookup_b[(*p & 0x001f)];
2353 }
2354 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2355 }
2356 break;
2357 }
2358 case 24:
2359 {
2360 unsigned char *p1, *pf, *p, *pl;
2361 p1 = (unsigned char *) srcImage->data;
2362 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width * 3;
2367 for (; p < pl; p += 3)
2368 {
2369 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2370 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2371 p[2] = lookup_r[(p[2] & 0x0000ff)];
2372 }
2373 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 32:
2378 {
2379 RUINT32T *p1, *pf, *p, *pl;
2380 p1 = (RUINT32T *) srcImage->data;
2381 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xff0000)>>16] |
2390 lookup_g[(*p & 0x00ff00)>> 8] |
2391 lookup_b[(*p & 0x0000ff)] |
2392 (*p & ~0xffffff);
2393 }
2394 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 }
2399
2400 free (lookup);
2401}
2402#endif
2403
2404/*
2405 * Check our parents are still who we think they are.
2406 * Do transparency updates if required
2407 */
2408int
2409rxvt_term::check_our_parents ()
2410{
2411 int i, pchanged, aformat, have_pixmap, rootdepth;
2412 unsigned long nitems, bytes_after;
2413 Atom atype;
2414 unsigned char *prop = NULL;
2415 Window root, oldp, *list;
2416 Pixmap rootpixmap = None;
2417 XWindowAttributes wattr, wrootattr;
2418
2419 pchanged = 0;
2420
2421 if (!OPTION (Opt_transparent))
2422 return pchanged; /* Don't try any more */
2423
2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2425 rootdepth = wrootattr.depth;
2426
2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2428
2429 if (rootdepth != wattr.depth)
2430 {
2431 if (am_transparent)
2432 {
2433 pchanged = 1;
2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2435 am_transparent = am_pixmap_trans = 0;
2436 }
2437
2438 return pchanged; /* Don't try any more */
2439 }
2440
2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2442 XSync (xdisp, False);
2443
2444 /*
2445 * Make the frame window set by the window manager have
2446 * the root background. Some window managers put multiple nested frame
2447 * windows for each client, so we have to take care about that.
2448 */
2449 i = (xa[XA_XROOTPMAP_ID]
2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2452 &nitems, &bytes_after, &prop) == Success);
2453
2454 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success);
2459
2460 if (!i || prop == NULL
2461#if TINTING
2462 || !ISSET_PIXCOLOR (Color_tint)
2463#endif
2464 )
2465 have_pixmap = 0;
2466 else
2467 {
2468 have_pixmap = 1;
2469 rootpixmap = *(Pixmap *)prop;
2470 XFree (prop);
2471 }
2472
2473 if (have_pixmap)
2474 {
2475 /*
2476 * Copy display->root pixmap transparency
2477 */
2478 int sx, sy, nx, ny;
2479 unsigned int nw, nh;
2480 Window cr;
2481 XImage *image;
2482 GC gc;
2483 XGCValues gcvalue;
2484
2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2486 0, 0, &sx, &sy, &cr);
2487 nw = (unsigned int)szHint.width;
2488 nh = (unsigned int)szHint.height;
2489 nx = ny = 0;
2490
2491 if (sx < 0)
2492 {
2493 nw += sx;
2494 nx = -sx;
2495 sx = 0;
2496 }
2497
2498 if (sy < 0)
2499 {
2500 nh += sy;
2501 ny = -sy;
2502 sy = 0;
2503 }
2504
2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507
2508 XSync (xdisp, False);
2509 allowedxerror = -1;
2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2511
2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2513 /* XXX: may need a delay here? */
2514 allowedxerror = 0;
2515
2516 if (image == NULL)
2517 {
2518 if (am_transparent && am_pixmap_trans)
2519 {
2520 pchanged = 1;
2521 if (pixmap != None)
2522 {
2523 XFreePixmap (xdisp, pixmap);
2524 pixmap = None;
2525 }
2526 }
2527
2528 am_pixmap_trans = 0;
2529 }
2530 else
2531 {
2532 if (pixmap != None)
2533 XFreePixmap (xdisp, pixmap);
2534
2535#if TINTING
2536 if (ISSET_PIXCOLOR (Color_tint))
2537 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539
2540 rgba c;
2541 pix_colors_focused [Color_tint].get (c);
2542
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 }
2545#endif
2546
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height);
2551 XFreeGC (xdisp, gc);
2552 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2554 XClearWindow (xdisp, parent[0]);
2555
2556 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1;
2558
2559 am_transparent = am_pixmap_trans = 1;
2560 }
2561 }
2562
2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else
2566 {
2567 unsigned int n;
2568 /*
2569 * InheritPixmap transparency
2570 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 {
2573 oldp = parent[i];
2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2575 XFree (list);
2576
2577 if (parent[i] == display->root)
2578 {
2579 if (oldp != None)
2580 pchanged = 1;
2581
2582 break;
2583 }
2584
2585 if (oldp != parent[i])
2586 pchanged = 1;
2587 }
2588
2589 n = 0;
2590
2591 if (pchanged)
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break;
2600 }
2601 }
2602
2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643
2644/*}}} */ 2235/*}}} */
2645 2236
2646bool 2237void ecb_hot
2647rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2648{ 2239{
2649 bool flag = false;
2650 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2651 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2652 2242
2653 for (;;) 2243 for (;;)
2654 { 2244 {
2655 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2656 { 2246 {
2657 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2658 ch = next_char (); 2248 ch = next_char ();
2659 2249
2660 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2661 break; 2251 break;
2662 } 2252 }
2663 2253
2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2665 { 2255 {
2666 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2667 { 2257 {
2668 seen_input = 1; 2258 seen_input = 1;
2669 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2670 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2671 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2684 wchar_t *str = buf; 2274 wchar_t *str = buf;
2685 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2686 2276
2687 for (;;) 2277 for (;;)
2688 { 2278 {
2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2690 break; 2280 break;
2691 2281
2692 *str++ = ch; 2282 *str++ = ch;
2693 2283
2694 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2695 { 2285 {
2696 if (ch == C0_LF) 2286 if (ch == C0_LF)
2697 nlines++; 2287 nlines++;
2698 2288
2699 refresh_count++; 2289 refresh_count++;
2700 2290
2701 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2292 {
2704 refreshnow = true;
2705 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2296 {
2297 refreshnow = true;
2706 ch = NOCHAR; 2298 ch = NOCHAR;
2707 break; 2299 break;
2300 }
2708 } 2301 }
2709 2302
2710 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2712 { 2305 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2742 2335
2743 /* 2336 /*
2744 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2340 */
2749 if (refreshnow) 2341 if (refreshnow)
2750 { 2342 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true;
2756 scr_refresh (); 2343 scr_refresh ();
2757 want_refresh = 1; 2344 want_refresh = 1;
2758 }
2759 } 2345 }
2760
2761 } 2346 }
2762 else 2347 else
2763 { 2348 {
2764 try 2349 try
2765 { 2350 {
… …
2773 } 2358 }
2774 2359
2775 ch = NOCHAR; 2360 ch = NOCHAR;
2776 } 2361 }
2777 } 2362 }
2778
2779 return flag;
2780} 2363}
2781 2364
2782// read the next character 2365// read the next character
2783wchar_t 2366wchar_t ecb_hot
2784rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2785{ 2368{
2786 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2787 { 2370 {
2788 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2790 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2791 2374
2792 wchar_t wc; 2375 wchar_t wc;
2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2794 2377
… …
2798 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2799 break; 2382 break;
2800 } 2383 }
2801 2384
2802 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389 }
2804 2390
2805 // assume wchar == unicode 2391 // assume wchar == unicode
2806 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2807 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2808 } 2394 }
2809 2395
2810 return NOCHAR; 2396 return NOCHAR;
2811} 2397}
2812 2398
2813// read the next octet 2399// read the next octet
2814uint32_t 2400uint32_t ecb_hot
2815rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2816{ 2402{
2817 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR; 2405 : NOCHAR;
2820} 2406}
2821 2407
2822static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2823 2409
2824/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2825/*
2826 * Return the next input character after first passing any keyboard input
2827 * to the command.
2828 */
2829wchar_t
2830rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2831{ 2412{
2832 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2833 2414
2834 if (c == NOCHAR) 2415 if (c == NOCHAR)
2835 throw out_of_input; 2416 throw out_of_input;
2836 2417
2837 return c; 2418 return c;
2838} 2419}
2839 2420
2840uint32_t 2421uint32_t ecb_hot
2841rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2842{ 2423{
2843 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2844 2425
2845 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2849} 2430}
2850 2431
2851/*{{{ print pipe */ 2432/*{{{ print pipe */
2852/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2853#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2854FILE * 2435FILE * ecb_cold
2855rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2856{ 2437{
2857 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2858 2439
2859 if (stream == NULL) 2440 if (stream == NULL)
2860 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2861 2442
2862 return stream; 2443 return stream;
2863} 2444}
2864 2445
2865int 2446int ecb_cold
2866rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2867{ 2448{
2868 fflush (stream); 2449 fflush (stream);
2869 return pclose (stream); 2450 return pclose (stream);
2870} 2451}
2871 2452
2872/* 2453/*
2873 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2874 */ 2455 */
2875void 2456void ecb_cold
2876rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2877{ 2458{
2878 int done; 2459 FILE *fd = popen_printer ();
2879 FILE *fd;
2880 2460
2881 if ((fd = popen_printer ()) == NULL) 2461 if (!fd)
2882 return; 2462 return;
2883 2463
2884 /* 2464 /*
2885 * Send all input to the printer until either ESC[4i or ESC[?4i 2465 * Send all input to the printer until either ESC[4i or ESC[?4i
2886 * is received. 2466 * is received.
2887 */ 2467 */
2888 for (done = 0; !done;) 2468 for (int done = 0; !done; )
2889 { 2469 {
2890 unsigned char buf[8]; 2470 unsigned char buf[8];
2891 unicode_t ch; 2471 unicode_t ch;
2892 unsigned int i, len; 2472 unsigned int i, len;
2893 2473
… …
2912 { 2492 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2494 break; /* done = 1 */
2915 } 2495 }
2916 } 2496 }
2917 2497
2918 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2920 { 2500 {
2921 done = 1; 2501 done = 1;
2922 break; 2502 break;
… …
2924 } 2504 }
2925 } 2505 }
2926 2506
2927 pclose_printer (fd); 2507 pclose_printer (fd);
2928} 2508}
2929#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2930/*}}} */ 2510/*}}} */
2931 2511
2932/* *INDENT-OFF* */
2933enum { 2512enum {
2934 C1_40 = 0x40, 2513 C1_40 = 0x40,
2935 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2936 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2937 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2938 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2939}; 2518};
2940/* *INDENT-ON* */
2941 2519
2942/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2943void 2521void ecb_hot
2944rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2945{ 2523{
2946 switch (ch) 2524 switch (ch)
2947 { 2525 {
2948 case C0_ESC: 2526 case C0_ESC:
… …
2984 process_dcs_seq (); 2562 process_dcs_seq ();
2985 break; 2563 break;
2986 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
2987 process_csi_seq (); 2565 process_csi_seq ();
2988 break; 2566 break;
2989 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
2990 process_osc_seq (); 2568 process_osc_seq ();
2991 break; 2569 break;
2992#endif 2570#endif
2993 } 2571 }
2994} 2572}
2995/*}}} */ 2573/*}}} */
2996 2574
2997 2575
2998/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2999void 2577void ecb_cold
3000rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
3001{ 2579{
3002 int row, col; 2580 int row, col;
3003 2581
3004 switch (ch) 2582 switch (ch)
… …
3038 break; 2616 break;
3039 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
3040 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3041 break; 2619 break;
3042 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
3043 PrivMode (0, PrivMode_vt52); 2621 priv_modes &= ~PrivMode_vt52;
3044 break; 2622 break;
3045 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
3046 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
3047 /* unimplemented */ 2625 /* unimplemented */
3048 break; 2626 break;
… …
3054} 2632}
3055/*}}} */ 2633/*}}} */
3056 2634
3057 2635
3058/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
3059void 2637void ecb_hot
3060rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
3061{ 2639{
3062 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
3063 2641
3064 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
3067 return; 2645 return;
3068 } 2646 }
3069 2647
3070 switch (ch) 2648 switch (ch)
3071 { 2649 {
3072 /* case 1: do_tek_mode (); break; */
3073 case '#': 2650 case '#':
3074 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
3075 scr_E (); 2652 scr_E ();
3076 break; 2653 break;
3077 case '(': 2654 case '(':
… …
3100#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
3101 case '9': 2678 case '9':
3102 scr_forwardindex (); 2679 scr_forwardindex ();
3103 break; 2680 break;
3104#endif 2681#endif
2682 // DECPAM/DECPNM
3105 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
3106 case '>': 2686 case '>':
3107 PrivMode ((ch == '='), PrivMode_aplKP); 2687 priv_modes &= ~PrivMode_aplKP;
3108 break; 2688 break;
3109 2689
3110 case C1_40: 2690 case C1_40:
3111 cmd_getc (); 2691 cmd_getc ();
3112 break; 2692 break;
… …
3116 2696
3117 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
3118 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
3119 { 2699 {
3120 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3122 } 2702 }
3123 break; 2703 break;
3124 2704
3125 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
3126 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
3127 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3128 break; 2710 break;
3129 2711
3130 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
3131 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
3132 scr_set_tab (1); 2714 scr_set_tab (1);
… …
3136 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
3137 scr_index (DN); 2719 scr_index (DN);
3138 break; 2720 break;
3139 2721
3140 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
3141 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
3142 2724
3143 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
3144 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
3145 2727
3146 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
3147 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
3148 process_dcs_seq (); 2730 process_dcs_seq ();
3149 break; 2731 break;
… …
3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3152 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3154 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
3155 2737
3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3157 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
3158 process_csi_seq (); 2740 process_csi_seq ();
3159 break; 2741 break;
3160 2742
3161 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3162 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
3163 process_osc_seq (); 2745 process_osc_seq ();
3164 break; 2746 break;
3165 2747
3166 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3167 case 'c': 2749 case 'c':
3168 mbstate.reset (); 2750 mbstate.reset ();
3169 scr_poweron (); 2751 scr_poweron ();
3170 scrollbar_show (1); 2752 scrollBar.show (1);
3171 break; 2753 break;
3172 2754
3173 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2755 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3174 case 'n': 2756 case 'n':
3175 scr_charset_choose (2); 2757 scr_charset_choose (2);
… …
3182 } 2764 }
3183} 2765}
3184/*}}} */ 2766/*}}} */
3185 2767
3186/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3187/* *INDENT-OFF* */
3188enum { 2769enum {
3189 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
3190 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3191 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3192 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3195 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3196 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3197 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3198}; 2779};
3199 2780
3200#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3201 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3202 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3203#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
3204 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3205 2786
3206const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
3207 { 2788 {
3208 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3209 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3210 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3211 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3212 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3213 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3214 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3215 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3216 }; 2797 };
3217/* *INDENT-ON* */
3218 2798
3219void 2799void ecb_hot
3220rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
3221{ 2801{
3222 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2803 unsigned int nargs, p;
3224 int n, ndef; 2804 int n, ndef;
3225 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS] = { };
3226 2806
3227 for (nargs = ESC_ARGS; nargs > 0;) 2807 nargs = 0;
3228 arg[--nargs] = 0;
3229 2808
3230 priv = 0; 2809 priv = 0;
3231 ch = cmd_getc (); 2810 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2812 {
3233 { /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
3234 priv = ch; 2814 priv = ch;
3235 ch = cmd_getc (); 2815 ch = cmd_getc ();
3236 } 2816 }
3237 2817
3238 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
3277 switch (priv) 2857 switch (priv)
3278 { 2858 {
3279 case '>': 2859 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2860 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2861 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2864 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2867 // versions.
3288 // 2868 //
3289 tt_printf ("\033[>%d;94;0c", 'U'); 2869 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2870 }
3291 break; 2871 break;
2872
3292 case '?': 2873 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2876 break;
2877
2878 case '!':
2879 if (ch == CSI_70)
2880 {
2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2882 scr_soft_reset ();
2883
2884 static const int pm_h[] = { 7, 25 };
2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2886
2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3296 } 2889 }
2890 break;
2891 }
2892
3297 return; 2893 return;
3298 } 2894 }
3299 2895
3300 switch (ch) 2896 switch (ch)
3301 { 2897 {
… …
3315 } 2911 }
3316 break; 2912 break;
3317#endif 2913#endif
3318 2914
3319 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3320 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3321 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
3322 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
3323 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3324 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3325 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
3326 break; 2922 break;
3327 2923
3328 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3329 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3421 break; 3017 break;
3422 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3423 scr_report_position (); 3019 scr_report_position ();
3424 break; 3020 break;
3425 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3022 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3024 break;
3429 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3027 break;
… …
3516 } 3112 }
3517} 3113}
3518/*}}} */ 3114/*}}} */
3519 3115
3520#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3521/* ARGSUSED */
3522void 3117void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3119{
3525 int x, y; 3120 int x, y;
3526 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
3527 Window wdummy; 3122 Window wdummy;
3528 3123
3529 dLocal (Display *, xdisp); 3124 dLocal (Display *, dpy);
3530 3125
3531 if (nargs == 0) 3126 if (nargs == 0)
3532 return; 3127 return;
3533 3128
3534 switch (args[0]) 3129 switch (args[0])
3535 { 3130 {
3536 /* 3131 /*
3537 * commands 3132 * commands
3538 */ 3133 */
3539 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3135 XMapWindow (dpy, parent);
3541 break; 3136 break;
3542 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3544 break; 3139 break;
3545 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3547 break; 3142 break;
3548 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3145 break;
3551 case 5: /* raise window */ 3146 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3147 XRaiseWindow (dpy, parent);
3553 break; 3148 break;
3554 case 6: /* lower window */ 3149 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3150 XLowerWindow (dpy, parent);
3556 break; 3151 break;
3557 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3558 scr_touch (true); 3153 scr_touch (true);
3559 break; 3154 break;
3560 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3563 break; 3158 break;
3564 3159
3565 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3566 default: 3161 default:
3567 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3569 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3570 break; 3165 break;
3571 3166
3572 /* 3167 /*
3573 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3574 */ 3169 */
3575 case 11: /* report window state */ 3170 case 11: /* report window state */
3576 XGetWindowAttributes (xdisp, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3578 break; 3173 break;
3579 case 13: /* report window position */ 3174 case 13: /* report window position */
3580 XGetWindowAttributes (xdisp, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3581 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3582 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3583 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3584 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3585 break; 3180 break;
3586 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3589 break; 3184 break;
3590 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break; 3187 break;
… …
3594 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3595 break; 3190 break;
3596 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3597 { 3192 {
3598 char *s; 3193 char *s;
3599 XGetIconName (xdisp, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s); 3196 XFree (s);
3602 } 3197 }
3603 break; 3198 break;
3604 case 21: /* report window title */ 3199 case 21: /* report window title */
3605 { 3200 {
3606 char *s; 3201 char *s;
3607 XFetchName (xdisp, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3204 XFree (s);
3610 } 3205 }
3611 break; 3206 break;
3612 } 3207 }
3613} 3208}
… …
3640 seen_esc = true; 3235 seen_esc = true;
3641 continue; 3236 continue;
3642 } 3237 }
3643 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3644 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3645 else if (ch < 0x20) 3242 else if (ch < 0x20)
3646 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3647 3244
3648 seen_esc = false; 3245 seen_esc = false;
3649 3246
3650 if (n >= STRING_MAX - 1) 3247 if (n >= STRING_MAX - 1)
3651 // stop at some sane length 3248 // stop at some sane length
3652 return NULL; 3249 return NULL;
3653 3250
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
3657 string[n++] = ch; 3251 string[n++] = ch;
3658 } 3252 }
3659 3253
3660 string[n++] = '\0'; 3254 string[n++] = '\0';
3661 3255
3662 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3670 */ 3264 */
3671void 3265void
3672rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3673{ 3267{
3674 char *s;
3675 unicode_t eh;
3676
3677 /* 3268 /*
3678 * Not handled yet 3269 * Not handled yet
3679 */ 3270 */
3271
3272 unicode_t eh;
3680 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3681 if (s) 3274 if (s)
3682 free (s); 3275 free (s);
3683 3276
3684 return; 3277 return;
3685} 3278}
… …
3689 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3690 */ 3283 */
3691void 3284void
3692rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3693{ 3286{
3694 unicode_t ch, eh;
3695 int arg; 3287 int arg;
3696 3288
3697 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3698 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3699 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3700 3292
3701 if (ch == ';') 3293 if (ch == ';')
3702 { 3294 {
3295 unicode_t eh;
3703 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3704 3297
3705 if (s) 3298 if (s)
3706 { 3299 {
3707 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3731 3324
3732/* 3325/*
3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3734 */ 3327 */
3735void 3328void
3736rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3737{ 3330{
3738 int color; 3331 int color;
3739 char *buf, *name; 3332 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3741 int saveop = op; 3334 int saveop = op;
3742 3335
3743 dLocal (Display *, xdisp); 3336 dLocal (Display *, dpy);
3744 3337
3745 assert (str != NULL); 3338 assert (str != NULL);
3339
3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3341 return;
3342
3746 switch (op) 3343 switch (op)
3747 { 3344 {
3748 case XTerm_name: 3345 case XTerm_name:
3749 set_title (str); 3346 set_title (str);
3750 /* FALLTHROUGH */ 3347 /* FALLTHROUGH */
… …
3764 unsigned long bytes_after; 3361 unsigned long bytes_after;
3765 unsigned char *value = 0; 3362 unsigned char *value = 0;
3766 const char *str = ""; 3363 const char *str = "";
3767 3364
3768 if (prop 3365 if (prop
3769 && XGetWindowProperty (xdisp, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3770 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None 3370 && actual_type != None
3774 && actual_format == 8) 3371 && actual_format == 8)
… …
3778 3375
3779 XFree (value); 3376 XFree (value);
3780 } 3377 }
3781 else 3378 else
3782 { 3379 {
3783 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3784 3381
3785 if (eq) 3382 if (eq)
3786 { 3383 {
3787 *eq = 0; 3384 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3789 } 3386 }
3790 else 3387 else
3791 XDeleteProperty (xdisp, parent[0], 3388 XDeleteProperty (dpy, parent,
3792 display->atom (str)); 3389 display->atom (str));
3793 } 3390 }
3794 break; 3391 break;
3795 3392
3796 case XTerm_Color: 3393 case XTerm_Color:
… …
3809 *buf++ = '\0'; 3406 *buf++ = '\0';
3810 3407
3811 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3812 } 3409 }
3813 break; 3410 break;
3411 case Rxvt_restoreFG:
3814 case XTerm_Color00: 3412 case XTerm_Color00:
3815 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3816 break; 3414 break;
3415 case Rxvt_restoreBG:
3817 case XTerm_Color01: 3416 case XTerm_Color01:
3818 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3819 break; 3418 break;
3820#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3821 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3826 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3827 break; 3426 break;
3828 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3829 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3830 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3831#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3832 case XTerm_Color_RV:
3833 process_color_seq (op, Color_RV, str, resp);
3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3838 break; 3441 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3842 break; 3444 break;
3843 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3844 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3845 break; 3447 break;
3846#endif 3448#endif
3847#if TRANSPARENT && TINTING 3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3848 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3849 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3850 3457
3851 check_our_parents (); 3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3852 3460
3853 if (am_transparent) 3461 if (changed)
3854 want_full_refresh = want_refresh = 1; 3462 update_background ();
3463 }
3855 3464
3856 break; 3465 break;
3857#endif 3466#endif
3858 3467
3468#if BG_IMAGE_FROM_FILE
3859 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3470 if (!strcmp (str, "?"))
3860 { 3471 {
3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale;
3478 v_scale = image_vec[0].v_scale;
3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3482
3483 sprintf (str, "[%dx%d+%d+%d]",
3484 h_scale, v_scale,
3485 h_align, v_align);
3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3487 }
3488 else
3489 {
3490 bool changed = false;
3491
3861 if (*str != ';') 3492 if (*str != ';')
3862 { 3493 {
3863#if XPM_BACKGROUND 3494 if (image_vec.size () > 0)
3864 scale_pixmap (""); /* reset to default scaling */ 3495 changed = image_vec[0].set_file_geometry (str);
3865 set_bgPixmap (str); /* change pixmap */ 3496 else
3866 scr_touch (true); 3497 {
3867#endif 3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3502 changed = true;
3503 }
3868 } 3504 }
3869 3505 else
3870 int changed = 0;
3871
3872 while ((str = strchr (str, ';')) != NULL)
3873 { 3506 {
3874 str++; 3507 str++;
3875#if XPM_BACKGROUND 3508 if (image_vec.size () > 0)
3876 changed += scale_pixmap (str); 3509 changed = image_vec[0].set_geometry (str, true);
3877#endif
3878 } 3510 }
3879 3511
3880 if (changed) 3512 if (changed)
3881 { 3513 {
3882#ifdef XPM_BACKGROUND 3514 if (bg_window_position_sensitive ())
3883 resize_pixmap (); 3515 {
3884 scr_touch (true); 3516 int x, y;
3885#endif 3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3520 update_background ();
3886 } 3521 }
3887 } 3522 }
3888 break; 3523 break;
3889 3524#endif
3890 case Rxvt_restoreFG:
3891 set_window_color (Color_fg, str);
3892 break;
3893 case Rxvt_restoreBG:
3894 set_window_color (Color_bg, str);
3895 break;
3896 3525
3897 case XTerm_logfile: 3526 case XTerm_logfile:
3898 // TODO, when secure mode? 3527 // TODO, when secure mode?
3899 break; 3528 break;
3900 3529
… …
3918 case URxvt_italicFont: 3547 case URxvt_italicFont:
3919 case URxvt_boldItalicFont: 3548 case URxvt_boldItalicFont:
3920#endif 3549#endif
3921 if (query) 3550 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop, 3551 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3552 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "", 3553 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp); 3554 resp);
3926 else 3555 else
3927 { 3556 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3557 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3942 break; 3571 break;
3943 3572
3944#if !ENABLE_MINIMAL 3573#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3574 case URxvt_locale:
3946 if (query) 3575 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3576 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 3577 else
3949 { 3578 {
3950 set_locale (str); 3579 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3580 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3581 init_xlocale ();
… …
3967 break; 3596 break;
3968#endif 3597#endif
3969 3598
3970#if ENABLE_PERL 3599#if ENABLE_PERL
3971 case URxvt_perl: 3600 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3973 ; // no responses yet
3974 break; 3602 break;
3975#endif 3603#endif
3976 } 3604 }
3977} 3605}
3978/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3985 * 's' = save 3613 * 's' = save
3986 * 'r' = restore 3614 * 'r' = restore
3987 * 't' = toggle 3615 * 't' = toggle
3988 * so no need for fancy checking 3616 * so no need for fancy checking
3989 */ 3617 */
3990int 3618int ecb_cold
3991rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3992{ 3620{
3993 int state; 3621 int state;
3994 3622
3995 if (mode == 's') 3623 if (mode == 's')
3996 { 3624 {
3997 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3998 return -1; 3629 return -1;
3999 } 3630 }
4000 else 3631 else
4001 { 3632 {
4002 if (mode == 'r') 3633 if (mode == 'r')
4003 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4004 else 3635 else
4005 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4006 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
4007 } 3642 }
4008 3643
4009 return state; 3644 return state;
4010} 3645}
4011 3646
4012/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
4013void 3648void
4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4015{ 3650{
4016 unsigned int i, j; 3651 unsigned int i, j;
4017 int state; 3652 int state;
4018 3653
4019 static const struct 3654 static const struct
4020 { 3655 {
4021 const int argval; 3656 const int argval;
4022 const unsigned long bit; 3657 const unsigned long bit;
4023 }
4024
4025 argtopriv[] = { 3658 } argtopriv[] = {
4026 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
4027 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
4028 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
4029 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
4030 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
4031 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
4032 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
4033 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
4034 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
4035 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
4036 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4037#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
4038 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
4039#endif 3673#endif
4040 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
4041 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
4042 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
4043 // 45 margin bell NYI 3678 // 45 margin bell NYI
4044 // 46 start logging 3679 // 46 start logging
4045 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
4046 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
4047#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
4048 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
4049#endif 3684#endif
4050 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
4051 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3686 { 1002, PrivMode_MouseBtnEvent },
4052 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3687 { 1003, PrivMode_MouseAnyEvent },
4053 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
4054 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4055 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
4056 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
4057 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
4058 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
4059 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
4060 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
4061 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4062 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
4063 }; 3704 };
4064 3705
4065 if (nargs == 0) 3706 if (nargs == 0)
4066 return; 3707 return;
4067 3708
… …
4074 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
4075 { 3716 {
4076 state = -1; 3717 state = -1;
4077 3718
4078 /* basic handling */ 3719 /* basic handling */
4079 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
4080 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
4081 { 3722 {
4082 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
4083 break; 3724 break;
4084 } 3725 }
… …
4092 3733
4093 scr_touch (true); 3734 scr_touch (true);
4094 break; 3735 break;
4095#endif 3736#endif
4096 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
4097 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 3739 if (mode == 0)
4100 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
4101 else if (mode == 1) 3741 else if (mode == 1)
4102 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
4103 break; 3743 break;
… …
4111 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
4112 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
4113 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
4114 * within VT52 mode 3754 * within VT52 mode
4115 */ 3755 */
4116 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
4117 break; 3757 break;
4118 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
4119 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
4120 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4121 break; 3761 break;
4122 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
4123 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
4124 break; 3764 break;
4125 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
4132 scr_autowrap (state); 3772 scr_autowrap (state);
4133 break; 3773 break;
4134 /* case 8: - auto repeat, can't do on a per window basis */ 3774 /* case 8: - auto repeat, can't do on a per window basis */
4135 case 9: /* X10 mouse reporting */ 3775 case 9: /* X10 mouse reporting */
4136 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
4137 priv_modes &= ~PrivMode_MouseX11; 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4138 break; 3778 break;
4139#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
4140 case scrollBar_esc: 3780 case scrollBar_esc:
4141 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
4142 {
4143 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
4144 scr_touch (true); 3783 scr_touch (true);
4145 }
4146 break; 3784 break;
4147#endif 3785#endif
4148 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
4149 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
4150 break; 3788 break;
… …
4155 break; 3793 break;
4156 /* case 66: - application key pad */ 3794 /* case 66: - application key pad */
4157 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
4158 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
4159 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX10; 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3799 break;
4162#if 0
4163 case 1001: 3800 case 1002:
4164 break; /* X11 mouse highlighting */ 3801 case 1003:
4165#endif 3802 if (state)
3803 {
3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3807 vt_emask_mouse = PointerMotionMask;
3808 }
3809 else
3810 vt_emask_mouse = NoEventMask;
3811
3812 vt_select_input ();
3813 break;
4166 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
4167 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
4168 break; 3816 break;
4169 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
4171 break; 3819 break;
4172 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3822 if (!state)
4175 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
4176 scr_change_screen (state); 3825 scr_change_screen (state);
4177 break; 3826 break;
4178 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
4179 scr_change_screen (state); 3832 scr_change_screen (state);
3833
4180 if (OPTION (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 3835 if (state)
4182 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
4183 break; 3839 break;
4184 default: 3840 default:
4185 break; 3841 break;
4186 } 3842 }
4187 } 3843 }
4188} 3844}
4189/*}}} */ 3845/*}}} */
4190 3846
4191/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
4192void 3848void ecb_hot
4193rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4194{ 3850{
4195 unsigned int i; 3851 unsigned int i;
4196 short rendset; 3852 short rendset;
4197 int rendstyle; 3853 int rendstyle;
… …
4340 } 3996 }
4341 } 3997 }
4342} 3998}
4343/*}}} */ 3999/*}}} */
4344 4000
4345/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4346void
4347rxvt_term::process_graphics ()
4348{
4349 unicode_t ch, cmd = cmd_getc ();
4350
4351 if (cmd == 'Q')
4352 { /* query graphics */
4353 tt_printf ("\033G0\012"); /* no graphics */
4354 return;
4355 }
4356 /* swallow other graphics sequences until terminating ':' */
4357 do
4358 ch = cmd_getc ();
4359 while (ch != ':');
4360}
4361/*}}} */
4362
4363/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4364 4002
4365/* 4003/*
4366 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4367 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4380 4018
4381/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
4382/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
4383 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
4384 */ 4022 */
4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4386 4024
4387void 4025void
4388rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
4389{ 4027{
4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4395 4033
4396 if (v_buflen == 0) 4034 if (v_buflen == 0)
4397 { 4035 {
4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4399 4037
4038 max_it (written, 0);
4039
4400 if ((unsigned int)written == len) 4040 if (written == len)
4401 return; 4041 return;
4402 4042
4403 data += written; 4043 data += written;
4404 len -= written; 4044 len -= written;
4405 } 4045 }
4406 4046
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4408 4048
4409 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len; 4050 v_buflen += len;
4411 4051
4412 pty_ev.set (EVENT_READ | EVENT_WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);
4413} 4053}
4414 4054
4415void rxvt_term::pty_write () 4055void rxvt_term::pty_write ()
4416{ 4056{
4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4057 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4422 4062
4423 if (v_buflen == 0) 4063 if (v_buflen == 0)
4424 { 4064 {
4425 free (v_buffer); 4065 free (v_buffer);
4426 v_buffer = 0; 4066 v_buffer = 0;
4427 v_buflen = 0;
4428 4067
4429 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4430 return; 4069 return;
4431 } 4070 }
4432 4071
4433 memmove (v_buffer, v_buffer + written, v_buflen); 4072 memmove (v_buffer, v_buffer + written, v_buflen);
4434 } 4073 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4074 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ); 4075 pty_ev.set (ev::READ);
4437} 4076}
4438 4077
4439/*----------------------- end-of-file (C source) -----------------------*/ 4078/*----------------------- end-of-file (C source) -----------------------*/
4440 4079

Diff Legend

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