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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.517 by root, Wed Jun 6 08:59:13 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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
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, int y2)
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);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
376 param = 5; 383 param = 5;
377 break; 384 break;
378 case XK_Next: 385 case XK_Next:
379 param = 6; 386 param = 6;
380 break; 387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
381#endif 394#endif
382 case XK_Help: 395 case XK_Help:
383 param = 28; 396 param = 28;
384 break; 397 break;
385 case XK_Menu: 398 case XK_Menu:
… …
387 break; 400 break;
388 } 401 }
389 return param; 402 return param;
390} 403}
391 404
392void 405void ecb_cold
393rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
394{ 407{
395 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
396 KeySym keysym; 409 KeySym keysym;
397 int valid_keysym; 410 int valid_keysym;
… …
410 */ 423 */
411 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
412 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
413 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
414 427
415 if (numlock_state || (ev.state & ModNumLockMask))
416 {
417 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP);
419 }
420
421 kbuf[0] = 0; 428 kbuf[0] = 0;
422 429
423#ifdef USE_XIM 430#if USE_XIM
424 if (Input_Context) 431 if (Input_Context)
425 { 432 {
426 Status status_return; 433 Status status_return;
427 434
428#if 0 435#if 0
… …
499#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
500 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
501#else 508#else
502 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
503#endif 510#endif
511 max_it (lnsppg, 1);
512
504 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
505 { 514 {
506 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
507 return; 516 return;
508 } 517 }
… …
561 selection_request (ev.time); 570 selection_request (ev.time);
562 return; 571 return;
563#if TODO 572#if TODO
564 /* rxvt extras */ 573 /* rxvt extras */
565 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
566 change_font (FONT_UP);
567 return; 575 return;
568 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
569 change_font (FONT_DN);
570 return; 577 return;
571#endif 578#endif
572 } 579 }
573 } 580 }
574 } 581 }
575 582
576#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 584 // ISO 14755 support
578 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 586 {
580 int hv; 587 int hv;
581 588
582 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
613 scr_overlay_off (); 620 scr_overlay_off ();
614# endif 621# endif
615 iso14755buf = 0; 622 iso14755buf = 0;
616 } 623 }
617 } 624 }
625 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
621 { 629 {
622 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 631# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
635 } 643 }
636#endif 644#endif
637 645
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 647 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 649 unsigned int newlen = 1;
642 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
643 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
644 { 772 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 773 int param = map_function_key (keysym);
768 if (param > 0) 774 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 775 sprintf (kbuf,"\033[%d~", param);
770 else 776 else
771 newlen = 0; 777 newlen = 0;
772 }
773 break;
774 } 778 }
779 break;
780 }
775 781
776 if (newlen) 782 if (newlen)
777 len = strlen (kbuf); 783 len = strlen (kbuf);
778 784
785 if (len > 0)
786 {
779 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
780 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
781 */ 801 */
782#ifdef META8_OPTION 802#ifdef META8_OPTION
783 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
784 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
785#endif 805#endif
806 }
786 807
787 } 808 }
788 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
789 { 810 {
790 len = 1; 811 len = 1;
… …
824 { 845 {
825 view_start = 0; 846 view_start = 0;
826 want_refresh = 1; 847 want_refresh = 1;
827 } 848 }
828 849
829 /*
830 * these modifications only affect the static keybuffer
831 * pass Shift/Control indicators for function keys ending with `~'
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */ 850 /* escape prefix */
844 if (meta 851 if (meta
845#ifdef META8_OPTION 852#ifdef META8_OPTION
846 && meta_char == C0_ESC 853 && meta_char == C0_ESC
847#endif 854#endif
… …
852 } 859 }
853 860
854 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
855} 862}
856 863
857void 864void ecb_cold
858rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
859{ 866{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym; 868 KeySym keysym;
862 869
… …
882 commit_iso14755 (); 889 commit_iso14755 ();
883 890
884 return; 891 return;
885 } 892 }
886 893
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 895 if (i[0] == keysym)
889 { 896 {
890 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 898 commit_iso14755 ();
892 899
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
931#endif 938#endif
932} 939}
933 940
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 941void
968rxvt_term::flush () 942rxvt_term::flush ()
969{ 943{
970 flush_ev.stop (); 944 flush_ev.stop ();
971 945
972#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
974 { 948 {
975// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 950 scr_touch (false);
977 } 951 }
978#endif 952#endif
979 953
980 if (want_refresh) 954 if (want_refresh)
… …
1016 } 990 }
1017 while (row < end_row); 991 while (row < end_row);
1018 } 992 }
1019 993
1020 scr_refresh (); 994 scr_refresh ();
1021 scrollbar_show (1); 995 scrollBar.show (1);
1022#ifdef USE_XIM 996#if USE_XIM
1023 IMSendSpot (); 997 im_send_spot ();
1024#endif 998#endif
1025 } 999 }
1026 1000
1027 display->flush (); 1001 display->flush ();
1028} 1002}
1029 1003
1030/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1031void 1005void
1032rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1033{ 1007{
1034 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1045 refresh_count = 0; 1019 refresh_count = 0;
1046 flush (); 1020 flush ();
1047} 1021}
1048 1022
1049#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1050void 1039void
1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052{ 1041{
1053 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1054 want_refresh = 1; 1043 want_refresh = 1;
… …
1073 1062
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1064void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1066{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1069 {
1081 want_refresh = 1; 1070 want_refresh = 1;
1082 refresh_check (); 1071 refresh_check ();
1083 } 1072 }
1084 else 1073 else
… …
1128 { 1117 {
1129 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1133 1125
1134 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1136 1128
1137 w.stop (); 1129 w.stop ();
1138 } 1130 }
1139 1131
… …
1142 { 1134 {
1143 } 1135 }
1144} event_handler; 1136} event_handler;
1145#endif 1137#endif
1146 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1147bool 1172bool
1148rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1149{ 1174{
1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1151 1176
1152 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1153 { 1178
1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1155 n = 0;
1156 } 1180 {
1157 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1159 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1160 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1161 1186
1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1163 1188
1164 if (r > 0) 1189 if (r > 0)
1165 { 1190 {
1166 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1167 return true; 1192 return true;
… …
1189{ 1214{
1190 make_current (); 1215 make_current ();
1191 1216
1192 if (revents & ev::READ) 1217 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1220 cmd_parse ();
1196 break;
1197 1221
1198 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1199 pty_write (); 1223 pty_write ();
1200 1224
1201 refresh_check (); 1225 refresh_check ();
1202} 1226}
1203 1227
1204void 1228void ecb_cold
1205rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1206{ 1230{
1207 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1208 recolour_cursor (); 1232 recolour_cursor ();
1209 1233
… …
1214 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1215#endif 1239#endif
1216} 1240}
1217 1241
1218#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1219void 1243void ecb_cold
1220rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1221{ 1245{
1222 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1223 return; 1247 return;
1224 1248
… …
1226 XFlush (dpy); 1250 XFlush (dpy);
1227 1251
1228 hidden_pointer = 1; 1252 hidden_pointer = 1;
1229} 1253}
1230 1254
1231void 1255void ecb_cold
1232rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1233{ 1257{
1234 make_current (); 1258 make_current ();
1235 1259
1236 pointer_blank (); 1260 pointer_blank ();
… …
1242{ 1266{
1243 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1244 int x, y; 1268 int x, y;
1245 int code = 32; 1269 int code = 32;
1246 1270
1247 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1248 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1249 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1250 { 1275 {
1251 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1252 return; 1277 return;
1278
1253 mouse_row = x; 1279 mouse_row = x;
1254 mouse_col = y; 1280 mouse_col = y;
1255 code += 32; 1281 code += 32;
1256 } 1282 }
1257 1283
… …
1260 else 1286 else
1261 { 1287 {
1262 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1263 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1264 if (button_number >= 3) 1290 if (button_number >= 3)
1265 button_number += (64 - 3); 1291 button_number += 64 - 3;
1266 } 1292 }
1267 1293
1268 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1269 { 1295 {
1270 /* 1296 /*
… …
1302 fputc ('A', stderr); 1328 fputc ('A', stderr);
1303 if (key_state & 32) 1329 if (key_state & 32)
1304 fputc ('2', stderr); 1330 fputc ('2', stderr);
1305 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1306 button_number, 1332 button_number,
1307 x + 1, 1333 x,
1308 y + 1); 1334 y);
1309#endif 1335#endif
1310 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1311 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1312 (code + button_number + key_state), 1351 code + button_number + key_state,
1313 (32 + x + 1), 1352 32 + x,
1314 (32 + y + 1)); 1353 32 + y);
1315} 1354}
1316 1355
1317/*{{{ process an X event */ 1356/*{{{ process an X event */
1318void 1357void ecb_hot
1319rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1320{ 1359{
1321 make_current (); 1360 make_current ();
1322 1361
1323 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1421 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1422 focus_out (); 1461 focus_out ();
1423 break; 1462 break;
1424 1463
1425 case ConfigureNotify: 1464 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1429 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1430 { 1466 {
1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472#ifdef HAVE_BG_PIXMAP
1473 if (bg_window_position_sensitive ())
1474 want_position_change = true;
1475#endif
1476
1477 bool moved = false;
1478
1479 if (want_position_change)
1480 {
1481 int x, y;
1482
1483 if (ev.xconfigure.send_event)
1484 {
1485 x = ev.xconfigure.x;
1486 y = ev.xconfigure.y;
1487 }
1488 else
1489 get_window_origin (x, y);
1490
1491 if (x != parent_x || y != parent_y)
1492 {
1493 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1494 parent_x = x;
1495 parent_y = y;
1496 }
1497
1498 if (bg_set_position (x, y)
1499 || !(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 }
1433 1502
1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1435 { 1504 {
1436 seen_resize = 1; 1505 seen_resize = 1;
1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1438 } 1507 }
1439 else 1508 else
1440 { 1509 {
1441#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped) 1511 if (moved)
1445 update_background (); 1512 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif 1513#endif
1450 } 1514 }
1451 1515
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1517 }
1454 break; 1518 break;
1455 1519
1456 case PropertyNotify: 1520 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1522 break;
1463 1523
1464 case SelectionClear: 1524 case SelectionClear:
1465 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1526 break;
1472 1527
1473 case SelectionRequest: 1528 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1475 break; 1530 break;
1476 1531
1477 case MapNotify: 1532 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a 1534 /* This is needed specifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first 1535 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1483 * reparenting. 1538 * reparenting.
1484 * We should not render background immidiately, as there could be several 1539 * We should not render background immediately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short 1541 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive. 1542 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all 1543 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results. 1544 * of ConfigureNotifys for the best results.
1490 */ 1545 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1546 if (!(bg_flags & BG_IS_VALID))
1492 update_background_ev.start (0.025); 1547 update_background_ev.start (0.025);
1493#endif 1548#endif
1494 mapped = 1; 1549 mapped = 1;
1495#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1496 text_blink_ev.start (); 1551 text_blink_ev.start ();
… …
1511 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1512 { 1567 {
1513 do 1568 do
1514 { 1569 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1517 } 1572 }
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1519 1574
1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1521 1576
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 { 1578 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1581 }
1527 1582
1528 want_refresh = 1; 1583 want_refresh = 1;
1529 } 1584 }
1530 else 1585 else
… …
1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1537 ; 1592 ;
1538 1593
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1595 {
1541 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1542 scrollbar_show (0); 1597 scrollBar.show (0);
1543 } 1598 }
1544 } 1599 }
1545 break; 1600 break;
1546 1601
1547 case MotionNotify: 1602 case MotionNotify:
… …
1612 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1613 } 1668 }
1614 else 1669 else
1615 { 1670 {
1616 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1617 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1618 } 1673 }
1619 1674
1620 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1621 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1622 + 1; 1677 + 1;
… …
1634#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1635 } 1690 }
1636#endif 1691#endif
1637 } 1692 }
1638 } 1693 }
1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1640 { 1695 {
1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1642 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1643 ; 1698 ;
1644 1699
1645 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1646 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1704 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1706 scrollBar.size ());
1652 want_refresh = 1; 1707 want_refresh = 1;
1653 scrollbar_show (1); 1708 scrollBar.show (1);
1654 } 1709 }
1655 break; 1710 break;
1656 } 1711 }
1657 1712
1658#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1668 }
1669#endif 1716#endif
1670 1717
1671#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 { 1720 {
… …
1683#endif 1730#endif
1684 1731
1685 refresh_check (); 1732 refresh_check ();
1686} 1733}
1687 1734
1688void 1735#if ENABLE_FRILLS
1736void ecb_cold
1737rxvt_term::set_urgency (bool enable)
1738{
1739 if (enable == urgency_hint)
1740 return;
1741
1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1743 {
1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1745 XSetWMHints (dpy, parent, h);
1746 urgency_hint = enable;
1747 XFree (h);
1748 }
1749}
1750#endif
1751
1752void ecb_cold
1689rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1690{ 1754{
1691 if (!focus) 1755 if (!focus)
1692 { 1756 {
1693 focus = 1; 1757 focus = 1;
1694 want_refresh = 1; 1758 want_refresh = 1;
1695 1759
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1698#if USE_XIM 1760#if USE_XIM
1699 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1700 { 1762 {
1701 IMSetPosition (); 1763 im_set_position ();
1702 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1703 } 1765 }
1704#endif 1766#endif
1705#if CURSOR_BLINK 1767#if CURSOR_BLINK
1706 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1713 scr_recolour (); 1775 scr_recolour ();
1714 } 1776 }
1715#endif 1777#endif
1716#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1718 { 1780 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1781#endif
1726 }
1727}
1728 1782
1729void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1730rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1731{ 1789{
1732 if (focus) 1790 if (focus)
1733 { 1791 {
1734 focus = 0; 1792 focus = 0;
1735 want_refresh = 1; 1793 want_refresh = 1;
1736 1794
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1738 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1739#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1800 if (iso14755buf)
1741 { 1801 {
1742 iso14755buf = 0; 1802 iso14755buf = 0;
1743# if ISO_14755 1803# if ISO_14755
… …
1760 { 1820 {
1761 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1822 scr_recolour ();
1763 } 1823 }
1764#endif 1824#endif
1765 }
1766}
1767 1825
1768void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1769rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1770{ 1832{
1771#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1773 { 1835 {
… …
1777 } 1839 }
1778#endif 1840#endif
1779} 1841}
1780 1842
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1782void 1844void ecb_hot
1783rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1784{ 1846{
1785 make_current (); 1847 make_current ();
1786 1848
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return; 1851 return;
1790 1852
1791# if ENABLE_TRANSPARENCY
1792 switch (ev.type) 1853 switch (ev.type)
1793 { 1854 {
1794 case PropertyNotify: 1855 case PropertyNotify:
1795 /* 1856 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1797 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1798 */ 1859 */
1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 { 1862 {
1863# if ENABLE_TRANSPARENCY
1802 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1803 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1804 } 1870 }
1805 1871
1806 break; 1872 break;
1807 } 1873 }
1808# endif
1809 1874
1810 refresh_check (); 1875 refresh_check ();
1811} 1876}
1812#endif 1877#endif
1813 1878
… …
1846 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1847 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1848#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1849 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1850 { 1915 {
1851 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1852 MEvent.clicks++; 1917 MEvent.clicks++;
1853 1918
1854 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1855 { 1920 {
1856 /* only report double clicks */ 1921 /* only report double clicks */
… …
1937 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */ 2003 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */ 2005 direction = DN; /* down */
1941 2006
1942 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1943 /* 2008 /*
1944 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1945 * move up if mouse is above slider 2010 * move up if mouse is above slider
1946 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1947 * 2012 *
… …
1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1987#endif 2052#endif
1988 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
1989 { 2054 {
1990 if (direction == UP) 2055 if (direction == UP)
1991 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
1992 else 2057 else
1993 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
1994 } 2059 }
1995 } 2060 }
1996 else 2061 else
1997 switch (ev.button) 2062 switch (ev.button)
1998 { 2063 {
1999 case Button2: 2064 case Button2:
2000 switch (scrollBar.align) 2065 switch (scrollBar.align)
2001 { 2066 {
2002 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2003 csrO = 0; 2068 csrO = 0;
2004 break; 2069 break;
2005 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2006 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2007 break; 2072 break;
2008 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2009 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2010 break; 2075 break;
2011 } 2076 }
2012 2077
2013 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2014 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2017 2082
2018 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2019 break; 2084 break;
2020 2085
2021 case Button1: 2086 case Button1:
2022 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2023 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2024 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2025 2090
2026 case Button3: 2091 case Button3:
2027 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2028 { 2093 {
2029 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2030# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2031 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2032# else 2097# else
2033 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2034# endif 2099# endif
2035 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2037 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2038# else 2103# else
2039 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2040# endif 2105# endif
2041 else 2106 else
2042 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2043 } 2108 }
2044 else 2109 else
2045 { 2110 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2112 (nrow
2048 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2049 / scrollbar_size ())); 2114 / scrollBar.size ()));
2050 } 2115 }
2051 2116
2052 break; 2117 break;
2053 } 2118 }
2054 } 2119 }
… …
2064 2129
2065 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2066 if (!bypass_keystate) 2131 if (!bypass_keystate)
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2133
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2070 { 2135 {
2071 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2072 scrollbar_show (0); 2137 scrollBar.show (0);
2073 } 2138 }
2074 2139
2075#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2077#endif 2142#endif
… …
2126 case Button3: 2191 case Button3:
2127 selection_make (ev.time); 2192 selection_make (ev.time);
2128 break; 2193 break;
2129 2194
2130 case Button2: 2195 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2198 break;
2134 2199
2135#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2136 case Button4: 2201 case Button4:
2137 case Button5: 2202 case Button5:
… …
2160 } 2225 }
2161 else 2226 else
2162# endif 2227# endif
2163 { 2228 {
2164 scr_page (v, i); 2229 scr_page (v, i);
2165 scrollbar_show (1); 2230 scrollBar.show (1);
2166 } 2231 }
2167 } 2232 }
2168 break; 2233 break;
2169#endif 2234#endif
2170 } 2235 }
2171 } 2236 }
2172} 2237}
2173 2238
2174/*}}} */ 2239/*}}} */
2175 2240
2176bool 2241void ecb_hot
2177rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2178{ 2243{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2182 2246
2183 for (;;) 2247 for (;;)
2184 { 2248 {
2185 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2186 { 2250 {
2187 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2252 ch = next_char ();
2189 2253
2190 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2191 break; 2255 break;
2192 } 2256 }
2193 2257
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2259 {
2196 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2197 { 2261 {
2198 seen_input = 1; 2262 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2278 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2280
2217 for (;;) 2281 for (;;)
2218 { 2282 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2284 break;
2221 2285
2222 *str++ = ch; 2286 *str++ = ch;
2223 2287
2224 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2289 {
2226 if (ch == C0_LF) 2290 if (ch == C0_LF)
2227 nlines++; 2291 nlines++;
2228 2292
2229 refresh_count++; 2293 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2342 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2280 */ 2344 */
2281 if (refreshnow) 2345 if (refreshnow)
2282 { 2346 {
2283 flag = true;
2284 scr_refresh (); 2347 scr_refresh ();
2285 want_refresh = 1; 2348 want_refresh = 1;
2286 } 2349 }
2287
2288 } 2350 }
2289 else 2351 else
2290 { 2352 {
2291 try 2353 try
2292 { 2354 {
… …
2300 } 2362 }
2301 2363
2302 ch = NOCHAR; 2364 ch = NOCHAR;
2303 } 2365 }
2304 } 2366 }
2305
2306 return flag;
2307} 2367}
2308 2368
2309// read the next character 2369// read the next character
2310wchar_t 2370wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2312{ 2372{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2374 {
2315 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2318 2378
2319 wchar_t wc; 2379 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2381
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2386 break;
2327 } 2387 }
2328 2388
2329 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2331 2394
2332 // assume wchar == unicode 2395 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2335 } 2398 }
2336 2399
2337 return NOCHAR; 2400 return NOCHAR;
2338} 2401}
2339 2402
2340// read the next octet 2403// read the next octet
2341uint32_t 2404uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () NOTHROW
2343{ 2406{
2344 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2409 : NOCHAR;
2347} 2410}
2348 2411
2349static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2350 2413
2351/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2416{
2359 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2360 2418
2361 if (c == NOCHAR) 2419 if (c == NOCHAR)
2362 throw out_of_input; 2420 throw out_of_input;
2363 2421
2364 return c; 2422 return c;
2365} 2423}
2366 2424
2367uint32_t 2425uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2427{
2370 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2371 2429
2372 if (c == NOCHAR) 2430 if (c == NOCHAR)
… …
2376} 2434}
2377 2435
2378/*{{{ print pipe */ 2436/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2381FILE * 2439FILE * ecb_cold
2382rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2383{ 2441{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2443
2386 if (stream == NULL) 2444 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2446
2389 return stream; 2447 return stream;
2390} 2448}
2391 2449
2392int 2450int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2394{ 2452{
2395 fflush (stream); 2453 fflush (stream);
2396 return pclose (stream); 2454 return pclose (stream);
2397} 2455}
2398 2456
2399/* 2457/*
2400 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2401 */ 2459 */
2402void 2460void ecb_cold
2403rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2404{ 2462{
2405 int done; 2463 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2464
2408 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2409 return; 2466 return;
2410 2467
2411 /* 2468 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2470 * is received.
2414 */ 2471 */
2415 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2416 { 2473 {
2417 unsigned char buf[8]; 2474 unsigned char buf[8];
2418 unicode_t ch; 2475 unicode_t ch;
2419 unsigned int i, len; 2476 unsigned int i, len;
2420 2477
… …
2454 pclose_printer (fd); 2511 pclose_printer (fd);
2455} 2512}
2456#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2457/*}}} */ 2514/*}}} */
2458 2515
2459/* *INDENT-OFF* */
2460enum { 2516enum {
2461 C1_40 = 0x40, 2517 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2522};
2467/* *INDENT-ON* */
2468 2523
2469/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2470void 2525void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2527{
2473 switch (ch) 2528 switch (ch)
2474 { 2529 {
2475 case C0_ESC: 2530 case C0_ESC:
… …
2521} 2576}
2522/*}}} */ 2577/*}}} */
2523 2578
2524 2579
2525/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2526void 2581void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2583{
2529 int row, col; 2584 int row, col;
2530 2585
2531 switch (ch) 2586 switch (ch)
… …
2565 break; 2620 break;
2566 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2623 break;
2569 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2571 break; 2626 break;
2572 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2574 /* unimplemented */ 2629 /* unimplemented */
2575 break; 2630 break;
… …
2581} 2636}
2582/*}}} */ 2637/*}}} */
2583 2638
2584 2639
2585/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2586void 2641void ecb_hot
2587rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2588{ 2643{
2589 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2590 2645
2591 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2649 return;
2595 } 2650 }
2596 2651
2597 switch (ch) 2652 switch (ch)
2598 { 2653 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2654 case '#':
2601 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2602 scr_E (); 2656 scr_E ();
2603 break; 2657 break;
2604 case '(': 2658 case '(':
… …
2627#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2628 case '9': 2682 case '9':
2629 scr_forwardindex (); 2683 scr_forwardindex ();
2630 break; 2684 break;
2631#endif 2685#endif
2686 // DECPAM/DECPNM
2632 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2633 case '>': 2690 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
2635 break; 2692 break;
2636 2693
2637 case C1_40: 2694 case C1_40:
2638 cmd_getc (); 2695 cmd_getc ();
2639 break; 2696 break;
… …
2643 2700
2644 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2646 { 2703 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2706 }
2650 break; 2707 break;
2651 2708
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2709 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2710 case C1_ESA: /* ESC G */
2654 process_graphics (); 2711 // used by original rxvt for rob nations own graphics mode
2712 if (cmd_getc () == 'Q')
2713 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2714 break;
2656 2715
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2718 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2664 scr_index (DN); 2723 scr_index (DN);
2665 break; 2724 break;
2666 2725
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2669 2728
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2672 2731
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2734 process_dcs_seq ();
2676 break; 2735 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2682 2741
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2744 process_csi_seq ();
2686 break; 2745 break;
2687 2746
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2749 process_osc_seq ();
2691 break; 2750 break;
2692 2751
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2753 case 'c':
2695 mbstate.reset (); 2754 mbstate.reset ();
2696 scr_poweron (); 2755 scr_poweron ();
2697 scrollbar_show (1); 2756 scrollBar.show (1);
2698 break; 2757 break;
2699 2758
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2760 case 'n':
2702 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
2709 } 2768 }
2710} 2769}
2711/*}}} */ 2770/*}}} */
2712 2771
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2773enum {
2716 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2776 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2777 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2780 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2781 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2783};
2726 2784
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2790
2733const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2734 { 2792 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2794 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2795 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2796 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2797 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2801 };
2744/* *INDENT-ON* */
2745 2802
2746void 2803void ecb_hot
2747rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2748{ 2805{
2749 unicode_t ch, priv, i; 2806 unicode_t ch, priv, i;
2750 unsigned int nargs, p; 2807 unsigned int nargs, p;
2751 int n, ndef; 2808 int n, ndef;
… …
2753 2810
2754 nargs = 0; 2811 nargs = 0;
2755 2812
2756 priv = 0; 2813 priv = 0;
2757 ch = cmd_getc (); 2814 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2816 {
2760 /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2818 priv = ch;
2762 ch = cmd_getc (); 2819 ch = cmd_getc ();
2763 } 2820 }
2764 2821
2765 /* read any numerical arguments */ 2822 /* read any numerical arguments */
… …
2819 2876
2820 case '?': 2877 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2824 } 2893 }
2894 break;
2895 }
2896
2825 return; 2897 return;
2826 } 2898 }
2827 2899
2828 switch (ch) 2900 switch (ch)
2829 { 2901 {
… …
2843 } 2915 }
2844 break; 2916 break;
2845#endif 2917#endif
2846 2918
2847 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2848 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2849 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2850 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2851 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2852 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2853 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2854 break; 2926 break;
2855 2927
2856 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2857 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3044 } 3116 }
3045} 3117}
3046/*}}} */ 3118/*}}} */
3047 3119
3048#if !ENABLE_MINIMAL 3120#if !ENABLE_MINIMAL
3049/* ARGSUSED */
3050void 3121void
3051rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3122rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3052{ 3123{
3053 int x, y; 3124 int x, y;
3054 XWindowAttributes wattr; 3125 XWindowAttributes wattr;
… …
3063 { 3134 {
3064 /* 3135 /*
3065 * commands 3136 * commands
3066 */ 3137 */
3067 case 1: /* deiconify window */ 3138 case 1: /* deiconify window */
3068 XMapWindow (dpy, parent[0]); 3139 XMapWindow (dpy, parent);
3069 break; 3140 break;
3070 case 2: /* iconify window */ 3141 case 2: /* iconify window */
3071 XIconifyWindow (dpy, parent[0], display->screen); 3142 XIconifyWindow (dpy, parent, display->screen);
3072 break; 3143 break;
3073 case 3: /* set position (pixels) */ 3144 case 3: /* set position (pixels) */
3074 XMoveWindow (dpy, parent[0], args[1], args[2]); 3145 XMoveWindow (dpy, parent, args[1], args[2]);
3075 break; 3146 break;
3076 case 4: /* set size (pixels) */ 3147 case 4: /* set size (pixels) */
3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3148 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3078 break; 3149 break;
3079 case 5: /* raise window */ 3150 case 5: /* raise window */
3080 XRaiseWindow (dpy, parent[0]); 3151 XRaiseWindow (dpy, parent);
3081 break; 3152 break;
3082 case 6: /* lower window */ 3153 case 6: /* lower window */
3083 XLowerWindow (dpy, parent[0]); 3154 XLowerWindow (dpy, parent);
3084 break; 3155 break;
3085 case 7: /* refresh window */ 3156 case 7: /* refresh window */
3086 scr_touch (true); 3157 scr_touch (true);
3087 break; 3158 break;
3088 case 8: /* set size (chars) */ 3159 case 8: /* set size (chars) */
… …
3091 break; 3162 break;
3092 3163
3093 //case 9: NYI, TODO, restore maximized window or maximize window 3164 //case 9: NYI, TODO, restore maximized window or maximize window
3094 default: 3165 default:
3095 if (args[0] >= 24) /* set height (chars) */ 3166 if (args[0] >= 24) /* set height (chars) */
3096 set_widthheight ((unsigned int)width, 3167 set_widthheight ((unsigned int)vt_width,
3097 (unsigned int) (args[1] * fheight)); 3168 (unsigned int) (args[1] * fheight));
3098 break; 3169 break;
3099 3170
3100 /* 3171 /*
3101 * reports - some output format copied from XTerm 3172 * reports - some output format copied from XTerm
3102 */ 3173 */
3103 case 11: /* report window state */ 3174 case 11: /* report window state */
3104 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3176 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3106 break; 3177 break;
3107 case 13: /* report window position */ 3178 case 13: /* report window position */
3108 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3109 XTranslateCoordinates (dpy, parent[0], wattr.root, 3180 XTranslateCoordinates (dpy, parent, wattr.root,
3110 -wattr.border_width, -wattr.border_width, 3181 -wattr.border_width, -wattr.border_width,
3111 &x, &y, &wdummy); 3182 &x, &y, &wdummy);
3112 tt_printf ("\033[3;%d;%dt", x, y); 3183 tt_printf ("\033[3;%d;%dt", x, y);
3113 break; 3184 break;
3114 case 14: /* report window size (pixels) */ 3185 case 14: /* report window size (pixels) */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3186 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3187 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3117 break; 3188 break;
3118 case 18: /* report text area size (chars) */ 3189 case 18: /* report text area size (chars) */
3119 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3120 break; 3191 break;
… …
3122 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3193 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3123 break; 3194 break;
3124 case 20: /* report icon label */ 3195 case 20: /* report icon label */
3125 { 3196 {
3126 char *s; 3197 char *s;
3127 XGetIconName (dpy, parent[0], &s); 3198 XGetIconName (dpy, parent, &s);
3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3199 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3129 XFree (s); 3200 XFree (s);
3130 } 3201 }
3131 break; 3202 break;
3132 case 21: /* report window title */ 3203 case 21: /* report window title */
3133 { 3204 {
3134 char *s; 3205 char *s;
3135 XFetchName (dpy, parent[0], &s); 3206 XFetchName (dpy, parent, &s);
3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3207 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3137 XFree (s); 3208 XFree (s);
3138 } 3209 }
3139 break; 3210 break;
3140 } 3211 }
… …
3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3267 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3197 */ 3268 */
3198void 3269void
3199rxvt_term::process_dcs_seq () 3270rxvt_term::process_dcs_seq ()
3200{ 3271{
3201 char *s;
3202 unicode_t eh;
3203
3204 /* 3272 /*
3205 * Not handled yet 3273 * Not handled yet
3206 */ 3274 */
3275
3276 unicode_t eh;
3207 s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3208 if (s) 3278 if (s)
3209 free (s); 3279 free (s);
3210 3280
3211 return; 3281 return;
3212} 3282}
… …
3216 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3286 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3217 */ 3287 */
3218void 3288void
3219rxvt_term::process_osc_seq () 3289rxvt_term::process_osc_seq ()
3220{ 3290{
3221 unicode_t ch, eh;
3222 int arg; 3291 int arg;
3223 3292
3224 ch = cmd_getc (); 3293 unicode_t ch = cmd_getc ();
3225 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3294 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226 arg = arg * 10 + (ch - '0'); 3295 arg = arg * 10 + (ch - '0');
3227 3296
3228 if (ch == ';') 3297 if (ch == ';')
3229 { 3298 {
3299 unicode_t eh;
3230 char *s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3231 3301
3232 if (s) 3302 if (s)
3233 { 3303 {
3234 process_xterm_seq (arg, s, eh); 3304 process_xterm_seq (arg, s, eh);
… …
3258 3328
3259/* 3329/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3330 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3331 */
3262void 3332void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3333rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3334{
3265 int color; 3335 int color;
3266 char *buf, *name; 3336 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3337 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3338 int saveop = op;
… …
3295 unsigned long bytes_after; 3365 unsigned long bytes_after;
3296 unsigned char *value = 0; 3366 unsigned char *value = 0;
3297 const char *str = ""; 3367 const char *str = "";
3298 3368
3299 if (prop 3369 if (prop
3300 && XGetWindowProperty (dpy, parent[0], 3370 && XGetWindowProperty (dpy, parent,
3301 prop, 0, 1<<16, 0, AnyPropertyType, 3371 prop, 0, 1<<16, 0, AnyPropertyType,
3302 &actual_type, &actual_format, 3372 &actual_type, &actual_format,
3303 &nitems, &bytes_after, &value) == Success 3373 &nitems, &bytes_after, &value) == Success
3304 && actual_type != None 3374 && actual_type != None
3305 && actual_format == 8) 3375 && actual_format == 8)
… …
3309 3379
3310 XFree (value); 3380 XFree (value);
3311 } 3381 }
3312 else 3382 else
3313 { 3383 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3384 char *eq = strchr (str, '=');
3315 3385
3316 if (eq) 3386 if (eq)
3317 { 3387 {
3318 *eq = 0; 3388 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3389 set_utf8_property (display->atom (str), eq + 1);
3320 } 3390 }
3321 else 3391 else
3322 XDeleteProperty (dpy, parent[0], 3392 XDeleteProperty (dpy, parent,
3323 display->atom (str)); 3393 display->atom (str));
3324 } 3394 }
3325 break; 3395 break;
3326 3396
3327 case XTerm_Color: 3397 case XTerm_Color:
… …
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3429 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3430 break;
3361 case XTerm_Color_pointer_bg: 3431 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3432 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3433 break;
3434#ifdef OPTION_HC
3435 case XTerm_Color_HC:
3436 process_color_seq (op, Color_HC, str, resp);
3437 break;
3438 case XTerm_Color_HTC:
3439 process_color_seq (op, Color_HTC, str, resp);
3440 break;
3441#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3365 case XTerm_Color_RV:
3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3443 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3444 process_color_seq (op, Color_BD, str, resp);
3371 break; 3445 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL: 3446 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp); 3447 process_color_seq (op, Color_UL, str, resp);
3375 break; 3448 break;
3376 case URxvt_Color_IT: 3449 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3450 process_color_seq (op, Color_IT, str, resp);
3378 break; 3451 break;
3379#endif 3452#endif
3453 case URxvt_Color_border:
3454 process_color_seq (op, Color_border, str, resp);
3455 break;
3380#if ENABLE_TRANSPARENCY 3456#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3457 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3458 process_color_seq (op, Color_tint, str, resp);
3383 { 3459 {
3384 bool changed = false; 3460 bool changed = false;
3385 3461
3386 if (ISSET_PIXCOLOR (Color_tint)) 3462 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3463 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390 3464
3391 if (changed) 3465 if (changed)
3392 update_background (); 3466 update_background ();
3393 } 3467 }
3394 3468
… …
3398#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3399 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3401 { 3475 {
3402 char str[256]; 3476 char str[256];
3477 int h_scale = 0, v_scale = 0;
3478 int h_align = 0, v_align = 0;
3479 if (image_vec.size () > 0)
3480 {
3481 h_scale = image_vec[0].h_scale;
3482 v_scale = image_vec[0].v_scale;
3483 h_align = image_vec[0].h_align;
3484 v_align = image_vec[0].v_align;
3485 }
3403 3486
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3487 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3488 h_scale, v_scale,
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3489 h_align, v_align);
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3490 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3491 }
3409 else 3492 else
3410 { 3493 {
3411 int changed = 0; 3494 bool changed = false;
3412 3495
3413 if (*str != ';') 3496 if (*str != ';')
3414 { 3497 {
3415 /* reset to default scaling :*/ 3498 if (image_vec.size () > 0)
3416 bgPixmap.unset_geometry (); 3499 changed = image_vec[0].set_file_geometry (str);
3417 if (bgPixmap.set_file (str)) /* change pixmap */ 3500 else
3501 {
3502 rxvt_image *image = new_image ();
3503 if (!image->set_file_geometry (str))
3504 image_vec.pop_back ();
3505 else
3418 changed++; 3506 changed = true;
3419 str = strchr (str, ';'); 3507 }
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 } 3508 }
3423 3509 else
3424 while (str)
3425 { 3510 {
3426 str++; 3511 str++;
3427 if (bgPixmap.set_geometry (str)) 3512 if (image_vec.size () > 0)
3428 changed++; 3513 changed = image_vec[0].set_geometry (str, true);
3429 str = strchr (str, ';');
3430 } 3514 }
3431 3515
3432 if (changed) 3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 bg_set_position (x, y);
3523 }
3433 update_background (); 3524 update_background ();
3525 }
3434 } 3526 }
3435 break; 3527 break;
3436#endif 3528#endif
3437 3529
3438 case XTerm_logfile: 3530 case XTerm_logfile:
… …
3508 break; 3600 break;
3509#endif 3601#endif
3510 3602
3511#if ENABLE_PERL 3603#if ENABLE_PERL
3512 case URxvt_perl: 3604 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3606 break;
3516#endif 3607#endif
3517 } 3608 }
3518} 3609}
3519/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3617 * 's' = save
3527 * 'r' = restore 3618 * 'r' = restore
3528 * 't' = toggle 3619 * 't' = toggle
3529 * so no need for fancy checking 3620 * so no need for fancy checking
3530 */ 3621 */
3531int 3622int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3624{
3534 int state; 3625 int state;
3535 3626
3536 if (mode == 's') 3627 if (mode == 's')
3537 { 3628 {
3538 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3539 return -1; 3633 return -1;
3540 } 3634 }
3541 else 3635 else
3542 { 3636 {
3543 if (mode == 'r') 3637 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3639 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3548 } 3646 }
3549 3647
3550 return state; 3648 return state;
3551} 3649}
3552 3650
3553/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3554void 3652void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3654{
3557 unsigned int i, j; 3655 unsigned int i, j;
3558 int state; 3656 int state;
3559 3657
3560 static const struct 3658 static const struct
3561 { 3659 {
3562 const int argval; 3660 const int argval;
3563 const unsigned long bit; 3661 const unsigned long bit;
3564 } argtopriv[] = { 3662 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3663 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3665 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3667 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3668 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3669 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3670 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3672 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3677#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3679 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3682 // 45 margin bell NYI
3583 // 46 start logging 3683 // 46 start logging
3584 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3685 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3687 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3688#endif
3589 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3691 { 1003, PrivMode_MouseAnyEvent },
3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste }, 3707 { 2004, PrivMode_BracketPaste },
3602 }; 3708 };
3603 3709
… …
3613 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3614 { 3720 {
3615 state = -1; 3721 state = -1;
3616 3722
3617 /* basic handling */ 3723 /* basic handling */
3618 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3619 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3620 { 3726 {
3621 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3622 break; 3728 break;
3623 } 3729 }
… …
3631 3737
3632 scr_touch (true); 3738 scr_touch (true);
3633 break; 3739 break;
3634#endif 3740#endif
3635 case 1048: /* alternative cursor save */ 3741 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3743 if (mode == 0)
3639 scr_cursor (RESTORE); 3744 scr_cursor (RESTORE);
3640 else if (mode == 1) 3745 else if (mode == 1)
3641 scr_cursor (SAVE); 3746 scr_cursor (SAVE);
… …
3650 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3758 * within VT52 mode
3654 */ 3759 */
3655 PrivMode (1, PrivMode_vt52); 3760 priv_modes |= PrivMode_vt52;
3656 break; 3761 break;
3657 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3765 break;
3664 case 4: /* smooth scrolling */ 3766 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3767 set_option (Opt_jumpScroll, !state);
3666 break; 3768 break;
3667 case 5: /* reverse video */ 3769 case 5: /* reverse video */
… …
3678 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3782 break;
3681#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3682 case scrollBar_esc: 3784 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3785 scrollBar.map (state);
3684 {
3685 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3787 scr_touch (true);
3687 }
3688 break; 3788 break;
3689#endif 3789#endif
3690 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3691 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3692 break; 3792 break;
… …
3705 case 1003: 3805 case 1003:
3706 if (state) 3806 if (state)
3707 { 3807 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3710 vt_emask_mouse = PointerMotionMask; 3811 vt_emask_mouse = PointerMotionMask;
3711 } 3812 }
3712 else 3813 else
3713 vt_emask_mouse = NoEventMask; 3814 vt_emask_mouse = NoEventMask;
3815
3714 vt_select_input (); 3816 vt_select_input ();
3715 break; 3817 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3818 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3819 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3820 break;
3719 case 1011: /* scroll to bottom on key press */ 3821 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3822 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3823 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3824 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3826 if (!state)
3725 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828
3726 scr_change_screen (state); 3829 scr_change_screen (state);
3727 break; 3830 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3831 case 1049: /* secondary screen w/ clearing first */
3832 if (option (Opt_secondaryScreen))
3833 if (state)
3834 scr_cursor (SAVE);
3835
3729 scr_change_screen (state); 3836 scr_change_screen (state);
3837
3730 if (option (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3839 if (state)
3732 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841 else
3842 scr_cursor (RESTORE);
3733 break; 3843 break;
3734 default: 3844 default:
3735 break; 3845 break;
3736 } 3846 }
3737 } 3847 }
3738} 3848}
3739/*}}} */ 3849/*}}} */
3740 3850
3741/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3742void 3852void ecb_hot
3743rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3744{ 3854{
3745 unsigned int i; 3855 unsigned int i;
3746 short rendset; 3856 short rendset;
3747 int rendstyle; 3857 int rendstyle;
… …
3890 } 4000 }
3891 } 4001 }
3892} 4002}
3893/*}}} */ 4003/*}}} */
3894 4004
3895/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3896void
3897rxvt_term::process_graphics ()
3898{
3899 unicode_t ch, cmd = cmd_getc ();
3900
3901 if (cmd == 'Q')
3902 {
3903 /* query graphics */
3904 tt_printf ("\033G0\012"); /* no graphics */
3905 return;
3906 }
3907 /* swallow other graphics sequences until terminating ':' */
3908 do
3909 ch = cmd_getc ();
3910 while (ch != ':');
3911}
3912/*}}} */
3913
3914/* ------------------------------------------------------------------------- */ 4005/* ------------------------------------------------------------------------- */
3915 4006
3916/* 4007/*
3917 * Send printf () formatted output to the command. 4008 * Send printf () formatted output to the command.
3918 * Only use for small amounts of data. 4009 * Only use for small amounts of data.
… …
3931 4022
3932/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
3933/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
3934 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
3935 */ 4026 */
3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937 4028
3938void 4029void
3939rxvt_term::tt_write (const char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
3940{ 4031{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3946 4037
3947 if (v_buflen == 0) 4038 if (v_buflen == 0)
3948 { 4039 {
3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3950 4041
4042 max_it (written, 0);
4043
3951 if ((unsigned int)written == len) 4044 if (written == len)
3952 return; 4045 return;
3953 4046
3954 data += written; 4047 data += written;
3955 len -= written; 4048 len -= written;
3956 } 4049 }
3957 4050
3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4051 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959 4052
3960 memcpy (v_buffer + v_buflen, data, len); 4053 memcpy (v_buffer + v_buflen, data, len);
3961 v_buflen += len; 4054 v_buflen += len;
3962 4055
3963 pty_ev.set (ev::READ | ev::WRITE); 4056 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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