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.313 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

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

Diff Legend

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