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.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 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)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 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
304rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
305{ 407{
306 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 409 KeySym keysym;
309 int valid_keysym; 410 int valid_keysym;
310 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
311 412
312#if ISO_14755 413#if ISO_14755
… …
322 */ 423 */
323 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
326 427
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 428 kbuf[0] = 0;
334 429
335#ifdef USE_XIM 430#if USE_XIM
336 if (Input_Context) 431 if (Input_Context)
337 { 432 {
338 Status status_return; 433 Status status_return;
339 434
340#if 0 435#if 0
… …
411#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 508#else
414 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
415#endif 510#endif
511 max_it (lnsppg, 1);
512
416 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
417 { 514 {
418 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
419 return; 516 return;
420 } 517 }
… …
473 selection_request (ev.time); 570 selection_request (ev.time);
474 return; 571 return;
475#if TODO 572#if TODO
476 /* rxvt extras */ 573 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 575 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 577 return;
483#endif 578#endif
484 } 579 }
485 } 580 }
486 } 581 }
487 582
488#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 584 // ISO 14755 support
490 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 586 {
492 int hv; 587 int hv;
493 588
494 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 620 scr_overlay_off ();
526# endif 621# endif
527 iso14755buf = 0; 622 iso14755buf = 0;
528 } 623 }
529 } 624 }
625 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
533 { 629 {
534 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 631# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 643 }
548#endif 644#endif
549 645
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ENABLE_TRANSPARENCY 946#ifdef HAVE_IMG
1041 if (want_full_refresh) 947 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 948 {
1043 want_full_refresh = 0; 949 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 950 scr_touch (false);
1046 } 951 }
1047#endif 952#endif
1048 953
1049 if (want_refresh) 954 if (want_refresh)
… …
1085 } 990 }
1086 while (row < end_row); 991 while (row < end_row);
1087 } 992 }
1088 993
1089 scr_refresh (); 994 scr_refresh ();
1090 scrollbar_show (1); 995 scrollBar.show (1);
1091#ifdef USE_XIM 996#if USE_XIM
1092 IMSendSpot (); 997 im_send_spot ();
1093#endif 998#endif
1094 } 999 }
1095 1000
1096 display->flush (); 1001 display->flush ();
1097} 1002}
1098 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1099void 1005void
1100rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1101{ 1007{
1102 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1010
1104 display->flush (); 1011 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1012}
1109 1013
1110void 1014void
1111rxvt_term::flush_cb (time_watcher &w) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1016{
1113 make_current (); 1017 make_current ();
1114 1018
1115 refresh_count = 0; 1019 refresh_count = 0;
1116 flush (); 1020 flush ();
1117} 1021}
1118 1022
1119#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1120void 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
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1041{
1123 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1043 want_refresh = 1;
1125 1044 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1045}
1128#endif 1046#endif
1129 1047
1130#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1131void 1049void
1132rxvt_term::text_blink_cb (time_watcher &w) 1050rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1051{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1053 {
1136 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1137 want_refresh = 1; 1055 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1056 refresh_check ();
1139 } 1057 }
1058 else
1059 w.stop ();
1140} 1060}
1141#endif 1061#endif
1142 1062
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1064void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1066{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1149 { 1069 {
1150 want_refresh = 1; 1070 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1152 } 1072 }
1073 else
1074 w.stop ();
1153} 1075}
1154#endif 1076#endif
1155 1077
1156#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1157void 1079void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1081{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1083 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1085 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1165 } 1087 }
1088 else
1089 w.stop ();
1166} 1090}
1167#endif 1091#endif
1168 1092
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1094void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1096{
1173 if (mouse_slip_wheel_speed == 0 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1098 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1099 want_refresh = 1;
1181 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 ();
1182 } 1107 }
1183} 1108}
1184#endif 1109#endif
1185 1110
1186#if LINUX_YIELD_HACK 1111#if LINUX_YIELD_HACK
1187static struct event_handler 1112static struct event_handler
1188{ 1113{
1189 check_watcher yield_ev; 1114 ev::prepare yield_ev;
1190 1115
1191 void yield_cb (check_watcher &w) 1116 void yield_cb (ev::prepare &w, int revents)
1192 { 1117 {
1193 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // 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.
1197 1125
1198 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1200 1128
1201 w.stop (); 1129 w.stop ();
1202 } 1130 }
1203 1131
… …
1206 { 1134 {
1207 } 1135 }
1208} event_handler; 1136} event_handler;
1209#endif 1137#endif
1210 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
1211bool 1172bool
1212rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1213{ 1174{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1215 1176
1216 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1178
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1219 n = 0;
1220 } 1180 {
1221 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1225 1186
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1188
1228 if (r > 0) 1189 if (r > 0)
1229 { 1190 {
1230 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1231 return true; 1192 return true;
… …
1247 1208
1248 return false; 1209 return false;
1249} 1210}
1250 1211
1251void 1212void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1213rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1214{
1254 make_current (); 1215 make_current ();
1255 1216
1256 if (revents & EVENT_READ) 1217 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1220 cmd_parse ();
1260 break;
1261 1221
1262 if (revents & EVENT_WRITE) 1222 if (revents & ev::WRITE)
1263 pty_write (); 1223 pty_write ();
1264}
1265 1224
1266void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1267rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1268{ 1230{
1269 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor (); 1232 recolour_cursor ();
1271 1233
1272#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1235 hidden_pointer = 0;
1274 1236
1275 if (option (Opt_pointerBlank)) 1237 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1277#endif 1239#endif
1278} 1240}
1279 1241
1280#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1281void 1243void ecb_cold
1282rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1283{ 1245{
1284 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1285 return; 1247 return;
1286 1248
… …
1288 XFlush (dpy); 1250 XFlush (dpy);
1289 1251
1290 hidden_pointer = 1; 1252 hidden_pointer = 1;
1291} 1253}
1292 1254
1293void 1255void ecb_cold
1294rxvt_term::pointer_cb (time_watcher &w) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1257{
1296 make_current (); 1258 make_current ();
1297 1259
1298 pointer_blank (); 1260 pointer_blank ();
1299} 1261}
… …
1302void 1264void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1265rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1266{
1305 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1306 int x, y; 1268 int x, y;
1269 int code = 32;
1307 1270
1308 x = ev.x; 1271 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1272 y = Pixel2Row (ev.y) + 1;
1310 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 }
1311 1283
1312 if (MEvent.button == AnyButton) 1284 if (MEvent.button == AnyButton)
1313 button_number = 3; 1285 button_number = 3;
1314 else 1286 else
1315 { 1287 {
1316 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1290 if (button_number >= 3)
1319 button_number += (64 - 3); 1291 button_number += 64 - 3;
1320 } 1292 }
1321 1293
1322 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1323 { 1295 {
1324 /* 1296 /*
… …
1356 fputc ('A', stderr); 1328 fputc ('A', stderr);
1357 if (key_state & 32) 1329 if (key_state & 32)
1358 fputc ('2', stderr); 1330 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1332 button_number,
1361 x + 1, 1333 x,
1362 y + 1); 1334 y);
1363#endif 1335#endif
1364 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
1365 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1351 code + button_number + key_state,
1367 (32 + x + 1), 1352 32 + x,
1368 (32 + y + 1)); 1353 32 + y);
1369} 1354}
1370 1355
1371/*{{{ process an X event */ 1356/*{{{ process an X event */
1372void 1357void ecb_hot
1373rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1374{ 1359{
1375 make_current (); 1360 make_current ();
1376 1361
1377 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1475 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1461 focus_out ();
1477 break; 1462 break;
1478 1463
1479 case ConfigureNotify: 1464 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1481 { 1466 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 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 }
1484 1502
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1504 {
1487 seen_resize = 1; 1505 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1507 }
1508 else
1509 {
1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1514 }
1497 1515
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1517 }
1505 break; 1518 break;
1506 1519
1507 case PropertyNotify: 1520 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512
1513 break; 1522 break;
1514 1523
1515 case SelectionClear: 1524 case SelectionClear:
1516 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break;
1518
1519 case SelectionNotify:
1520 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1522 break; 1526 break;
1523 1527
1524 case SelectionRequest: 1528 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1526 break; 1530 break;
1527 1531
1528 case MapNotify: 1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 // This is needed at startup for the case of no window manager
1535 // or a non-reparenting window manager and also because we
1536 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have
1540 // received all of them.
1541 if (!(bg_flags & BG_IS_VALID))
1542 update_background_ev.start (0.025);
1543#endif
1529 mapped = 1; 1544 mapped = 1;
1530#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1546 text_blink_ev.start ();
1532#endif 1547#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1549 break;
1535 1550
1536 case UnmapNotify: 1551 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1540#endif 1555#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1557 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1558
1550 case GraphicsExpose: 1559 case GraphicsExpose:
1551 case Expose: 1560 case Expose:
1552 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1553 { 1562 {
1554 do 1563 do
1564 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1567 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1569
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1571
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1576 }
1564 1577
1565 want_refresh = 1; 1578 want_refresh = 1;
1566 } 1579 }
1567 else 1580 else
1568 { 1581 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1585 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1587 ;
1575 1588
1576 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1590 {
1578 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1579 scrollbar_show (0); 1592 scrollBar.show (0);
1580 } 1593 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1594 }
1587 break; 1595 break;
1588 1596
1589 case MotionNotify: 1597 case MotionNotify:
1590#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1599 if (hidden_pointer)
1592 pointer_unblank (); 1600 pointer_unblank ();
1593#endif 1601#endif
1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1603 || priv_modes & PrivMode_MouseAnyEvent)
1604 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1606 break;
1596 1607
1597 if (ev.xany.window == vt) 1608 if (ev.xany.window == vt)
1598 { 1609 {
… …
1632 int dist; 1643 int dist;
1633 1644
1634 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1636 */ 1647 */
1637 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1650
1640 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1642 */ 1653 */
1643 selection_save_x = ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
… …
1651 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1652 } 1663 }
1653 else 1664 else
1654 { 1665 {
1655 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1656 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1657 } 1668 }
1658 1669
1659 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1660 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1661 + 1; 1672 + 1;
… …
1665 else 1676 else
1666 { 1677 {
1667 /* we are within the text window, so we 1678 /* we are within the text window, so we
1668 * shouldn't be scrolling 1679 * shouldn't be scrolling
1669 */ 1680 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1681 sel_scroll_ev.stop();
1672 } 1682 }
1673#endif 1683#endif
1674#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1675 } 1685 }
1676#endif 1686#endif
1677 } 1687 }
1678 } 1688 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1690 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1683 ; 1693 ;
1684 1694
1685 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1699 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollbar_size ()); 1701 scrollBar.size ());
1692 want_refresh = 1; 1702 want_refresh = 1;
1693 scrollbar_show (1); 1703 scrollBar.show (1);
1694 } 1704 }
1695 break; 1705 break;
1696 } 1706 }
1697 1707
1698#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1700 { 1710 cursor_blink_reset ();
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif 1711#endif
1710 1712
1711#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1715 {
… …
1719 1721
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1722 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1723 pointer_blank ();
1722 } 1724 }
1723#endif 1725#endif
1724}
1725 1726
1726void 1727 refresh_check ();
1728}
1729
1730#if ENABLE_FRILLS
1731void ecb_cold
1732rxvt_term::set_urgency (bool enable)
1733{
1734 if (enable == urgency_hint)
1735 return;
1736
1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1738 {
1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1740 XSetWMHints (dpy, parent, h);
1741 urgency_hint = enable;
1742 XFree (h);
1743 }
1744}
1745#endif
1746
1747void ecb_cold
1727rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1728{ 1749{
1729 if (!focus) 1750 if (!focus)
1730 { 1751 {
1731 focus = 1; 1752 focus = 1;
1732 want_refresh = 1; 1753 want_refresh = 1;
1733 1754
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM 1755#if USE_XIM
1737 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1738 { 1757 {
1739 IMSetPosition (); 1758 im_set_position ();
1740 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1741 } 1760 }
1742#endif 1761#endif
1743#if CURSOR_BLINK 1762#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1764 cursor_blink_ev.again ();
1746#endif 1765#endif
1747#if OFF_FOCUS_FADING 1766#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1767 if (rs[Rs_fade])
1749 { 1768 {
1750 pix_colors = pix_colors_focused; 1769 pix_colors = pix_colors_focused;
1751 scr_recolour (); 1770 scr_recolour ();
1752 } 1771 }
1753#endif 1772#endif
1754#if ENABLE_FRILLS 1773#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1774 if (option (Opt_urgentOnBell))
1756 { 1775 set_urgency (0);
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif 1776#endif
1767 }
1768}
1769 1777
1770void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1771rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1772{ 1784{
1773 if (focus) 1785 if (focus)
1774 { 1786 {
1775 focus = 0; 1787 focus = 0;
1776 want_refresh = 1; 1788 want_refresh = 1;
1777 1789
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1779 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1780#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1795 if (iso14755buf)
1782 { 1796 {
1783 iso14755buf = 0; 1797 iso14755buf = 0;
1784# if ISO_14755 1798# if ISO_14755
… …
1791 XUnsetICFocus (Input_Context); 1805 XUnsetICFocus (Input_Context);
1792#endif 1806#endif
1793#if CURSOR_BLINK 1807#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1808 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1809 cursor_blink_ev.stop ();
1810
1796 hidden_cursor = 0; 1811 hidden_cursor = 0;
1797#endif 1812#endif
1798#if OFF_FOCUS_FADING 1813#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1814 if (rs[Rs_fade])
1800 { 1815 {
1801 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1802 scr_recolour (); 1817 scr_recolour ();
1803 } 1818 }
1804#endif 1819#endif
1805 }
1806}
1807 1820
1808void 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1810{ 1827{
1811#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1813 { 1830 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1834 }
1818#endif 1835#endif
1819} 1836}
1820 1837
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1839void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1841{
1825 make_current (); 1842 make_current ();
1826 1843
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1846 return;
1830 1847
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1848 switch (ev.type)
1833 { 1849 {
1834 case PropertyNotify: 1850 case PropertyNotify:
1835 /* 1851 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1838 */ 1854 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1857 {
1842 1858#if BG_IMAGE_FROM_ROOT
1843 /* FALLTHROUGH */ 1859 bg_set_root_pixmap ();
1844 case ReparentNotify: 1860 update_background ();
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break;
1848 }
1849# endif 1861#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1865 }
1866
1867 break;
1868 }
1869
1870 refresh_check ();
1850} 1871}
1851#endif 1872#endif
1852 1873
1853void 1874void
1854rxvt_term::button_press (XButtonEvent &ev) 1875rxvt_term::button_press (XButtonEvent &ev)
… …
1885 /* save the xbutton state (for ButtonRelease) */ 1906 /* save the xbutton state (for ButtonRelease) */
1886 MEvent.state = ev.state; 1907 MEvent.state = ev.state;
1887#ifdef MOUSE_REPORT_DOUBLECLICK 1908#ifdef MOUSE_REPORT_DOUBLECLICK
1888 if (ev.button == MEvent.button && clickintime) 1909 if (ev.button == MEvent.button && clickintime)
1889 { 1910 {
1890 /* same button, within alloted time */ 1911 /* same button, within allowed time */
1891 MEvent.clicks++; 1912 MEvent.clicks++;
1892 1913
1893 if (MEvent.clicks > 1) 1914 if (MEvent.clicks > 1)
1894 { 1915 {
1895 /* only report double clicks */ 1916 /* only report double clicks */
… …
1909 mouse_report (ev); 1930 mouse_report (ev);
1910 } 1931 }
1911#else 1932#else
1912 MEvent.button = ev.button; 1933 MEvent.button = ev.button;
1913 mouse_report (ev); 1934 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1935#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1936
1916 } 1937 }
1917 else 1938 else
1918 { 1939 {
1919 if (ev.button != MEvent.button) 1940 if (ev.button != MEvent.button)
… …
1967 } 1988 }
1968 1989
1969 /* 1990 /*
1970 * Scrollbar window processing of button press 1991 * Scrollbar window processing of button press
1971 */ 1992 */
1972 if (isScrollbarWindow (ev.window)) 1993 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 1994 {
1974 scrollBar.setIdle (); 1995 page_dirn direction = NO_DIR;
1996
1997 if (scrollBar.upButton (ev.y))
1998 direction = UP; /* up */
1999 else if (scrollBar.dnButton (ev.y))
2000 direction = DN; /* down */
2001
2002 scrollBar.state = SB_STATE_IDLE;
1975 /* 2003 /*
1976 * Rxvt-style scrollbar: 2004 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 2005 * move up if mouse is above slider
1978 * move dn if mouse is below slider 2006 * move dn if mouse is below slider
1979 * 2007 *
… …
1988 /* 2016 /*
1989 * Mouse report disabled scrollbar: 2017 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 2018 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 2019 * click on scrollbar - send pageup/down
1992 */ 2020 */
1993 if ((scrollBar.style == R_SB_NEXT 2021 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 2022 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 2023 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 2024 tt_printf ("\033[B");
2003 else 2025 else
2004 switch (ev.button) 2026 switch (ev.button)
2005 { 2027 {
2006 case Button2: 2028 case Button2:
… …
2013 tt_printf ("\033[5~"); 2035 tt_printf ("\033[5~");
2014 break; 2036 break;
2015 } 2037 }
2016 } 2038 }
2017 else 2039 else
2018#endif /* NO_SCROLLBAR_REPORT */ 2040#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 2041 {
2025 if (scrollbarnext_upButton (ev.y)) 2042 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 2043 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2045 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2046 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2047#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2048 if (scr_page (direction, 1))
2043 { 2049 {
2044 if (upordown < 0) 2050 if (direction == UP)
2045 scrollBar.setUp (); 2051 scrollBar.state = SB_STATE_UP;
2046 else 2052 else
2047 scrollBar.setDn (); 2053 scrollBar.state = SB_STATE_DOWN;
2048 } 2054 }
2049 } 2055 }
2050 else 2056 else
2051 switch (ev.button) 2057 switch (ev.button)
2052 { 2058 {
2053 case Button2: 2059 case Button2:
2054 switch (scrollbar_align) 2060 switch (scrollBar.align)
2055 { 2061 {
2056 case R_SB_ALIGN_TOP: 2062 case SB_ALIGN_TOP:
2057 csrO = 0; 2063 csrO = 0;
2058 break; 2064 break;
2059 case R_SB_ALIGN_CENTRE: 2065 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2066 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2067 break;
2062 case R_SB_ALIGN_BOTTOM: 2068 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2070 break;
2065 } 2071 }
2066 2072
2067 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2074 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2075 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2076 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2077
2072 scrollBar.setMotion (); 2078 scrollBar.state = SB_STATE_MOTION;
2073 break; 2079 break;
2074 2080
2075 case Button1: 2081 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2082 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2083 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2084 /* FALLTHROUGH */
2079 2085
2080 case Button3: 2086 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2088 {
2083 if (scrollbar_above_slider (ev.y)) 2089 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2091 scr_page (UP, nrow - 1);
2086# else 2092# else
2087 scr_page (UP, nrow / 4); 2093 scr_page (UP, nrow / 4);
2088# endif 2094# endif
2089 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2097 scr_page (DN, nrow - 1);
2092# else 2098# else
2093 scr_page (DN, nrow / 4); 2099 scr_page (DN, nrow / 4);
2094# endif 2100# endif
2095 else 2101 else
2096 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2097 } 2103 }
2098 else 2104 else
2099 { 2105 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2107 (nrow
2102 * scrollbar_position (ev.y) 2108 * scrollBar.position (ev.y)
2103 / scrollbar_size ())); 2109 / scrollBar.size ()));
2104 } 2110 }
2105 2111
2106 break; 2112 break;
2107 } 2113 }
2108 } 2114 }
… …
2118 2124
2119 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2126 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2128
2123 if (scrollbar_isUpDn ()) 2129 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2130 {
2125 scrollBar.setIdle (); 2131 scrollBar.state = SB_STATE_IDLE;
2126 scrollbar_show (0); 2132 scrollBar.show (0);
2127 } 2133 }
2128 2134
2129#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2136 sel_scroll_ev.stop();
2132#endif 2137#endif
2133 2138
2134 if (ev.window == vt) 2139 if (ev.window == vt)
2135 { 2140 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2141 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2160 mouse_report (ev); 2165 mouse_report (ev);
2161 } 2166 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2167#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2168 MEvent.button = AnyButton;
2164 mouse_report (ev); 2169 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2170#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2171 return;
2167 } 2172 }
2168 2173
2169 /* 2174 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2175 * dumb hack to compensate for the failure of click-and-drag
… …
2181 case Button3: 2186 case Button3:
2182 selection_make (ev.time); 2187 selection_make (ev.time);
2183 break; 2188 break;
2184 2189
2185 case Button2: 2190 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2191 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2192 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2193 break;
2189 2194
2190#ifdef MOUSE_WHEEL 2195#ifdef MOUSE_WHEEL
2191 case Button4: 2196 case Button4:
2192 case Button5: 2197 case Button5:
… …
2208 { 2213 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2214 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2215 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2216 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2217
2213 if (slip_wheel_ev.at < NOW) 2218 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2220 }
2218 else 2221 else
2222# endif
2219 { 2223 {
2220# endif
2221 scr_page (v, i); 2224 scr_page (v, i);
2222 scrollbar_show (1); 2225 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2226 }
2225# endif
2226 } 2227 }
2227 break; 2228 break;
2228#endif 2229#endif
2229 } 2230 }
2230 } 2231 }
2231} 2232}
2232 2233
2233/*}}} */ 2234/*}}} */
2234 2235
2235bool 2236void ecb_hot
2236rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2237{ 2238{
2238 bool flag = false;
2239 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2240 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2241 2241
2242 for (;;) 2242 for (;;)
2243 { 2243 {
2244 if (ch == NOCHAR) 2244 if (ecb_unlikely (ch == NOCHAR))
2245 { 2245 {
2246 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2247 ch = next_char (); 2247 ch = next_char ();
2248 2248
2249 if (ch == NOCHAR) 2249 if (ch == NOCHAR)
2250 break; 2250 break;
2251 } 2251 }
2252 2252
2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2253 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2254 { 2254 {
2255 if (!seen_input) 2255 if (ecb_unlikely (!seen_input))
2256 { 2256 {
2257 seen_input = 1; 2257 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition: 2258 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler. 2259 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs 2260 // some window managers resize the window early, and these programs
… …
2273 wchar_t *str = buf; 2273 wchar_t *str = buf;
2274 wchar_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2275 2275
2276 for (;;) 2276 for (;;)
2277 { 2277 {
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2278 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2279 break; 2279 break;
2280 2280
2281 *str++ = ch; 2281 *str++ = ch;
2282 2282
2283 if (ch == C0_LF || str >= eol) 2283 if (ecb_unlikely (ch == C0_LF || str >= eol))
2284 { 2284 {
2285 if (ch == C0_LF) 2285 if (ch == C0_LF)
2286 nlines++; 2286 nlines++;
2287 2287
2288 refresh_count++; 2288 refresh_count++;
2289 2289
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2291 {
2292 refresh_count = 0; 2292 refresh_count = 0;
2293 2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2294 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2295 {
2296 refreshnow = true; 2296 refreshnow = true;
2297 ch = NOCHAR; 2297 ch = NOCHAR;
2298 break; 2298 break;
2299 } 2299 }
… …
2337 * What the heck we'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2338 * if skipScroll is enabled. 2338 * if skipScroll is enabled.
2339 */ 2339 */
2340 if (refreshnow) 2340 if (refreshnow)
2341 { 2341 {
2342 flag = true;
2343 scr_refresh (); 2342 scr_refresh ();
2344 want_refresh = 1; 2343 want_refresh = 1;
2345 } 2344 }
2346
2347 } 2345 }
2348 else 2346 else
2349 { 2347 {
2350 try 2348 try
2351 { 2349 {
… …
2359 } 2357 }
2360 2358
2361 ch = NOCHAR; 2359 ch = NOCHAR;
2362 } 2360 }
2363 } 2361 }
2364
2365 return flag;
2366} 2362}
2367 2363
2368// read the next character 2364// read the next character
2369wchar_t 2365wchar_t ecb_hot
2370rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2371{ 2367{
2372 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2373 { 2369 {
2374 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2376 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2377 2373
2378 wchar_t wc; 2374 wchar_t wc;
2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2375 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2380 2376
… …
2384 cmdbuf_ptr = cmdbuf_endp; 2380 cmdbuf_ptr = cmdbuf_endp;
2385 break; 2381 break;
2386 } 2382 }
2387 2383
2388 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2385 {
2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2390 }
2390 2391
2391 // assume wchar == unicode 2392 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2393 return wc & UNICODE_MASK; 2394 return wc & UNICODE_MASK;
2394 } 2395 }
2395 2396
2396 return NOCHAR; 2397 return NOCHAR;
2397} 2398}
2398 2399
2399// read the next octet 2400// read the next octet
2400uint32_t 2401uint32_t ecb_hot
2401rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2402{ 2403{
2403 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR; 2406 : NOCHAR;
2406} 2407}
2407 2408
2408static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2409 2410
2410/* rxvt_cmd_getc () - Return next input character */ 2411wchar_t ecb_hot
2411/*
2412 * Return the next input character after first passing any keyboard input
2413 * to the command.
2414 */
2415wchar_t
2416rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2417{ 2413{
2418 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2419 2415
2420 if (c == NOCHAR) 2416 if (c == NOCHAR)
2421 throw out_of_input; 2417 throw out_of_input;
2422 2418
2423 return c; 2419 return c;
2424} 2420}
2425 2421
2426uint32_t 2422uint32_t ecb_hot
2427rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2428{ 2424{
2429 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2430 2426
2431 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2435} 2431}
2436 2432
2437/*{{{ print pipe */ 2433/*{{{ print pipe */
2438/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2439#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2440FILE * 2436FILE * ecb_cold
2441rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2442{ 2438{
2443 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2444 2440
2445 if (stream == NULL) 2441 if (stream == NULL)
2446 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2447 2443
2448 return stream; 2444 return stream;
2449} 2445}
2450 2446
2451int 2447int ecb_cold
2452rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2453{ 2449{
2454 fflush (stream); 2450 fflush (stream);
2455 return pclose (stream); 2451 return pclose (stream);
2456} 2452}
2457 2453
2458/* 2454/*
2459 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2460 */ 2456 */
2461void 2457void ecb_cold
2462rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2463{ 2459{
2464 int done; 2460 FILE *fd = popen_printer ();
2465 FILE *fd;
2466 2461
2467 if ((fd = popen_printer ()) == NULL) 2462 if (!fd)
2468 return; 2463 return;
2469 2464
2470 /* 2465 /*
2471 * Send all input to the printer until either ESC[4i or ESC[?4i 2466 * Send all input to the printer until either ESC[4i or ESC[?4i
2472 * is received. 2467 * is received.
2473 */ 2468 */
2474 for (done = 0; !done;) 2469 for (int done = 0; !done; )
2475 { 2470 {
2476 unsigned char buf[8]; 2471 unsigned char buf[8];
2477 unicode_t ch; 2472 unicode_t ch;
2478 unsigned int i, len; 2473 unsigned int i, len;
2479 2474
… …
2510 } 2505 }
2511 } 2506 }
2512 2507
2513 pclose_printer (fd); 2508 pclose_printer (fd);
2514} 2509}
2515#endif /* PRINTPIPE */ 2510#endif /* PRINTPIPE */
2516/*}}} */ 2511/*}}} */
2517 2512
2518/* *INDENT-OFF* */
2519enum { 2513enum {
2520 C1_40 = 0x40, 2514 C1_40 = 0x40,
2521 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2515 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2522 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2516 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2523 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2524 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2525}; 2519};
2526/* *INDENT-ON* */
2527 2520
2528/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2529void 2522void ecb_hot
2530rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2531{ 2524{
2532 switch (ch) 2525 switch (ch)
2533 { 2526 {
2534 case C0_ESC: 2527 case C0_ESC:
… …
2580} 2573}
2581/*}}} */ 2574/*}}} */
2582 2575
2583 2576
2584/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2585void 2578void ecb_cold
2586rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2587{ 2580{
2588 int row, col; 2581 int row, col;
2589 2582
2590 switch (ch) 2583 switch (ch)
… …
2624 break; 2617 break;
2625 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627 break; 2620 break;
2628 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2629 PrivMode (0, PrivMode_vt52); 2622 priv_modes &= ~PrivMode_vt52;
2630 break; 2623 break;
2631 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2632 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2633 /* unimplemented */ 2626 /* unimplemented */
2634 break; 2627 break;
… …
2640} 2633}
2641/*}}} */ 2634/*}}} */
2642 2635
2643 2636
2644/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2645void 2638void ecb_hot
2646rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2647{ 2640{
2648 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2649 2642
2650 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2653 return; 2646 return;
2654 } 2647 }
2655 2648
2656 switch (ch) 2649 switch (ch)
2657 { 2650 {
2658 /* case 1: do_tek_mode (); break; */
2659 case '#': 2651 case '#':
2660 if (cmd_getc () == '8') 2652 if (cmd_getc () == '8')
2661 scr_E (); 2653 scr_E ();
2662 break; 2654 break;
2663 case '(': 2655 case '(':
… …
2686#if !ENABLE_MINIMAL 2678#if !ENABLE_MINIMAL
2687 case '9': 2679 case '9':
2688 scr_forwardindex (); 2680 scr_forwardindex ();
2689 break; 2681 break;
2690#endif 2682#endif
2683 // DECPAM/DECPNM
2691 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2692 case '>': 2687 case '>':
2693 PrivMode ((ch == '='), PrivMode_aplKP); 2688 priv_modes &= ~PrivMode_aplKP;
2694 break; 2689 break;
2695 2690
2696 case C1_40: 2691 case C1_40:
2697 cmd_getc (); 2692 cmd_getc ();
2698 break; 2693 break;
… …
2702 2697
2703 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2705 { 2700 {
2706 wchar_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2708 } 2703 }
2709 break; 2704 break;
2710 2705
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
2713 process_graphics (); 2708 // used by original rxvt for rob nations own graphics mode
2709 if (cmd_getc () == 'Q')
2710 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2714 break; 2711 break;
2715 2712
2716 /* 8.3.63: CHARACTER TABULATION SET */ 2713 /* 8.3.63: CHARACTER TABULATION SET */
2717 case C1_HTS: /* ESC H */ 2714 case C1_HTS: /* ESC H */
2718 scr_set_tab (1); 2715 scr_set_tab (1);
… …
2722 case C1_RI: /* ESC M */ 2719 case C1_RI: /* ESC M */
2723 scr_index (DN); 2720 scr_index (DN);
2724 break; 2721 break;
2725 2722
2726 /* 8.3.142: SINGLE-SHIFT TWO */ 2723 /* 8.3.142: SINGLE-SHIFT TWO */
2727 /*case C1_SS2: scr_single_shift (2); break; */ 2724 /* case C1_SS2: break; */
2728 2725
2729 /* 8.3.143: SINGLE-SHIFT THREE */ 2726 /* 8.3.143: SINGLE-SHIFT THREE */
2730 /*case C1_SS3: scr_single_shift (3); break; */ 2727 /* case C1_SS3: break; */
2731 2728
2732 /* 8.3.27: DEVICE CONTROL STRING */ 2729 /* 8.3.27: DEVICE CONTROL STRING */
2733 case C1_DCS: /* ESC P */ 2730 case C1_DCS: /* ESC P */
2734 process_dcs_seq (); 2731 process_dcs_seq ();
2735 break; 2732 break;
… …
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2734 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2735 case C1_SCI: /* ESC Z */
2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2736 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 break; /* steal obsolete ESC [ c */ 2737 break; /* steal obsolete ESC [ c */
2741 2738
2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2739 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2743 case C1_CSI: /* ESC [ */ 2740 case C1_CSI: /* ESC [ */
2744 process_csi_seq (); 2741 process_csi_seq ();
2745 break; 2742 break;
2746 2743
2747 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2744 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2748 case C1_OSC: /* ESC ] */ 2745 case C1_OSC: /* ESC ] */
2749 process_osc_seq (); 2746 process_osc_seq ();
2750 break; 2747 break;
2751 2748
2752 /* 8.3.106: RESET TO INITIAL STATE */ 2749 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2753 case 'c': 2750 case 'c':
2754 mbstate.reset (); 2751 mbstate.reset ();
2755 scr_poweron (); 2752 scr_poweron ();
2756 scrollbar_show (1); 2753 scrollBar.show (1);
2757 break; 2754 break;
2758 2755
2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2756 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2760 case 'n': 2757 case 'n':
2761 scr_charset_choose (2); 2758 scr_charset_choose (2);
… …
2768 } 2765 }
2769} 2766}
2770/*}}} */ 2767/*}}} */
2771 2768
2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2769/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2773/* *INDENT-OFF* */
2774enum { 2770enum {
2775 CSI_ICH = 0x40, 2771 CSI_ICH = 0x40,
2776 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2772 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2777 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2773 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2778 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2774 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2777 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2782 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2778 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2783 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2779 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2784}; 2780};
2785 2781
2786#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2782#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2787 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2783 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2788 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2784 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2789#define get_byte_array_bit(array, bit) \ 2785#define get_byte_array_bit(array, bit) \
2790 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2786 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2791 2787
2792const unsigned char csi_defaults[] = 2788static const unsigned char csi_defaults[] =
2793 { 2789 {
2794 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2790 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2795 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2791 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2796 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2792 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2797 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2793 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2798 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2794 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2799 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2800 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 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), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2802 }; 2798 };
2803/* *INDENT-ON* */
2804 2799
2805void 2800void ecb_hot
2806rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2807{ 2802{
2808 unicode_t ch, priv, i; 2803 unicode_t ch, priv, i;
2809 unsigned int nargs, p; 2804 unsigned int nargs, p;
2810 int n, ndef; 2805 int n, ndef;
2811 int arg[ESC_ARGS]; 2806 int arg[ESC_ARGS] = { };
2812 2807
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2808 nargs = 0;
2815 2809
2816 priv = 0; 2810 priv = 0;
2817 ch = cmd_getc (); 2811 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2812 if ((ch >= '<' && ch <= '?') || ch == '!')
2813 {
2819 { /* '<' '=' '>' '?' */ 2814 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2815 priv = ch;
2821 ch = cmd_getc (); 2816 ch = cmd_getc ();
2822 } 2817 }
2823 2818
2824 /* read any numerical arguments */ 2819 /* read any numerical arguments */
… …
2867 { 2862 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2863 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2864 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2865 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2866 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2867 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2868 // versions.
2874 // 2869 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2870 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2871 }
2877 break; 2872 break;
2873
2878 case '?': 2874 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2875 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2876 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2877 break;
2878
2879 case '!':
2880 if (ch == CSI_70)
2881 {
2882 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2883 scr_soft_reset ();
2884
2885 static const int pm_h[] = { 7, 25 };
2886 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2887
2888 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2889 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2882 } 2890 }
2891 break;
2892 }
2893
2883 return; 2894 return;
2884 } 2895 }
2885 2896
2886 switch (ch) 2897 switch (ch)
2887 { 2898 {
… …
2901 } 2912 }
2902 break; 2913 break;
2903#endif 2914#endif
2904 2915
2905 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2916 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2906 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2917 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2907 arg[0] = -arg[0]; 2918 arg[0] = -arg[0];
2908 /* FALLTHROUGH */ 2919 /* FALLTHROUGH */
2909 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2920 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2910 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2921 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2911 scr_gotorc (arg[0], 0, RELATIVE); 2922 scr_gotorc (arg[0], 0, RELATIVE);
2912 break; 2923 break;
2913 2924
2914 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2925 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2915 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2926 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3102 } 3113 }
3103} 3114}
3104/*}}} */ 3115/*}}} */
3105 3116
3106#if !ENABLE_MINIMAL 3117#if !ENABLE_MINIMAL
3107/* ARGSUSED */
3108void 3118void
3109rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3110{ 3120{
3111 int x, y; 3121 int x, y;
3112 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
… …
3121 { 3131 {
3122 /* 3132 /*
3123 * commands 3133 * commands
3124 */ 3134 */
3125 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3126 XMapWindow (dpy, parent[0]); 3136 XMapWindow (dpy, parent);
3127 break; 3137 break;
3128 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3129 XIconifyWindow (dpy, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent, display->screen);
3130 break; 3140 break;
3131 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3132 XMoveWindow (dpy, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent, args[1], args[2]);
3133 break; 3143 break;
3134 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3136 break; 3146 break;
3137 case 5: /* raise window */ 3147 case 5: /* raise window */
3138 XRaiseWindow (dpy, parent[0]); 3148 XRaiseWindow (dpy, parent);
3139 break; 3149 break;
3140 case 6: /* lower window */ 3150 case 6: /* lower window */
3141 XLowerWindow (dpy, parent[0]); 3151 XLowerWindow (dpy, parent);
3142 break; 3152 break;
3143 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3144 scr_touch (true); 3154 scr_touch (true);
3145 break; 3155 break;
3146 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3149 break; 3159 break;
3150 3160
3151 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3152 default: 3162 default:
3153 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3154 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3155 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3156 break; 3166 break;
3157 3167
3158 /* 3168 /*
3159 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3160 */ 3170 */
3161 case 11: /* report window state */ 3171 case 11: /* report window state */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3164 break; 3174 break;
3165 case 13: /* report window position */ 3175 case 13: /* report window position */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent, &wattr);
3167 XTranslateCoordinates (dpy, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent, wattr.root,
3168 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3169 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3170 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3171 break; 3181 break;
3172 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3173 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3175 break; 3185 break;
3176 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3177 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3178 break; 3188 break;
… …
3180 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3181 break; 3191 break;
3182 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3183 { 3193 {
3184 char *s; 3194 char *s;
3185 XGetIconName (dpy, parent[0], &s); 3195 XGetIconName (dpy, parent, &s);
3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3187 XFree (s); 3197 XFree (s);
3188 } 3198 }
3189 break; 3199 break;
3190 case 21: /* report window title */ 3200 case 21: /* report window title */
3191 { 3201 {
3192 char *s; 3202 char *s;
3193 XFetchName (dpy, parent[0], &s); 3203 XFetchName (dpy, parent, &s);
3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3205 XFree (s);
3196 } 3206 }
3197 break; 3207 break;
3198 } 3208 }
… …
3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3255 */ 3265 */
3256void 3266void
3257rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3258{ 3268{
3259 char *s;
3260 unicode_t eh;
3261
3262 /* 3269 /*
3263 * Not handled yet 3270 * Not handled yet
3264 */ 3271 */
3272
3273 unicode_t eh;
3265 s = get_to_st (eh); 3274 char *s = get_to_st (eh);
3266 if (s) 3275 if (s)
3267 free (s); 3276 free (s);
3268 3277
3269 return; 3278 return;
3270} 3279}
… …
3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3283 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3275 */ 3284 */
3276void 3285void
3277rxvt_term::process_osc_seq () 3286rxvt_term::process_osc_seq ()
3278{ 3287{
3279 unicode_t ch, eh;
3280 int arg; 3288 int arg;
3281 3289
3282 ch = cmd_getc (); 3290 unicode_t ch = cmd_getc ();
3283 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3291 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3284 arg = arg * 10 + (ch - '0'); 3292 arg = arg * 10 + (ch - '0');
3285 3293
3286 if (ch == ';') 3294 if (ch == ';')
3287 { 3295 {
3296 unicode_t eh;
3288 char *s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3289 3298
3290 if (s) 3299 if (s)
3291 { 3300 {
3292 process_xterm_seq (arg, s, eh); 3301 process_xterm_seq (arg, s, eh);
… …
3316 3325
3317/* 3326/*
3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3327 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3319 */ 3328 */
3320void 3329void
3321rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3330rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3331{
3323 int color; 3332 int color;
3324 char *buf, *name; 3333 char *buf, *name;
3325 bool query = str[0] == '?' && !str[1]; 3334 bool query = str[0] == '?' && !str[1];
3326 int saveop = op; 3335 int saveop = op;
… …
3353 unsigned long bytes_after; 3362 unsigned long bytes_after;
3354 unsigned char *value = 0; 3363 unsigned char *value = 0;
3355 const char *str = ""; 3364 const char *str = "";
3356 3365
3357 if (prop 3366 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3367 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3368 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3369 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3370 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3371 && actual_type != None
3363 && actual_format == 8) 3372 && actual_format == 8)
… …
3367 3376
3368 XFree (value); 3377 XFree (value);
3369 } 3378 }
3370 else 3379 else
3371 { 3380 {
3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3381 char *eq = strchr (str, '=');
3373 3382
3374 if (eq) 3383 if (eq)
3375 { 3384 {
3376 *eq = 0; 3385 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3386 set_utf8_property (display->atom (str), eq + 1);
3378 } 3387 }
3379 else 3388 else
3380 XDeleteProperty (dpy, parent[0], 3389 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3390 display->atom (str));
3382 } 3391 }
3383 break; 3392 break;
3384 3393
3385 case XTerm_Color: 3394 case XTerm_Color:
… …
3398 *buf++ = '\0'; 3407 *buf++ = '\0';
3399 3408
3400 process_color_seq (op, color, name, resp); 3409 process_color_seq (op, color, name, resp);
3401 } 3410 }
3402 break; 3411 break;
3412 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3413 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3405 break; 3415 break;
3416 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3417 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3418 process_color_seq (op, Color_bg, str, resp);
3408 break; 3419 break;
3409#ifndef NO_CURSORCOLOR 3420#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3421 case XTerm_Color_cursor:
… …
3415 process_color_seq (op, Color_pointer_fg, str, resp); 3426 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break; 3427 break;
3417 case XTerm_Color_pointer_bg: 3428 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp); 3429 process_color_seq (op, Color_pointer_bg, str, resp);
3419 break; 3430 break;
3431#ifdef OPTION_HC
3432 case XTerm_Color_HC:
3433 process_color_seq (op, Color_HC, str, resp);
3434 break;
3435 case XTerm_Color_HTC:
3436 process_color_seq (op, Color_HTC, str, resp);
3437 break;
3438#endif
3420#ifndef NO_BOLD_UNDERLINE_REVERSE 3439#ifndef NO_BOLD_UNDERLINE_REVERSE
3421 case XTerm_Color_RV:
3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD: 3440 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp); 3441 process_color_seq (op, Color_BD, str, resp);
3427 break; 3442 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL: 3443 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp); 3444 process_color_seq (op, Color_UL, str, resp);
3431 break; 3445 break;
3432 case URxvt_Color_IT: 3446 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3447 process_color_seq (op, Color_IT, str, resp);
3434 break; 3448 break;
3435#endif 3449#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3450 case URxvt_Color_border:
3451 process_color_seq (op, Color_border, str, resp);
3452 break;
3453
3454#if BG_IMAGE_FROM_ROOT
3437 case URxvt_Color_tint: 3455 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3456 process_color_seq (op, Color_tint, str, resp);
3457 {
3458 bool changed = false;
3439 3459
3440 check_our_parents (); 3460 if (ISSET_PIXCOLOR (Color_tint))
3461 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3441 3462
3442 if (am_transparent) 3463 if (changed)
3443 want_full_refresh = want_refresh = 1; 3464 update_background ();
3465 }
3444 3466
3445 break; 3467 break;
3446#endif 3468#endif
3447 3469
3448#if XPM_BACKGROUND 3470#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?"))
3450 { 3473 {
3474 char str[256];
3475 int h_scale = fimage.h_scale;
3476 int v_scale = fimage.v_scale;
3477 int h_align = fimage.h_align;
3478 int v_align = fimage.v_align;
3479
3480 sprintf (str, "[%dx%d+%d+%d]",
3481 h_scale, v_scale,
3482 h_align, v_align);
3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3484 }
3485 else
3486 {
3487 bool changed = false;
3488
3451 if (*str != ';') 3489 if (*str != ';')
3452 { 3490 {
3453 scale_pixmap (""); /* reset to default scaling */ 3491 try
3454 set_bgPixmap (str); /* change pixmap */ 3492 {
3455 scr_touch (true); 3493 fimage.set_file_geometry (this, str);
3494 changed = true;
3495 }
3496 catch (const class rxvt_failure_exception &e)
3497 {
3498 }
3456 } 3499 }
3457 3500 else
3458 int changed = 0;
3459
3460 while ((str = strchr (str, ';')) != NULL)
3461 { 3501 {
3462 str++; 3502 str++;
3463 changed += scale_pixmap (str); 3503 if (fimage.set_geometry (str, true))
3504 changed = true;
3464 } 3505 }
3465 3506
3466 if (changed) 3507 if (changed)
3467 { 3508 {
3468 resize_pixmap (); 3509 if (bg_window_position_sensitive ())
3469 scr_touch (true); 3510 {
3511 int x, y;
3512 get_window_origin (x, y);
3513 parent_x = x;
3514 parent_y = y;
3515 }
3516 update_background ();
3470 } 3517 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 } 3518 }
3476 break; 3519 break;
3477#endif 3520#endif
3478
3479 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str);
3481 break;
3482 case Rxvt_restoreBG:
3483 set_window_color (Color_bg, str);
3484 break;
3485 3521
3486 case XTerm_logfile: 3522 case XTerm_logfile:
3487 // TODO, when secure mode? 3523 // TODO, when secure mode?
3488 break; 3524 break;
3489 3525
… …
3556 break; 3592 break;
3557#endif 3593#endif
3558 3594
3559#if ENABLE_PERL 3595#if ENABLE_PERL
3560 case URxvt_perl: 3596 case URxvt_perl:
3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3597 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3562 ; // no responses yet
3563 break; 3598 break;
3564#endif 3599#endif
3565 } 3600 }
3566} 3601}
3567/*----------------------------------------------------------------------*/ 3602/*----------------------------------------------------------------------*/
… …
3574 * 's' = save 3609 * 's' = save
3575 * 'r' = restore 3610 * 'r' = restore
3576 * 't' = toggle 3611 * 't' = toggle
3577 * so no need for fancy checking 3612 * so no need for fancy checking
3578 */ 3613 */
3579int 3614int ecb_cold
3580rxvt_term::privcases (int mode, unsigned long bit) 3615rxvt_term::privcases (int mode, unsigned long bit)
3581{ 3616{
3582 int state; 3617 int state;
3583 3618
3584 if (mode == 's') 3619 if (mode == 's')
3585 { 3620 {
3586 SavedModes |= (priv_modes & bit); 3621 if (priv_modes & bit)
3622 SavedModes |= bit;
3623 else
3624 SavedModes &= ~bit;
3587 return -1; 3625 return -1;
3588 } 3626 }
3589 else 3627 else
3590 { 3628 {
3591 if (mode == 'r') 3629 if (mode == 'r')
3592 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3630 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593 else 3631 else
3594 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3632 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595 PrivMode (state, bit); 3633
3634 if (state)
3635 priv_modes |= bit;
3636 else
3637 priv_modes &= ~bit;
3596 } 3638 }
3597 3639
3598 return state; 3640 return state;
3599} 3641}
3600 3642
3601/* we're not using priv _yet_ */ 3643/* we're not using priv _yet_ */
3602void 3644void
3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3645rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3604{ 3646{
3605 unsigned int i, j; 3647 unsigned int i, j;
3606 int state; 3648 int state;
3607 3649
3608 static const struct 3650 static const struct
3609 { 3651 {
3610 const int argval; 3652 const int argval;
3611 const unsigned long bit; 3653 const unsigned long bit;
3612 }
3613
3614 argtopriv[] = { 3654 } argtopriv[] = {
3615 { 1, PrivMode_aplCUR }, 3655 { 1, PrivMode_aplCUR }, // DECCKM
3616 { 2, PrivMode_vt52 }, 3656 { 2, PrivMode_vt52 }, // DECANM
3617 { 3, PrivMode_132 }, 3657 { 3, PrivMode_132 }, // DECCOLM
3618 { 4, PrivMode_smoothScroll }, 3658 { 4, PrivMode_smoothScroll }, // DECSCLM
3619 { 5, PrivMode_rVideo }, 3659 { 5, PrivMode_rVideo }, // DECSCNM
3620 { 6, PrivMode_relOrigin }, 3660 { 6, PrivMode_relOrigin }, // DECOM
3621 { 7, PrivMode_Autowrap }, 3661 { 7, PrivMode_Autowrap }, // DECAWM
3622 // 8, bi-directional support mode 3662 // 8, auto-repeat keys // DECARM
3623 { 9, PrivMode_MouseX10 }, 3663 { 9, PrivMode_MouseX10 },
3624 // 18, 19 printing-related 3664 // 18 end FF to printer after print screen
3665 // 19 Print screen prints full screen/scroll region
3625 { 25, PrivMode_VisibleCursor }, 3666 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3626#ifdef scrollBar_esc 3667#ifdef scrollBar_esc
3627 { scrollBar_esc, PrivMode_scrollBar }, 3668 { scrollBar_esc, PrivMode_scrollBar },
3628#endif 3669#endif
3629 { 35, PrivMode_ShiftKeys }, // rxvt extension 3670 { 35, PrivMode_ShiftKeys }, // rxvt extension
3671 // 38, tektronix mode // DECTEK
3630 { 40, PrivMode_132OK }, 3672 { 40, PrivMode_132OK },
3631 // 41 xterm more fixes NYI 3673 // 41 xterm more fixes NYI
3632 // 45 margin bell NYI 3674 // 45 margin bell NYI
3633 // 46 start logging 3675 // 46 start logging
3634 { 47, PrivMode_Screen }, 3676 { 47, PrivMode_Screen },
3635 { 66, PrivMode_aplKP }, 3677 { 66, PrivMode_aplKP }, // DECNKM
3636#ifndef NO_BACKSPACE_KEY 3678#ifndef NO_BACKSPACE_KEY
3637 { 67, PrivMode_BackSpace }, 3679 { 67, PrivMode_BackSpace }, // DECBKM
3638#endif 3680#endif
3639 { 1000, PrivMode_MouseX11 }, 3681 { 1000, PrivMode_MouseX11 },
3640 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3682 { 1002, PrivMode_MouseBtnEvent },
3641 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3683 { 1003, PrivMode_MouseAnyEvent },
3642 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3684#if ENABLE_FRILLS
3685 { 1005, PrivMode_ExtModeMouse },
3686#endif
3643 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3687 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3644 { 1011, PrivMode_Keypress }, // rxvt extension 3688 { 1011, PrivMode_Keypress }, // rxvt extension
3689#if ENABLE_FRILLS
3690 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3691#endif
3645 // 1035 enable modifiers for alt, numlock NYI 3692 // 1035 enable modifiers for alt, numlock NYI
3646 // 1036 send ESC for meta keys NYI 3693 // 1036 send ESC for meta keys NYI
3647 // 1037 send DEL for keypad delete NYI 3694 // 1037 send DEL for keypad delete NYI
3648 { 1047, PrivMode_Screen }, 3695 { 1047, PrivMode_Screen },
3649 // 1048 save and restore cursor 3696 // 1048 save and restore cursor, implemented in code
3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3697 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3698 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3699 { 2004, PrivMode_BracketPaste },
3652 }; 3700 };
3653 3701
3654 if (nargs == 0) 3702 if (nargs == 0)
3655 return; 3703 return;
3656 3704
… …
3663 for (i = 0; i < nargs; i++) 3711 for (i = 0; i < nargs; i++)
3664 { 3712 {
3665 state = -1; 3713 state = -1;
3666 3714
3667 /* basic handling */ 3715 /* basic handling */
3668 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3716 for (j = 0; j < ecb_array_length (argtopriv); j++)
3669 if (argtopriv[j].argval == arg[i]) 3717 if (argtopriv[j].argval == arg[i])
3670 { 3718 {
3671 state = privcases (mode, argtopriv[j].bit); 3719 state = privcases (mode, argtopriv[j].bit);
3672 break; 3720 break;
3673 } 3721 }
… …
3681 3729
3682 scr_touch (true); 3730 scr_touch (true);
3683 break; 3731 break;
3684#endif 3732#endif
3685 case 1048: /* alternative cursor save */ 3733 case 1048: /* alternative cursor save */
3686 case 1049:
3687 if (option (Opt_secondaryScreen)) 3734 if (option (Opt_secondaryScreen))
3688 if (mode == 0) 3735 if (mode == 0)
3689 scr_cursor (RESTORE); 3736 scr_cursor (RESTORE);
3690 else if (mode == 1) 3737 else if (mode == 1)
3691 scr_cursor (SAVE); 3738 scr_cursor (SAVE);
… …
3700 case 2: /* VT52 mode */ 3747 case 2: /* VT52 mode */
3701 /* oddball mode. should be set regardless of set/reset 3748 /* oddball mode. should be set regardless of set/reset
3702 * parameter. Return from VT52 mode with an ESC < from 3749 * parameter. Return from VT52 mode with an ESC < from
3703 * within VT52 mode 3750 * within VT52 mode
3704 */ 3751 */
3705 PrivMode (1, PrivMode_vt52); 3752 priv_modes |= PrivMode_vt52;
3706 break; 3753 break;
3707 case 3: /* 80/132 */ 3754 case 3: /* 80/132 */
3708 if (priv_modes & PrivMode_132OK) 3755 if (priv_modes & PrivMode_132OK)
3709 set_widthheight (((state ? 132 : 80) * fwidth), height); 3756 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3710 break; 3757 break;
3711 case 4: /* smooth scrolling */ 3758 case 4: /* smooth scrolling */
3712 set_option (Opt_jumpScroll, !state); 3759 set_option (Opt_jumpScroll, !state);
3713 break; 3760 break;
3714 case 5: /* reverse video */ 3761 case 5: /* reverse video */
… …
3721 scr_autowrap (state); 3768 scr_autowrap (state);
3722 break; 3769 break;
3723 /* case 8: - auto repeat, can't do on a per window basis */ 3770 /* case 8: - auto repeat, can't do on a per window basis */
3724 case 9: /* X10 mouse reporting */ 3771 case 9: /* X10 mouse reporting */
3725 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
3726 priv_modes &= ~PrivMode_MouseX11; 3773 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3727 break; 3774 break;
3728#ifdef scrollBar_esc 3775#ifdef scrollBar_esc
3729 case scrollBar_esc: 3776 case scrollBar_esc:
3730 if (scrollbar_mapping (state)) 3777 scrollBar.map (state);
3731 {
3732 resize_all_windows (0, 0, 0); 3778 resize_all_windows (0, 0, 0);
3733 scr_touch (true); 3779 scr_touch (true);
3734 }
3735 break; 3780 break;
3736#endif 3781#endif
3737 case 25: /* visible/invisible cursor */ 3782 case 25: /* visible/invisible cursor */
3738 scr_cursor_visible (state); 3783 scr_cursor_visible (state);
3739 break; 3784 break;
… …
3744 break; 3789 break;
3745 /* case 66: - application key pad */ 3790 /* case 66: - application key pad */
3746 /* case 67: - backspace key */ 3791 /* case 67: - backspace key */
3747 case 1000: /* X11 mouse reporting */ 3792 case 1000: /* X11 mouse reporting */
3748 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
3749 priv_modes &= ~PrivMode_MouseX10; 3794 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3750 break; 3795 break;
3751#if 0
3752 case 1001: 3796 case 1002:
3753 break; /* X11 mouse highlighting */ 3797 case 1003:
3754#endif 3798 if (state)
3799 {
3800 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3801 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3802 mouse_row = mouse_col = 0;
3803 vt_emask_mouse = PointerMotionMask;
3804 }
3805 else
3806 vt_emask_mouse = NoEventMask;
3807
3808 vt_select_input ();
3809 break;
3755 case 1010: /* scroll to bottom on TTY output inhibit */ 3810 case 1010: /* scroll to bottom on TTY output inhibit */
3756 set_option (Opt_scrollTtyOutput, !state); 3811 set_option (Opt_scrollTtyOutput, !state);
3757 break; 3812 break;
3758 case 1011: /* scroll to bottom on key press */ 3813 case 1011: /* scroll to bottom on key press */
3759 set_option (Opt_scrollTtyKeypress, state); 3814 set_option (Opt_scrollTtyKeypress, state);
3760 break; 3815 break;
3761 case 1047: /* secondary screen w/ clearing last */ 3816 case 1047: /* secondary screen w/ clearing last */
3762 if (option (Opt_secondaryScreen)) 3817 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3818 if (!state)
3764 scr_erase_screen (2); 3819 scr_erase_screen (2);
3820
3765 scr_change_screen (state); 3821 scr_change_screen (state);
3766 break; 3822 break;
3767 case 1049: /* secondary screen w/ clearing first */ 3823 case 1049: /* secondary screen w/ clearing first */
3824 if (option (Opt_secondaryScreen))
3825 if (state)
3826 scr_cursor (SAVE);
3827
3768 scr_change_screen (state); 3828 scr_change_screen (state);
3829
3769 if (option (Opt_secondaryScreen)) 3830 if (option (Opt_secondaryScreen))
3770 if (current_screen != PRIMARY) 3831 if (state)
3771 scr_erase_screen (2); 3832 scr_erase_screen (2);
3833 else
3834 scr_cursor (RESTORE);
3772 break; 3835 break;
3773 default: 3836 default:
3774 break; 3837 break;
3775 } 3838 }
3776 } 3839 }
3777} 3840}
3778/*}}} */ 3841/*}}} */
3779 3842
3780/*{{{ process sgr sequences */ 3843/*{{{ process sgr sequences */
3781void 3844void ecb_hot
3782rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3845rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3783{ 3846{
3784 unsigned int i; 3847 unsigned int i;
3785 short rendset; 3848 short rendset;
3786 int rendstyle; 3849 int rendstyle;
… …
3929 } 3992 }
3930 } 3993 }
3931} 3994}
3932/*}}} */ 3995/*}}} */
3933 3996
3934/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3935void
3936rxvt_term::process_graphics ()
3937{
3938 unicode_t ch, cmd = cmd_getc ();
3939
3940 if (cmd == 'Q')
3941 { /* query graphics */
3942 tt_printf ("\033G0\012"); /* no graphics */
3943 return;
3944 }
3945 /* swallow other graphics sequences until terminating ':' */
3946 do
3947 ch = cmd_getc ();
3948 while (ch != ':');
3949}
3950/*}}} */
3951
3952/* ------------------------------------------------------------------------- */ 3997/* ------------------------------------------------------------------------- */
3953 3998
3954/* 3999/*
3955 * Send printf () formatted output to the command. 4000 * Send printf () formatted output to the command.
3956 * Only use for small amounts of data. 4001 * Only use for small amounts of data.
… …
3969 4014
3970/* ---------------------------------------------------------------------- */ 4015/* ---------------------------------------------------------------------- */
3971/* Write data to the pty as typed by the user, pasted with the mouse, 4016/* Write data to the pty as typed by the user, pasted with the mouse,
3972 * or generated by us in response to a query ESC sequence. 4017 * or generated by us in response to a query ESC sequence.
3973 */ 4018 */
3974const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4019static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3975 4020
3976void 4021void
3977rxvt_term::tt_write (const char *data, unsigned int len) 4022rxvt_term::tt_write (const char *data, unsigned int len)
3978{ 4023{
3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4024 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3984 4029
3985 if (v_buflen == 0) 4030 if (v_buflen == 0)
3986 { 4031 {
3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4032 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3988 4033
4034 max_it (written, 0);
4035
3989 if ((unsigned int)written == len) 4036 if (written == len)
3990 return; 4037 return;
3991 4038
3992 data += written; 4039 data += written;
3993 len -= written; 4040 len -= written;
3994 } 4041 }
3995 4042
3996 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4043 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3997 4044
3998 memcpy (v_buffer + v_buflen, data, len); 4045 memcpy (v_buffer + v_buflen, data, len);
3999 v_buflen += len; 4046 v_buflen += len;
4000 4047
4001 pty_ev.set (EVENT_READ | EVENT_WRITE); 4048 pty_ev.set (ev::READ | ev::WRITE);
4002} 4049}
4003 4050
4004void rxvt_term::pty_write () 4051void rxvt_term::pty_write ()
4005{ 4052{
4006 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4053 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4011 4058
4012 if (v_buflen == 0) 4059 if (v_buflen == 0)
4013 { 4060 {
4014 free (v_buffer); 4061 free (v_buffer);
4015 v_buffer = 0; 4062 v_buffer = 0;
4016 v_buflen = 0;
4017 4063
4018 pty_ev.set (EVENT_READ); 4064 pty_ev.set (ev::READ);
4019 return; 4065 return;
4020 } 4066 }
4021 4067
4022 memmove (v_buffer, v_buffer + written, v_buflen); 4068 memmove (v_buffer, v_buffer + written, v_buflen);
4023 } 4069 }
4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4070 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4025 pty_ev.set (EVENT_READ); 4071 pty_ev.set (ev::READ);
4026} 4072}
4027 4073
4028/*----------------------- end-of-file (C source) -----------------------*/ 4074/*----------------------- end-of-file (C source) -----------------------*/
4029 4075

Diff Legend

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