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.348 by sasha, Thu Aug 16 21:26:20 2007 UTC vs.
Revision 1.526 by root, Fri Nov 30 07:19:09 2012 UTC

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

Diff Legend

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