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.357 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.526 by root, Fri Nov 30 07:19:09 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
304{ 407{
305 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
309 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
310 412
311#if ISO_14755 413#if ISO_14755
… …
321 */ 423 */
322 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
325 427
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 428 kbuf[0] = 0;
333 429
334#ifdef USE_XIM 430#if USE_XIM
335 if (Input_Context) 431 if (Input_Context)
336 { 432 {
337 Status status_return; 433 Status status_return;
338 434
339#if 0 435#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 508#else
413 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
414#endif 510#endif
511 max_it (lnsppg, 1);
512
415 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
416 { 514 {
417 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
418 return; 516 return;
419 } 517 }
… …
472 selection_request (ev.time); 570 selection_request (ev.time);
473 return; 571 return;
474#if TODO 572#if TODO
475 /* rxvt extras */ 573 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 575 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 577 return;
482#endif 578#endif
483 } 579 }
484 } 580 }
485 } 581 }
486 582
487#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 584 // ISO 14755 support
489 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 586 {
491 int hv; 587 int hv;
492 588
493 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 620 scr_overlay_off ();
525# endif 621# endif
526 iso14755buf = 0; 622 iso14755buf = 0;
527 } 623 }
528 } 624 }
625 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
532 { 629 {
533 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 631# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 643 }
547#endif 644#endif
548 645
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
551 { 657 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 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
553 newlen = 1; 688 newlen = 0;
554 switch (keysym) 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:
555 { 772 {
556#ifndef NO_BACKSPACE_KEY 773 int param = map_function_key (keysym);
557 case XK_BackSpace: 774 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 775 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 776 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 777 newlen = 0;
840 break;
841 } 778 }
842 779 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 780 }
846 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
847 /* 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 /*
848 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
849 */ 801 */
850#ifdef META8_OPTION 802#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
852 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
853#endif 805#endif
806 }
854 807
855 } 808 }
856 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
857 { 810 {
858 len = 1; 811 len = 1;
… …
892 { 845 {
893 view_start = 0; 846 view_start = 0;
894 want_refresh = 1; 847 want_refresh = 1;
895 } 848 }
896 849
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */ 850 /* escape prefix */
912 if (meta 851 if (meta
913#ifdef META8_OPTION 852#ifdef META8_OPTION
914 && meta_char == C0_ESC 853 && meta_char == C0_ESC
915#endif 854#endif
… …
920 } 859 }
921 860
922 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
923} 862}
924 863
925void 864void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
927{ 866{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 868 KeySym keysym;
930 869
… …
950 commit_iso14755 (); 889 commit_iso14755 ();
951 890
952 return; 891 return;
953 } 892 }
954 893
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 895 if (i[0] == keysym)
957 { 896 {
958 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 898 commit_iso14755 ();
960 899
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
999#endif 938#endif
1000} 939}
1001 940
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 941void
1036rxvt_term::flush () 942rxvt_term::flush ()
1037{ 943{
1038 flush_ev.stop (); 944 flush_ev.stop ();
1039 945
1040#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 948 {
1043 scr_clear (true); 949 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 950 scr_touch (false);
1045 } 951 }
1046#endif 952#endif
1047 953
1048 if (want_refresh) 954 if (want_refresh)
… …
1084 } 990 }
1085 while (row < end_row); 991 while (row < end_row);
1086 } 992 }
1087 993
1088 scr_refresh (); 994 scr_refresh ();
1089 scrollbar_show (1); 995 scrollBar.show (1);
1090#ifdef USE_XIM 996#if USE_XIM
1091 IMSendSpot (); 997 im_send_spot ();
1092#endif 998#endif
1093 } 999 }
1094 1000
1095 display->flush (); 1001 display->flush ();
1096} 1002}
1097 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1098void 1005void
1099rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1100{ 1007{
1101 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1010
1103 display->flush (); 1011 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1012}
1108 1013
1109void 1014void
1110rxvt_term::flush_cb (time_watcher &w) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1016{
1112 make_current (); 1017 make_current ();
1113 1018
1114 refresh_count = 0; 1019 refresh_count = 0;
1115 flush (); 1020 flush ();
1116} 1021}
1117 1022
1118#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1119void 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
1039void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1041{
1122 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1043 want_refresh = 1;
1124 1044 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1045}
1127#endif 1046#endif
1128 1047
1129#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1130void 1049void
1131rxvt_term::text_blink_cb (time_watcher &w) 1050rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1051{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1053 {
1135 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1136 want_refresh = 1; 1055 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1056 refresh_check ();
1138 } 1057 }
1058 else
1059 w.stop ();
1139} 1060}
1140#endif 1061#endif
1141 1062
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1064void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1066{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1069 {
1149 want_refresh = 1; 1070 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1151 } 1072 }
1073 else
1074 w.stop ();
1152} 1075}
1153#endif 1076#endif
1154 1077
1155#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1156void 1079void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1081{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1083 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1085 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1164 } 1087 }
1088 else
1089 w.stop ();
1165} 1090}
1166#endif 1091#endif
1167 1092
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1094void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1096{
1172 if (mouse_slip_wheel_speed == 0 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1098 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1099 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1100 refresh_check ();
1101 }
1102
1103 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1104 {
1105 mouse_slip_wheel_speed = 0;
1106 w.stop ();
1181 } 1107 }
1182} 1108}
1183#endif 1109#endif
1184 1110
1185#if LINUX_YIELD_HACK 1111#if LINUX_YIELD_HACK
1186static struct event_handler 1112static struct event_handler
1187{ 1113{
1188 check_watcher yield_ev; 1114 ev::prepare yield_ev;
1189 1115
1190 void yield_cb (check_watcher &w) 1116 void yield_cb (ev::prepare &w, int revents)
1191 { 1117 {
1192 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1125
1197 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1199 1128
1200 w.stop (); 1129 w.stop ();
1201 } 1130 }
1202 1131
… …
1205 { 1134 {
1206 } 1135 }
1207} event_handler; 1136} event_handler;
1208#endif 1137#endif
1209 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
1210bool 1172bool
1211rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1212{ 1174{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1214 1176
1215 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1178
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1218 n = 0;
1219 } 1180 {
1220 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1224 1186
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1188
1227 if (r > 0) 1189 if (r > 0)
1228 { 1190 {
1229 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1230 return true; 1192 return true;
… …
1246 1208
1247 return false; 1209 return false;
1248} 1210}
1249 1211
1250void 1212void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1213rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1214{
1253 make_current (); 1215 make_current ();
1254 1216
1255 if (revents & EVENT_READ) 1217 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1220 cmd_parse ();
1259 break;
1260 1221
1261 if (revents & EVENT_WRITE) 1222 if (revents & ev::WRITE)
1262 pty_write (); 1223 pty_write ();
1263}
1264 1224
1265void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1266rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1267{ 1230{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1232 recolour_cursor ();
1270 1233
1271#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1235 hidden_pointer = 0;
1273 1236
1274 if (option (Opt_pointerBlank)) 1237 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1276#endif 1239#endif
1277} 1240}
1278 1241
1279#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1280void 1243void ecb_cold
1281rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1282{ 1245{
1283 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1284 return; 1247 return;
1285 1248
… …
1287 XFlush (dpy); 1250 XFlush (dpy);
1288 1251
1289 hidden_pointer = 1; 1252 hidden_pointer = 1;
1290} 1253}
1291 1254
1292void 1255void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1257{
1295 make_current (); 1258 make_current ();
1296 1259
1297 pointer_blank (); 1260 pointer_blank ();
1298} 1261}
… …
1301void 1264void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1265rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1266{
1304 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1305 int x, y; 1268 int x, y;
1269 int code = 32;
1306 1270
1307 x = ev.x; 1271 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1272 y = Pixel2Row (ev.y) + 1;
1309 pixel_position (&x, &y); 1273
1274 if (ev.type == MotionNotify)
1275 {
1276 if (x == mouse_row && y == mouse_col)
1277 return;
1278
1279 mouse_row = x;
1280 mouse_col = y;
1281 code += 32;
1282 }
1310 1283
1311 if (MEvent.button == AnyButton) 1284 if (MEvent.button == AnyButton)
1312 button_number = 3; 1285 button_number = 3;
1313 else 1286 else
1314 { 1287 {
1315 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1290 if (button_number >= 3)
1318 button_number += (64 - 3); 1291 button_number += 64 - 3;
1319 } 1292 }
1320 1293
1321 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1322 { 1295 {
1323 /* 1296 /*
… …
1355 fputc ('A', stderr); 1328 fputc ('A', stderr);
1356 if (key_state & 32) 1329 if (key_state & 32)
1357 fputc ('2', stderr); 1330 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1332 button_number,
1360 x + 1, 1333 x,
1361 y + 1); 1334 y);
1362#endif 1335#endif
1363 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
1364 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1351 code + button_number + key_state,
1366 (32 + x + 1), 1352 32 + x,
1367 (32 + y + 1)); 1353 32 + y);
1368} 1354}
1369 1355
1370/*{{{ process an X event */ 1356/*{{{ process an X event */
1371void 1357void ecb_hot
1372rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1373{ 1359{
1374 make_current (); 1360 make_current ();
1375 1361
1376 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1474 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1461 focus_out ();
1476 break; 1462 break;
1477 1463
1478 case ConfigureNotify: 1464 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1483 { 1466 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1486 1502
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1504 {
1489 seen_resize = 1; 1505 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1507 }
1492 else 1508 else
1493 { 1509 {
1494#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ()) 1511 if (moved)
1496 update_background (); 1512 update_background ();
1497#endif 1513#endif
1498 } 1514 }
1515
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1517 }
1501 break; 1518 break;
1502 1519
1503 case PropertyNotify: 1520 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1506 && ev.xproperty.state == PropertyNewValue)
1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508
1509 break; 1522 break;
1510 1523
1511 case SelectionClear: 1524 case SelectionClear:
1512 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513 break;
1514
1515 case SelectionNotify:
1516 if (selection_wait == Sel_normal)
1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1518 break; 1526 break;
1519 1527
1520 case SelectionRequest: 1528 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1522 break; 1530 break;
1523 1531
1524 case MapNotify: 1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 /* This is needed specifically to fix the case of no window manager or a
1535 * non-reparenting window manager. In those cases we never get first
1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1538 * reparenting.
1539 * We should not render background immediately, as there could be several
1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1541 * by scheduling background redraw as soon as we can, but giving a short
1542 * bit of time for ConfigureNotifies to arrive.
1543 * We should render background PRIOR to drawing any text, but AFTER all
1544 * of ConfigureNotifys for the best results.
1545 */
1546 if (!(bg_flags & BG_IS_VALID))
1547 update_background_ev.start (0.025);
1548#endif
1525 mapped = 1; 1549 mapped = 1;
1526#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1551 text_blink_ev.start ();
1528#endif 1552#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1554 break;
1531 1555
1532 case UnmapNotify: 1556 case UnmapNotify:
… …
1542 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1543 { 1567 {
1544 do 1568 do
1545 { 1569 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1548 } 1572 }
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1550 1574
1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1552 1576
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 { 1578 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1581 }
1582
1558 want_refresh = 1; 1583 want_refresh = 1;
1559 } 1584 }
1560 else 1585 else
1561 { 1586 {
1562 XEvent unused_event; 1587 XEvent unused_event;
… …
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1589 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1565 ; 1590 ;
1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1567 ; 1592 ;
1568 1593
1569 if (isScrollbarWindow (ev.xany.window)) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1570 { 1595 {
1571 scrollBar.setIdle (); 1596 scrollBar.state = SB_STATE_IDLE;
1572 scrollbar_show (0); 1597 scrollBar.show (0);
1573 } 1598 }
1574 } 1599 }
1575 break; 1600 break;
1576 1601
1577 case MotionNotify: 1602 case MotionNotify:
1578#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1604 if (hidden_pointer)
1580 pointer_unblank (); 1605 pointer_unblank ();
1581#endif 1606#endif
1607 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1608 || priv_modes & PrivMode_MouseAnyEvent)
1609 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1610 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1611 break;
1584 1612
1585 if (ev.xany.window == vt) 1613 if (ev.xany.window == vt)
1586 { 1614 {
… …
1620 int dist; 1648 int dist;
1621 1649
1622 /* don't clobber the current delay if we are 1650 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1651 * already in the middle of scrolling.
1624 */ 1652 */
1625 if (!sel_scroll_ev.active) 1653 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1654 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1655
1628 /* save the event params so we can highlight 1656 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1657 * the selection in the pending-scroll loop
1630 */ 1658 */
1631 selection_save_x = ev.xbutton.x; 1659 selection_save_x = ev.xbutton.x;
… …
1639 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1640 } 1668 }
1641 else 1669 else
1642 { 1670 {
1643 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1644 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1645 } 1673 }
1646 1674
1647 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1648 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1; 1677 + 1;
… …
1653 else 1681 else
1654 { 1682 {
1655 /* we are within the text window, so we 1683 /* we are within the text window, so we
1656 * shouldn't be scrolling 1684 * shouldn't be scrolling
1657 */ 1685 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1686 sel_scroll_ev.stop();
1660 } 1687 }
1661#endif 1688#endif
1662#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1663 } 1690 }
1664#endif 1691#endif
1665 } 1692 }
1666 } 1693 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1695 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1671 ; 1698 ;
1672 1699
1673 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1704 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1706 scrollBar.size ());
1680 want_refresh = 1; 1707 want_refresh = 1;
1681 scrollbar_show (1); 1708 scrollBar.show (1);
1682 } 1709 }
1683 break; 1710 break;
1684 } 1711 }
1685 1712
1686#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1688 { 1715 cursor_blink_reset ();
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696 }
1697#endif 1716#endif
1698 1717
1699#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 { 1720 {
… …
1707 1726
1708 if (ev.type == KeyPress && hidden_pointer == 0) 1727 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank (); 1728 pointer_blank ();
1710 } 1729 }
1711#endif 1730#endif
1712}
1713 1731
1714void 1732 refresh_check ();
1733}
1734
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
1715rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1716{ 1754{
1717 if (!focus) 1755 if (!focus)
1718 { 1756 {
1719 focus = 1; 1757 focus = 1;
1720 want_refresh = 1; 1758 want_refresh = 1;
1721 1759
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724#if USE_XIM 1760#if USE_XIM
1725 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1726 { 1762 {
1727 IMSetPosition (); 1763 im_set_position ();
1728 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1729 } 1765 }
1730#endif 1766#endif
1731#if CURSOR_BLINK 1767#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1769 cursor_blink_ev.again ();
1734#endif 1770#endif
1735#if OFF_FOCUS_FADING 1771#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade]) 1772 if (rs[Rs_fade])
1737 { 1773 {
1738 pix_colors = pix_colors_focused; 1774 pix_colors = pix_colors_focused;
1739 scr_recolour (); 1775 scr_recolour ();
1740 } 1776 }
1741#endif 1777#endif
1742#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1744 { 1780 set_urgency (0);
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif 1781#endif
1752 }
1753}
1754 1782
1755void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1756rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1757{ 1789{
1758 if (focus) 1790 if (focus)
1759 { 1791 {
1760 focus = 0; 1792 focus = 0;
1761 want_refresh = 1; 1793 want_refresh = 1;
1762 1794
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1764 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1765#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf) 1800 if (iso14755buf)
1767 { 1801 {
1768 iso14755buf = 0; 1802 iso14755buf = 0;
1769# if ISO_14755 1803# if ISO_14755
… …
1776 XUnsetICFocus (Input_Context); 1810 XUnsetICFocus (Input_Context);
1777#endif 1811#endif
1778#if CURSOR_BLINK 1812#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink)) 1813 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop (); 1814 cursor_blink_ev.stop ();
1815
1781 hidden_cursor = 0; 1816 hidden_cursor = 0;
1782#endif 1817#endif
1783#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1785 { 1820 {
1786 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1787 scr_recolour (); 1822 scr_recolour ();
1788 } 1823 }
1789#endif 1824#endif
1790 }
1791}
1792 1825
1793void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1794rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1795{ 1832{
1796#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1798 { 1835 {
… …
1802 } 1839 }
1803#endif 1840#endif
1804} 1841}
1805 1842
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1844void ecb_hot
1808rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1846{
1810 make_current (); 1847 make_current ();
1811 1848
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return; 1851 return;
1815 1852
1816# if ENABLE_TRANSPARENCY
1817 switch (ev.type) 1853 switch (ev.type)
1818 { 1854 {
1819 case PropertyNotify: 1855 case PropertyNotify:
1820 /* 1856 /*
1821 * 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,
1822 * 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.
1823 */ 1859 */
1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826 { 1862 {
1863# if ENABLE_TRANSPARENCY
1827 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1828 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1829 } 1870 }
1871
1830 break; 1872 break;
1831 } 1873 }
1832# endif 1874
1875 refresh_check ();
1833} 1876}
1834#endif 1877#endif
1835 1878
1836void 1879void
1837rxvt_term::button_press (XButtonEvent &ev) 1880rxvt_term::button_press (XButtonEvent &ev)
… …
1868 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1869 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1872 { 1915 {
1873 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1874 MEvent.clicks++; 1917 MEvent.clicks++;
1875 1918
1876 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1877 { 1920 {
1878 /* only report double clicks */ 1921 /* only report double clicks */
… …
1892 mouse_report (ev); 1935 mouse_report (ev);
1893 } 1936 }
1894#else 1937#else
1895 MEvent.button = ev.button; 1938 MEvent.button = ev.button;
1896 mouse_report (ev); 1939 mouse_report (ev);
1897#endif /* MOUSE_REPORT_DOUBLECLICK */ 1940#endif /* MOUSE_REPORT_DOUBLECLICK */
1898 1941
1899 } 1942 }
1900 else 1943 else
1901 { 1944 {
1902 if (ev.button != MEvent.button) 1945 if (ev.button != MEvent.button)
… …
1950 } 1993 }
1951 1994
1952 /* 1995 /*
1953 * Scrollbar window processing of button press 1996 * Scrollbar window processing of button press
1954 */ 1997 */
1955 if (isScrollbarWindow (ev.window)) 1998 if (scrollBar.state && ev.window == scrollBar.win)
1956 { 1999 {
1957 scrollBar.setIdle (); 2000 page_dirn direction = NO_DIR;
2001
2002 if (scrollBar.upButton (ev.y))
2003 direction = UP; /* up */
2004 else if (scrollBar.dnButton (ev.y))
2005 direction = DN; /* down */
2006
2007 scrollBar.state = SB_STATE_IDLE;
1958 /* 2008 /*
1959 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 2010 * move up if mouse is above slider
1961 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1962 * 2012 *
… …
1971 /* 2021 /*
1972 * Mouse report disabled scrollbar: 2022 * Mouse report disabled scrollbar:
1973 * arrow buttons - send up/down 2023 * arrow buttons - send up/down
1974 * click on scrollbar - send pageup/down 2024 * click on scrollbar - send pageup/down
1975 */ 2025 */
1976 if ((scrollBar.style == R_SB_NEXT 2026 if (direction == UP)
1977 && scrollbarnext_upButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_upButton (ev.y)))
1980 tt_printf ("\033[A"); 2027 tt_printf ("\033[A");
1981 else if ((scrollBar.style == R_SB_NEXT 2028 else if (direction == DN)
1982 && scrollbarnext_dnButton (ev.y))
1983 || (scrollBar.style == R_SB_RXVT
1984 && scrollbarrxvt_dnButton (ev.y)))
1985 tt_printf ("\033[B"); 2029 tt_printf ("\033[B");
1986 else 2030 else
1987 switch (ev.button) 2031 switch (ev.button)
1988 { 2032 {
1989 case Button2: 2033 case Button2:
… …
1996 tt_printf ("\033[5~"); 2040 tt_printf ("\033[5~");
1997 break; 2041 break;
1998 } 2042 }
1999 } 2043 }
2000 else 2044 else
2001#endif /* NO_SCROLLBAR_REPORT */ 2045#endif /* NO_SCROLLBAR_REPORT */
2002
2003 {
2004 char upordown = 0;
2005
2006 if (scrollBar.style == R_SB_NEXT)
2007 { 2046 {
2008 if (scrollbarnext_upButton (ev.y)) 2047 if (direction != NO_DIR)
2009 upordown = -1; /* up */
2010 else if (scrollbarnext_dnButton (ev.y))
2011 upordown = 1; /* down */
2012 }
2013 else if (scrollBar.style == R_SB_RXVT)
2014 {
2015 if (scrollbarrxvt_upButton (ev.y))
2016 upordown = -1; /* up */
2017 else if (scrollbarrxvt_dnButton (ev.y))
2018 upordown = 1; /* down */
2019 }
2020 if (upordown)
2021 { 2048 {
2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2049#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2050 if (!cont_scroll_ev.is_active ())
2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024#endif 2052#endif
2025 if (scr_page (upordown < 0 ? UP : DN, 1)) 2053 if (scr_page (direction, 1))
2026 { 2054 {
2027 if (upordown < 0) 2055 if (direction == UP)
2028 scrollBar.setUp (); 2056 scrollBar.state = SB_STATE_UP;
2029 else 2057 else
2030 scrollBar.setDn (); 2058 scrollBar.state = SB_STATE_DOWN;
2031 } 2059 }
2032 } 2060 }
2033 else 2061 else
2034 switch (ev.button) 2062 switch (ev.button)
2035 { 2063 {
2036 case Button2: 2064 case Button2:
2037 switch (scrollbar_align) 2065 switch (scrollBar.align)
2038 { 2066 {
2039 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2040 csrO = 0; 2068 csrO = 0;
2041 break; 2069 break;
2042 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2043 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2044 break; 2072 break;
2045 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2046 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2047 break; 2075 break;
2048 } 2076 }
2049 2077
2050 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2051 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2052 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2053 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2054 2082
2055 scrollBar.setMotion (); 2083 scrollBar.state = SB_STATE_MOTION;
2056 break; 2084 break;
2057 2085
2058 case Button1: 2086 case Button1:
2059 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2060 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2061 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2062 2090
2063 case Button3: 2091 case Button3:
2064 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2065 { 2093 {
2066 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2067# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2068 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2069# else 2097# else
2070 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2071# endif 2099# endif
2072 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2074 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2075# else 2103# else
2076 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2077# endif 2105# endif
2078 else 2106 else
2079 scrollBar.setMotion (); 2107 scrollBar.state = SB_STATE_MOTION;
2080 } 2108 }
2081 else 2109 else
2082 { 2110 {
2083 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2084 (nrow 2112 (nrow
2085 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2086 / scrollbar_size ())); 2114 / scrollBar.size ()));
2087 } 2115 }
2088 2116
2089 break; 2117 break;
2090 } 2118 }
2091 } 2119 }
… …
2101 2129
2102 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2103 if (!bypass_keystate) 2131 if (!bypass_keystate)
2104 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2105 2133
2106 if (scrollbar_isUpDn ()) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2107 { 2135 {
2108 scrollBar.setIdle (); 2136 scrollBar.state = SB_STATE_IDLE;
2109 scrollbar_show (0); 2137 scrollBar.show (0);
2110 } 2138 }
2111 2139
2112#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2113 if (sel_scroll_ev.active)
2114 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2115#endif 2142#endif
2116 2143
2117 if (ev.window == vt) 2144 if (ev.window == vt)
2118 { 2145 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2146 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2143 mouse_report (ev); 2170 mouse_report (ev);
2144 } 2171 }
2145#else /* MOUSE_REPORT_DOUBLECLICK */ 2172#else /* MOUSE_REPORT_DOUBLECLICK */
2146 MEvent.button = AnyButton; 2173 MEvent.button = AnyButton;
2147 mouse_report (ev); 2174 mouse_report (ev);
2148#endif /* MOUSE_REPORT_DOUBLECLICK */ 2175#endif /* MOUSE_REPORT_DOUBLECLICK */
2149 return; 2176 return;
2150 } 2177 }
2151 2178
2152 /* 2179 /*
2153 * dumb hack to compensate for the failure of click-and-drag 2180 * dumb hack to compensate for the failure of click-and-drag
… …
2164 case Button3: 2191 case Button3:
2165 selection_make (ev.time); 2192 selection_make (ev.time);
2166 break; 2193 break;
2167 2194
2168 case Button2: 2195 case Button2:
2169 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?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2171 break; 2198 break;
2172 2199
2173#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2174 case Button4: 2201 case Button4:
2175 case Button5: 2202 case Button5:
… …
2191 { 2218 {
2192 mouse_slip_wheel_speed += v ? -1 : 1; 2219 mouse_slip_wheel_speed += v ? -1 : 1;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2220 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2221 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195 2222
2196 if (slip_wheel_ev.at < NOW) 2223 if (!slip_wheel_ev.is_active ())
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2224 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199 slip_wheel_ev.start ();
2200 } 2225 }
2201 else 2226 else
2227# endif
2202 { 2228 {
2203# endif
2204 scr_page (v, i); 2229 scr_page (v, i);
2205 scrollbar_show (1); 2230 scrollBar.show (1);
2206# ifdef MOUSE_SLIP_WHEELING
2207 } 2231 }
2208# endif
2209 } 2232 }
2210 break; 2233 break;
2211#endif 2234#endif
2212 } 2235 }
2213 } 2236 }
2214} 2237}
2215 2238
2216/*}}} */ 2239/*}}} */
2217 2240
2218bool 2241void ecb_hot
2219rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2220{ 2243{
2221 bool flag = false;
2222 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2224 2246
2225 for (;;) 2247 for (;;)
2226 { 2248 {
2227 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2228 { 2250 {
2229 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2252 ch = next_char ();
2231 2253
2232 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2233 break; 2255 break;
2234 } 2256 }
2235 2257
2236 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))
2237 { 2259 {
2238 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2239 { 2261 {
2240 seen_input = 1; 2262 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2278 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2280
2259 for (;;) 2281 for (;;)
2260 { 2282 {
2261 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)))
2262 break; 2284 break;
2263 2285
2264 *str++ = ch; 2286 *str++ = ch;
2265 2287
2266 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2289 {
2268 if (ch == C0_LF) 2290 if (ch == C0_LF)
2269 nlines++; 2291 nlines++;
2270 2292
2271 refresh_count++; 2293 refresh_count++;
2272 2294
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2295 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 { 2296 {
2275 refresh_count = 0; 2297 refresh_count = 0;
2276 2298
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2299 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 { 2300 {
2279 refreshnow = true; 2301 refreshnow = true;
2280 ch = NOCHAR; 2302 ch = NOCHAR;
2281 break; 2303 break;
2282 } 2304 }
… …
2320 * 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.
2321 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2322 */ 2344 */
2323 if (refreshnow) 2345 if (refreshnow)
2324 { 2346 {
2325 flag = true;
2326 scr_refresh (); 2347 scr_refresh ();
2327 want_refresh = 1; 2348 want_refresh = 1;
2328 } 2349 }
2329
2330 } 2350 }
2331 else 2351 else
2332 { 2352 {
2333 try 2353 try
2334 { 2354 {
… …
2342 } 2362 }
2343 2363
2344 ch = NOCHAR; 2364 ch = NOCHAR;
2345 } 2365 }
2346 } 2366 }
2347
2348 return flag;
2349} 2367}
2350 2368
2351// read the next character 2369// read the next character
2352wchar_t 2370wchar_t ecb_hot
2353rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2354{ 2372{
2355 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2356 { 2374 {
2357 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2359 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2360 2378
2361 wchar_t wc; 2379 wchar_t wc;
2362 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);
2363 2381
… …
2367 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2368 break; 2386 break;
2369 } 2387 }
2370 2388
2371 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // in which case we "erroneously" return the next byte which might be valid.
2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2395 }
2373 2396
2374 // assume wchar == unicode 2397 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
2376 return wc & UNICODE_MASK; 2399 return wc & UNICODE_MASK;
2377 } 2400 }
2378 2401
2379 return NOCHAR; 2402 return NOCHAR;
2380} 2403}
2381 2404
2382// read the next octet 2405// read the next octet
2383uint32_t 2406uint32_t ecb_hot
2384rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2385{ 2408{
2386 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR; 2411 : NOCHAR;
2389} 2412}
2390 2413
2391static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2392 2415
2393/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2394/*
2395 * Return the next input character after first passing any keyboard input
2396 * to the command.
2397 */
2398wchar_t
2399rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2400{ 2418{
2401 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2402 2420
2403 if (c == NOCHAR) 2421 if (c == NOCHAR)
2404 throw out_of_input; 2422 throw out_of_input;
2405 2423
2406 return c; 2424 return c;
2407} 2425}
2408 2426
2409uint32_t 2427uint32_t ecb_hot
2410rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2429{
2412 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2413 2431
2414 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2418} 2436}
2419 2437
2420/*{{{ print pipe */ 2438/*{{{ print pipe */
2421/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2422#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2423FILE * 2441FILE * ecb_cold
2424rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2425{ 2443{
2426 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2444 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427 2445
2428 if (stream == NULL) 2446 if (stream == NULL)
2429 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2430 2448
2431 return stream; 2449 return stream;
2432} 2450}
2433 2451
2434int 2452int ecb_cold
2435rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2436{ 2454{
2437 fflush (stream); 2455 fflush (stream);
2438 return pclose (stream); 2456 return pclose (stream);
2439} 2457}
2440 2458
2441/* 2459/*
2442 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2443 */ 2461 */
2444void 2462void ecb_cold
2445rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2446{ 2464{
2447 int done; 2465 FILE *fd = popen_printer ();
2448 FILE *fd;
2449 2466
2450 if ((fd = popen_printer ()) == NULL) 2467 if (!fd)
2451 return; 2468 return;
2452 2469
2453 /* 2470 /*
2454 * Send all input to the printer until either ESC[4i or ESC[?4i 2471 * Send all input to the printer until either ESC[4i or ESC[?4i
2455 * is received. 2472 * is received.
2456 */ 2473 */
2457 for (done = 0; !done;) 2474 for (int done = 0; !done; )
2458 { 2475 {
2459 unsigned char buf[8]; 2476 unsigned char buf[8];
2460 unicode_t ch; 2477 unicode_t ch;
2461 unsigned int i, len; 2478 unsigned int i, len;
2462 2479
… …
2493 } 2510 }
2494 } 2511 }
2495 2512
2496 pclose_printer (fd); 2513 pclose_printer (fd);
2497} 2514}
2498#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2499/*}}} */ 2516/*}}} */
2500 2517
2501/* *INDENT-OFF* */
2502enum { 2518enum {
2503 C1_40 = 0x40, 2519 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2524};
2509/* *INDENT-ON* */
2510 2525
2511/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2512void 2527void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2529{
2515 switch (ch) 2530 switch (ch)
2516 { 2531 {
2517 case C0_ESC: 2532 case C0_ESC:
… …
2563} 2578}
2564/*}}} */ 2579/*}}} */
2565 2580
2566 2581
2567/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2568void 2583void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2585{
2571 int row, col; 2586 int row, col;
2572 2587
2573 switch (ch) 2588 switch (ch)
… …
2607 break; 2622 break;
2608 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2625 break;
2611 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2612 PrivMode (0, PrivMode_vt52); 2627 priv_modes &= ~PrivMode_vt52;
2613 break; 2628 break;
2614 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2616 /* unimplemented */ 2631 /* unimplemented */
2617 break; 2632 break;
… …
2623} 2638}
2624/*}}} */ 2639/*}}} */
2625 2640
2626 2641
2627/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2628void 2643void ecb_hot
2629rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2630{ 2645{
2631 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2632 2647
2633 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2636 return; 2651 return;
2637 } 2652 }
2638 2653
2639 switch (ch) 2654 switch (ch)
2640 { 2655 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2656 case '#':
2643 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2644 scr_E (); 2658 scr_E ();
2645 break; 2659 break;
2646 case '(': 2660 case '(':
… …
2669#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2670 case '9': 2684 case '9':
2671 scr_forwardindex (); 2685 scr_forwardindex ();
2672 break; 2686 break;
2673#endif 2687#endif
2688 // DECPAM/DECPNM
2674 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2675 case '>': 2692 case '>':
2676 PrivMode ((ch == '='), PrivMode_aplKP); 2693 priv_modes &= ~PrivMode_aplKP;
2677 break; 2694 break;
2678 2695
2679 case C1_40: 2696 case C1_40:
2680 cmd_getc (); 2697 cmd_getc ();
2681 break; 2698 break;
… …
2685 2702
2686 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2688 { 2705 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2708 }
2692 break; 2709 break;
2693 2710
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2696 process_graphics (); 2713 // used by original rxvt for rob nations own graphics mode
2714 if (cmd_getc () == 'Q')
2715 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2716 break;
2698 2717
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2706 scr_index (DN); 2725 scr_index (DN);
2707 break; 2726 break;
2708 2727
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2711 2730
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2714 2733
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2736 process_dcs_seq ();
2718 break; 2737 break;
… …
2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2721 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2723 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2724 2743
2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2726 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2727 process_csi_seq (); 2746 process_csi_seq ();
2728 break; 2747 break;
2729 2748
2730 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2731 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
2732 process_osc_seq (); 2751 process_osc_seq ();
2733 break; 2752 break;
2734 2753
2735 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2736 case 'c': 2755 case 'c':
2737 mbstate.reset (); 2756 mbstate.reset ();
2738 scr_poweron (); 2757 scr_poweron ();
2739 scrollbar_show (1); 2758 scrollBar.show (1);
2740 break; 2759 break;
2741 2760
2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2743 case 'n': 2762 case 'n':
2744 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
2751 } 2770 }
2752} 2771}
2753/*}}} */ 2772/*}}} */
2754 2773
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2775enum {
2758 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2767}; 2785};
2768 2786
2769#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2772#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2773 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2774 2792
2775const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2776 { 2794 {
2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2783 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2784 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2785 }; 2803 };
2786/* *INDENT-ON* */
2787 2804
2788void 2805void ecb_hot
2789rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2790{ 2807{
2791 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2792 unsigned int nargs, p; 2809 unsigned int nargs, p;
2793 int n, ndef; 2810 int n, ndef;
… …
2795 2812
2796 nargs = 0; 2813 nargs = 0;
2797 2814
2798 priv = 0; 2815 priv = 0;
2799 ch = cmd_getc (); 2816 ch = cmd_getc ();
2800 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2818 {
2801 { /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
2802 priv = ch; 2820 priv = ch;
2803 ch = cmd_getc (); 2821 ch = cmd_getc ();
2804 } 2822 }
2805 2823
2806 /* read any numerical arguments */ 2824 /* read any numerical arguments */
… …
2849 { 2867 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 // 2870 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855 // that we do not support xterm mouse reporting (should be 95 when we do). 2873 // versions.
2856 // 2874 //
2857 tt_printf ("\033[>%d;94;0c", 'U'); 2875 tt_printf ("\033[>%d;95;0c", 'U');
2858 } 2876 }
2859 break; 2877 break;
2878
2860 case '?': 2879 case '?':
2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2863 break; 2882 break;
2883
2884 case '!':
2885 if (ch == CSI_70)
2886 {
2887 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2888 scr_soft_reset ();
2889
2890 static const int pm_h[] = { 7, 25 };
2891 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2892
2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2864 } 2895 }
2896 break;
2897 }
2898
2865 return; 2899 return;
2866 } 2900 }
2867 2901
2868 switch (ch) 2902 switch (ch)
2869 { 2903 {
… …
2883 } 2917 }
2884 break; 2918 break;
2885#endif 2919#endif
2886 2920
2887 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2888 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2889 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2890 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2891 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2893 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2894 break; 2928 break;
2895 2929
2896 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2897 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3084 } 3118 }
3085} 3119}
3086/*}}} */ 3120/*}}} */
3087 3121
3088#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3089/* ARGSUSED */
3090void 3123void
3091rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3092{ 3125{
3093 int x, y; 3126 int x, y;
3094 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3103 { 3136 {
3104 /* 3137 /*
3105 * commands 3138 * commands
3106 */ 3139 */
3107 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3108 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3109 break; 3142 break;
3110 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3111 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3112 break; 3145 break;
3113 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3114 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3115 break; 3148 break;
3116 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3118 break; 3151 break;
3119 case 5: /* raise window */ 3152 case 5: /* raise window */
3120 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3121 break; 3154 break;
3122 case 6: /* lower window */ 3155 case 6: /* lower window */
3123 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3124 break; 3157 break;
3125 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3126 scr_touch (true); 3159 scr_touch (true);
3127 break; 3160 break;
3128 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3131 break; 3164 break;
3132 3165
3133 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3134 default: 3167 default:
3135 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3136 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3137 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3138 break; 3171 break;
3139 3172
3140 /* 3173 /*
3141 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3142 */ 3175 */
3143 case 11: /* report window state */ 3176 case 11: /* report window state */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3146 break; 3179 break;
3147 case 13: /* report window position */ 3180 case 13: /* report window position */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3149 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3150 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3151 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3152 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3153 break; 3186 break;
3154 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3155 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3157 break; 3190 break;
3158 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3159 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3160 break; 3193 break;
… …
3162 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3163 break; 3196 break;
3164 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3165 { 3198 {
3166 char *s; 3199 char *s;
3167 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3168 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3201 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3202 XFree (s);
3170 } 3203 }
3171 break; 3204 break;
3172 case 21: /* report window title */ 3205 case 21: /* report window title */
3173 { 3206 {
3174 char *s; 3207 char *s;
3175 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3209 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3177 XFree (s); 3210 XFree (s);
3178 } 3211 }
3179 break; 3212 break;
3180 } 3213 }
… …
3236 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3269 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3237 */ 3270 */
3238void 3271void
3239rxvt_term::process_dcs_seq () 3272rxvt_term::process_dcs_seq ()
3240{ 3273{
3241 char *s;
3242 unicode_t eh;
3243
3244 /* 3274 /*
3245 * Not handled yet 3275 * Not handled yet
3246 */ 3276 */
3277
3278 unicode_t eh;
3247 s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3248 if (s) 3280 if (s)
3249 free (s); 3281 free (s);
3250 3282
3251 return; 3283 return;
3252} 3284}
… …
3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3288 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3257 */ 3289 */
3258void 3290void
3259rxvt_term::process_osc_seq () 3291rxvt_term::process_osc_seq ()
3260{ 3292{
3261 unicode_t ch, eh;
3262 int arg; 3293 int arg;
3263 3294
3264 ch = cmd_getc (); 3295 unicode_t ch = cmd_getc ();
3265 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3296 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3266 arg = arg * 10 + (ch - '0'); 3297 arg = arg * 10 + (ch - '0');
3267 3298
3268 if (ch == ';') 3299 if (ch == ';')
3269 { 3300 {
3301 unicode_t eh;
3270 char *s = get_to_st (eh); 3302 char *s = get_to_st (eh);
3271 3303
3272 if (s) 3304 if (s)
3273 { 3305 {
3274 process_xterm_seq (arg, s, eh); 3306 process_xterm_seq (arg, s, eh);
… …
3298 3330
3299/* 3331/*
3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3332 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3301 */ 3333 */
3302void 3334void
3303rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3335rxvt_term::process_xterm_seq (int op, char *str, char resp)
3304{ 3336{
3305 int color; 3337 int color;
3306 char *buf, *name; 3338 char *buf, *name;
3307 bool query = str[0] == '?' && !str[1]; 3339 bool query = str[0] == '?' && !str[1];
3308 int saveop = op; 3340 int saveop = op;
… …
3335 unsigned long bytes_after; 3367 unsigned long bytes_after;
3336 unsigned char *value = 0; 3368 unsigned char *value = 0;
3337 const char *str = ""; 3369 const char *str = "";
3338 3370
3339 if (prop 3371 if (prop
3340 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3341 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3342 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3343 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3376 && actual_type != None
3345 && actual_format == 8) 3377 && actual_format == 8)
… …
3349 3381
3350 XFree (value); 3382 XFree (value);
3351 } 3383 }
3352 else 3384 else
3353 { 3385 {
3354 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3386 char *eq = strchr (str, '=');
3355 3387
3356 if (eq) 3388 if (eq)
3357 { 3389 {
3358 *eq = 0; 3390 *eq = 0;
3359 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3360 } 3392 }
3361 else 3393 else
3362 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3363 display->atom (str)); 3395 display->atom (str));
3364 } 3396 }
3365 break; 3397 break;
3366 3398
3367 case XTerm_Color: 3399 case XTerm_Color:
… …
3380 *buf++ = '\0'; 3412 *buf++ = '\0';
3381 3413
3382 process_color_seq (op, color, name, resp); 3414 process_color_seq (op, color, name, resp);
3383 } 3415 }
3384 break; 3416 break;
3417 case Rxvt_restoreFG:
3385 case XTerm_Color00: 3418 case XTerm_Color00:
3386 process_color_seq (op, Color_fg, str, resp); 3419 process_color_seq (op, Color_fg, str, resp);
3387 break; 3420 break;
3421 case Rxvt_restoreBG:
3388 case XTerm_Color01: 3422 case XTerm_Color01:
3389 process_color_seq (op, Color_bg, str, resp); 3423 process_color_seq (op, Color_bg, str, resp);
3390 break; 3424 break;
3391#ifndef NO_CURSORCOLOR 3425#ifndef NO_CURSORCOLOR
3392 case XTerm_Color_cursor: 3426 case XTerm_Color_cursor:
… …
3397 process_color_seq (op, Color_pointer_fg, str, resp); 3431 process_color_seq (op, Color_pointer_fg, str, resp);
3398 break; 3432 break;
3399 case XTerm_Color_pointer_bg: 3433 case XTerm_Color_pointer_bg:
3400 process_color_seq (op, Color_pointer_bg, str, resp); 3434 process_color_seq (op, Color_pointer_bg, str, resp);
3401 break; 3435 break;
3436#ifdef OPTION_HC
3437 case XTerm_Color_HC:
3438 process_color_seq (op, Color_HC, str, resp);
3439 break;
3440 case XTerm_Color_HTC:
3441 process_color_seq (op, Color_HTC, str, resp);
3442 break;
3443#endif
3402#ifndef NO_BOLD_UNDERLINE_REVERSE 3444#ifndef NO_BOLD_UNDERLINE_REVERSE
3403 case XTerm_Color_RV:
3404 process_color_seq (op, Color_RV, str, resp);
3405 break;
3406 case Rxvt_Color_BD:
3407 case URxvt_Color_BD: 3445 case URxvt_Color_BD:
3408 process_color_seq (op, Color_BD, str, resp); 3446 process_color_seq (op, Color_BD, str, resp);
3409 break; 3447 break;
3410 case Rxvt_Color_UL:
3411 case URxvt_Color_UL: 3448 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp); 3449 process_color_seq (op, Color_UL, str, resp);
3413 break; 3450 break;
3414 case URxvt_Color_IT: 3451 case URxvt_Color_IT:
3415 process_color_seq (op, Color_IT, str, resp); 3452 process_color_seq (op, Color_IT, str, resp);
3416 break; 3453 break;
3417#endif 3454#endif
3455 case URxvt_Color_border:
3456 process_color_seq (op, Color_border, str, resp);
3457 break;
3418#if ENABLE_TRANSPARENCY 3458#if ENABLE_TRANSPARENCY
3419 case URxvt_Color_tint: 3459 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3421 { 3461 {
3422 bool changed = false; 3462 bool changed = false;
3463
3423 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3425 else 3466
3426 changed = bgPixmap.unset_tint ();
3427 if (changed) 3467 if (changed)
3428 update_background (); 3468 update_background ();
3429 } 3469 }
3430 3470
3431 break; 3471 break;
… …
3434#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3435 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3436 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3437 { 3477 {
3438 char str[256]; 3478 char str[256];
3479 int h_scale = fimage.h_scale;
3480 int v_scale = fimage.v_scale;
3481 int h_align = fimage.h_align;
3482 int v_align = fimage.v_align;
3439 3483
3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3484 sprintf (str, "[%dx%d+%d+%d]",
3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3485 h_scale, v_scale,
3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3486 h_align, v_align);
3443 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3444 } 3488 }
3445 else 3489 else
3446 { 3490 {
3447 int changed = 0; 3491 bool changed = false;
3448 3492
3449 if (*str != ';') 3493 if (*str != ';')
3450 { 3494 {
3451 /* reset to default scaling :*/ 3495 try
3452 bgPixmap.unset_geometry (); 3496 {
3453 if (bgPixmap.set_file (str)) /* change pixmap */ 3497 fimage.set_file_geometry (this, str);
3454 changed++; 3498 changed = true;
3455 str = strchr (str, ';'); 3499 }
3456 if (str == NULL) 3500 catch (const class rxvt_failure_exception &e)
3457 bgPixmap.set_defaultGeometry (); 3501 {
3502 }
3458 } 3503 }
3459 while (str) 3504 else
3460 { 3505 {
3461 str++; 3506 str++;
3462 if (bgPixmap.set_geometry (str)) 3507 if (fimage.set_geometry (str, true))
3463 changed++; 3508 changed = true;
3464 str = strchr (str, ';');
3465 } 3509 }
3510
3466 if (changed) 3511 if (changed)
3512 {
3513 if (bg_window_position_sensitive ())
3514 {
3515 int x, y;
3516 get_window_origin (x, y);
3517 parent_x = x;
3518 parent_y = y;
3519 }
3467 update_background (); 3520 update_background ();
3521 }
3468 } 3522 }
3469 break; 3523 break;
3470#endif 3524#endif
3471
3472 case Rxvt_restoreFG:
3473 set_window_color (Color_fg, str);
3474 break;
3475 case Rxvt_restoreBG:
3476 set_window_color (Color_bg, str);
3477 break;
3478 3525
3479 case XTerm_logfile: 3526 case XTerm_logfile:
3480 // TODO, when secure mode? 3527 // TODO, when secure mode?
3481 break; 3528 break;
3482 3529
… …
3549 break; 3596 break;
3550#endif 3597#endif
3551 3598
3552#if ENABLE_PERL 3599#if ENABLE_PERL
3553 case URxvt_perl: 3600 case URxvt_perl:
3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3555 ; // no responses yet
3556 break; 3602 break;
3557#endif 3603#endif
3558 } 3604 }
3559} 3605}
3560/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3567 * 's' = save 3613 * 's' = save
3568 * 'r' = restore 3614 * 'r' = restore
3569 * 't' = toggle 3615 * 't' = toggle
3570 * so no need for fancy checking 3616 * so no need for fancy checking
3571 */ 3617 */
3572int 3618int ecb_cold
3573rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3574{ 3620{
3575 int state; 3621 int state;
3576 3622
3577 if (mode == 's') 3623 if (mode == 's')
3578 { 3624 {
3579 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3580 return -1; 3629 return -1;
3581 } 3630 }
3582 else 3631 else
3583 { 3632 {
3584 if (mode == 'r') 3633 if (mode == 'r')
3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586 else 3635 else
3587 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3589 } 3642 }
3590 3643
3591 return state; 3644 return state;
3592} 3645}
3593 3646
3594/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3595void 3648void
3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3597{ 3650{
3598 unsigned int i, j; 3651 unsigned int i, j;
3599 int state; 3652 int state;
3600 3653
3601 static const struct 3654 static const struct
3602 { 3655 {
3603 const int argval; 3656 const int argval;
3604 const unsigned long bit; 3657 const unsigned long bit;
3605 } argtopriv[] = { 3658 } argtopriv[] = {
3606 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3607 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3608 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3609 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3610 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3611 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3612 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3613 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3614 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3615 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3673#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3621 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3622 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3623 // 45 margin bell NYI 3678 // 45 margin bell NYI
3624 // 46 start logging 3679 // 46 start logging
3625 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3626 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3627#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3628 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3629#endif 3684#endif
3630 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3686 { 1002, PrivMode_MouseBtnEvent },
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3687 { 1003, PrivMode_MouseAnyEvent },
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
3643 }; 3704 };
3644 3705
3645 if (nargs == 0) 3706 if (nargs == 0)
3646 return; 3707 return;
3647 3708
… …
3654 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3655 { 3716 {
3656 state = -1; 3717 state = -1;
3657 3718
3658 /* basic handling */ 3719 /* basic handling */
3659 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3660 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3661 { 3722 {
3662 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3663 break; 3724 break;
3664 } 3725 }
… …
3672 3733
3673 scr_touch (true); 3734 scr_touch (true);
3674 break; 3735 break;
3675#endif 3736#endif
3676 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
3677 case 1049:
3678 if (option (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
3679 if (mode == 0) 3739 if (mode == 0)
3680 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
3681 else if (mode == 1) 3741 else if (mode == 1)
3682 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
… …
3691 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3754 * within VT52 mode
3695 */ 3755 */
3696 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
3697 break; 3757 break;
3698 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3700 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701 break; 3761 break;
3702 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
3703 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
3704 break; 3764 break;
3705 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
3712 scr_autowrap (state); 3772 scr_autowrap (state);
3713 break; 3773 break;
3714 /* case 8: - auto repeat, can't do on a per window basis */ 3774 /* case 8: - auto repeat, can't do on a per window basis */
3715 case 9: /* X10 mouse reporting */ 3775 case 9: /* X10 mouse reporting */
3716 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3717 priv_modes &= ~PrivMode_MouseX11; 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3778 break;
3719#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3720 case scrollBar_esc: 3780 case scrollBar_esc:
3721 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
3722 {
3723 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3783 scr_touch (true);
3725 }
3726 break; 3784 break;
3727#endif 3785#endif
3728 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3729 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3730 break; 3788 break;
… …
3735 break; 3793 break;
3736 /* case 66: - application key pad */ 3794 /* case 66: - application key pad */
3737 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
3738 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
3739 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX10; 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3799 break;
3742#if 0
3743 case 1001: 3800 case 1002:
3744 break; /* X11 mouse highlighting */ 3801 case 1003:
3745#endif 3802 if (state)
3803 {
3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3807 vt_emask_mouse = PointerMotionMask;
3808 }
3809 else
3810 vt_emask_mouse = NoEventMask;
3811
3812 vt_select_input ();
3813 break;
3746 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
3747 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
3748 break; 3816 break;
3749 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
3750 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
3751 break; 3819 break;
3752 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
3753 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3754 if (current_screen != PRIMARY) 3822 if (!state)
3755 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
3756 scr_change_screen (state); 3825 scr_change_screen (state);
3757 break; 3826 break;
3758 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
3759 scr_change_screen (state); 3832 scr_change_screen (state);
3833
3760 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3761 if (current_screen != PRIMARY) 3835 if (state)
3762 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
3763 break; 3839 break;
3764 default: 3840 default:
3765 break; 3841 break;
3766 } 3842 }
3767 } 3843 }
3768} 3844}
3769/*}}} */ 3845/*}}} */
3770 3846
3771/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3772void 3848void ecb_hot
3773rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3774{ 3850{
3775 unsigned int i; 3851 unsigned int i;
3776 short rendset; 3852 short rendset;
3777 int rendstyle; 3853 int rendstyle;
… …
3920 } 3996 }
3921 } 3997 }
3922} 3998}
3923/*}}} */ 3999/*}}} */
3924 4000
3925/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3926void
3927rxvt_term::process_graphics ()
3928{
3929 unicode_t ch, cmd = cmd_getc ();
3930
3931 if (cmd == 'Q')
3932 { /* query graphics */
3933 tt_printf ("\033G0\012"); /* no graphics */
3934 return;
3935 }
3936 /* swallow other graphics sequences until terminating ':' */
3937 do
3938 ch = cmd_getc ();
3939 while (ch != ':');
3940}
3941/*}}} */
3942
3943/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3944 4002
3945/* 4003/*
3946 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3947 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3960 4018
3961/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3962/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3963 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3964 */ 4022 */
3965const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3966 4024
3967void 4025void
3968rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4027{
3970 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3975 4033
3976 if (v_buflen == 0) 4034 if (v_buflen == 0)
3977 { 4035 {
3978 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3979 4037
4038 max_it (written, 0);
4039
3980 if ((unsigned int)written == len) 4040 if (written == len)
3981 return; 4041 return;
3982 4042
3983 data += written; 4043 data += written;
3984 len -= written; 4044 len -= written;
3985 } 4045 }
3986 4046
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3988 4048
3989 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len; 4050 v_buflen += len;
3991 4051
3992 pty_ev.set (EVENT_READ | EVENT_WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);
3993} 4053}
3994 4054
3995void rxvt_term::pty_write () 4055void rxvt_term::pty_write ()
3996{ 4056{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4057 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4003 if (v_buflen == 0) 4063 if (v_buflen == 0)
4004 { 4064 {
4005 free (v_buffer); 4065 free (v_buffer);
4006 v_buffer = 0; 4066 v_buffer = 0;
4007 4067
4008 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4009 return; 4069 return;
4010 } 4070 }
4011 4071
4012 memmove (v_buffer, v_buffer + written, v_buflen); 4072 memmove (v_buffer, v_buffer + written, v_buflen);
4013 } 4073 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4074 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ); 4075 pty_ev.set (ev::READ);
4016} 4076}
4017 4077
4018/*----------------------- end-of-file (C source) -----------------------*/ 4078/*----------------------- end-of-file (C source) -----------------------*/
4019 4079

Diff Legend

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