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.342 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.536 by sf-exg, Thu Mar 28 08:53:16 2013 UTC

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

Diff Legend

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