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.313 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.545 by sf-exg, Sat Apr 26 15:05:17 2014 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-2014 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
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
305{ 416{
306 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 418 KeySym keysym;
309 int valid_keysym; 419 int valid_keysym;
310 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
311 422
312#if ISO_14755 423#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
314 return; 425 return;
315#endif 426#endif
… …
322 */ 433 */
323 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
326 437
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; 438 kbuf[0] = 0;
334 439
335#ifdef USE_XIM 440#if USE_XIM
336 if (Input_Context) 441 if (Input_Context)
337 { 442 {
338 Status status_return; 443 Status status_return;
339 444
340#if 0 445#if 0
… …
391 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
392 } 497 }
393 498
394 if (valid_keysym) 499 if (valid_keysym)
395 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (valid_keysym)
704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
… …
473 selection_request (ev.time); 784 selection_request (ev.time);
474 return; 785 return;
475#if TODO 786#if TODO
476 /* rxvt extras */ 787 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 788 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 789 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 790 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 791 return;
483#endif 792#endif
484 } 793 }
485 } 794 }
486 } 795 }
487 796
797 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
798 {
799 if (keysym == XK_v)
800 selection_request (ev.time, Sel_Clipboard);
801 else if (selection.len > 0)
802 {
803 free (selection.clip_text);
804 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
805 selection.clip_len = selection.len;
806 selection_grab (CurrentTime, true);
807 }
808
809 return;
810 }
811
488#if ENABLE_FRILLS || ISO_14755 812#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 813 // ISO 14755 support
490 if (shft && ctrl) 814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 815 {
492 int hv; 816 int hv;
493 817
494 if (iso14755buf & ISO_14755_51 818 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 819 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 821 {
498 commit_iso14755 (); 822 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 823 iso14755buf = ISO_14755_51;
500# if ISO_14755 824# if ISO_14755
501 iso14755_51 (0); 825 iso14755_51 (0);
826# endif
827 return;
828 }
829 else if (keysym == XK_BackSpace)
830 {
831 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
832# if ISO_14755
833 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 834# endif
503 return; 835 return;
504 } 836 }
505 else if ((hv = hex_keyval (ev)) >= 0) 837 else if ((hv = hex_keyval (ev)) >= 0)
506 { 838 {
… …
511# endif 843# endif
512 return; 844 return;
513 } 845 }
514 else 846 else
515 { 847 {
516# if ENABLE_OVERLAY 848# if ISO_14755
517 scr_overlay_off (); 849 scr_overlay_off ();
518# endif 850# endif
519 iso14755buf = 0; 851 iso14755buf = 0;
520 } 852 }
521 } 853 }
854 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 855 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 856 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 857 if (!(iso14755buf & ISO_14755_STARTED))
525 { 858 {
526 iso14755buf |= ISO_14755_STARTED; 859 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 860# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 861 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 862 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 863# endif
531 } 864 }
532#endif 865#endif
533 866
534#ifdef PRINTPIPE 867#ifdef PRINTPIPE
535 if (keysym == XK_Print) 868 if (keysym == XK_Print)
536 { 869 {
537 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
538 return; 871 return;
539 } 872 }
540#endif 873#endif
541
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 {
544 {
545 newlen = 1;
546 switch (keysym)
547 {
548#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace)
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0;
832 break;
833 }
834
835 if (newlen)
836 len = strlen (kbuf);
837 }
838
839 /*
840 * Pass meta for all function keys, if 'meta' option set
841 */
842#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0)
844 kbuf[len - 1] |= 0x80;
845#endif
846
847 }
848 else if (ctrl && keysym == XK_minus)
849 {
850 len = 1;
851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
858 else
859 {
860#ifdef META8_OPTION
861 /* set 8-bit on */
862 if (meta && (meta_char == 0x80))
863 {
864 char *ch;
865
866 for (ch = kbuf; ch < kbuf + len; ch++)
867 *ch |= 0x80;
868
869 meta = 0;
870 }
871#endif
872 /* nil */ ;
873 }
874 } 874 }
875 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return; 877 return;
878 878
879 if (len <= 0) 879 if (len <= 0)
880 return; /* not mapped */ 880 return; /* not mapped */
881 881
882 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 883 if (view_start)
884 { 884 {
885 view_start = 0; 885 view_start = 0;
886 want_refresh = 1; 886 want_refresh = 1;
887 } 887 }
888 888
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */
904 if (meta
905#ifdef META8_OPTION
906 && meta_char == C0_ESC
907#endif
908 )
909 {
910 const char ch = C0_ESC;
911 tt_write (&ch, 1);
912 }
913
914 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
915} 890}
916 891
917void 892void ecb_cold
918rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
919{ 894{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym; 896 KeySym keysym;
922 897
… …
926#if ENABLE_FRILLS || ISO_14755 901#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 902 // ISO 14755 support
928 if (iso14755buf) 903 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 904 if (iso14755buf & ISO_14755_52)
930 { 905 {
931# if ENABLE_OVERLAY 906# if ISO_14755
932 scr_overlay_off (); 907 scr_overlay_off ();
933# endif 908# endif
934# if ISO_14755 909# if ISO_14755
935 // iso14755 part 5.2 handling: release time 910 // iso14755 part 5.2 handling: release time
936 // first: controls 911 // first: controls
… …
942 commit_iso14755 (); 917 commit_iso14755 ();
943 918
944 return; 919 return;
945 } 920 }
946 921
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 922 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 923 if (i[0] == keysym)
949 { 924 {
950 iso14755buf = ISO_14755_51 | i[1]; 925 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 926 commit_iso14755 ();
952 927
… …
959 934
960 return; 935 return;
961 } 936 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 937 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 938 {
964# if ENABLE_OVERLAY 939# if ISO_14755
965 scr_overlay_off (); 940 scr_overlay_off ();
966# endif 941# endif
967 if (iso14755buf & ISO_14755_51) 942 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 943 commit_iso14755 ();
969#if ISO_14755 944#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 945 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 946 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 947 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 948
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 949 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 950 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
991#endif 966#endif
992} 967}
993 968
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 969void
1028rxvt_term::flush () 970rxvt_term::flush ()
1029{ 971{
1030 flush_ev.stop (); 972 flush_ev.stop ();
1031 973
1032#ifdef TRANSPARENT 974#ifdef HAVE_IMG
1033 if (want_full_refresh) 975 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 976 {
1035 want_full_refresh = 0; 977 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 978 scr_touch (false);
1038 } 979 }
1039#endif 980#endif
1040 981
1041 if (want_refresh) 982 if (want_refresh)
… …
1077 } 1018 }
1078 while (row < end_row); 1019 while (row < end_row);
1079 } 1020 }
1080 1021
1081 scr_refresh (); 1022 scr_refresh ();
1082 scrollbar_show (1); 1023 scrollBar.show (1);
1083#ifdef USE_XIM 1024#if USE_XIM
1084 IMSendSpot (); 1025 im_send_spot ();
1085#endif 1026#endif
1086 } 1027 }
1087 1028
1088 display->flush (); 1029 display->flush ();
1089} 1030}
1090 1031
1032/* checks whether a refresh is requested and starts the refresh timer */
1091void 1033void
1092rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1035{
1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1038
1039 display->flush ();
1040}
1041
1042void
1043rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1044{
1094 make_current (); 1045 make_current ();
1095 1046
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1047 refresh_count = 0;
1109 flush (); 1048 flush ();
1110} 1049}
1111 1050
1112#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1113void 1052void
1053rxvt_term::cursor_blink_reset ()
1054{
1055 if (hidden_cursor)
1056 {
1057 hidden_cursor = 0;
1058 want_refresh = 1;
1059 }
1060
1061 if (option (Opt_cursorBlink))
1062 cursor_blink_ev.again ();
1063 else
1064 cursor_blink_ev.stop ();
1065}
1066
1067void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1069{
1116 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1071 want_refresh = 1;
1118 1072 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1073}
1121#endif 1074#endif
1122 1075
1123#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1124void 1077void
1125rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1079{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1081 {
1129 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1130 want_refresh = 1; 1083 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1132 } 1085 }
1086 else
1087 w.stop ();
1133} 1088}
1134#endif 1089#endif
1135 1090
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1092void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1094{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1097 {
1143 want_refresh = 1; 1098 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1145 } 1100 }
1101 else
1102 w.stop ();
1146} 1103}
1147#endif 1104#endif
1148 1105
1149#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1150void 1107void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1109{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1154 { 1111 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1113 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1158 } 1115 }
1116 else
1117 w.stop ();
1159} 1118}
1160#endif 1119#endif
1161 1120
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1122void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1124{
1166 if (mouse_slip_wheel_speed == 0 1125 if (scr_page (mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1126 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1127 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1175 } 1135 }
1176} 1136}
1177#endif 1137#endif
1178 1138
1179#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1180static struct event_handler 1140static struct event_handler
1181{ 1141{
1182 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1183 1143
1184 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1185 { 1145 {
1186 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1147 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1148 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1150 // since the linux guys additionally thought that breaking the only
1151 // known workaround against their unusable sched_yield hack is cool,
1152 // we just nanosleep a bit and hope for the best.
1190 1153
1191 struct timespec ts = { 0, 0 }; 1154 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1155 nanosleep (&ts, 0);
1193 1156
1194 w.stop (); 1157 w.stop ();
1195 } 1158 }
1196 1159
… …
1199 { 1162 {
1200 } 1163 }
1201} event_handler; 1164} event_handler;
1202#endif 1165#endif
1203 1166
1167/* make sure all the cmd data is at beginning of cmdbuf */
1168void
1169rxvt_term::cmdbuf_reify ()
1170{
1171 if (cmdbuf_ptr == cmdbuf_base)
1172 return;
1173
1174 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1175
1176 memmove (cmdbuf_base, cmdbuf_ptr, used);
1177 cmdbuf_ptr = cmdbuf_base;
1178 cmdbuf_endp = cmdbuf_ptr + used;
1179
1180}
1181
1182#if defined (KEYSYM_RESOURCE)
1183void
1184rxvt_term::cmdbuf_append (const char *str, size_t count)
1185{
1186 cmdbuf_reify ();
1187
1188 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1189
1190 if (count > avail)
1191 return;
1192
1193 memcpy (cmdbuf_endp, str, count);
1194 cmdbuf_endp += count;
1195
1196 cmd_parse ();
1197}
1198#endif
1199
1204bool 1200bool
1205rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1206{ 1202{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1208 1204
1209 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1206
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1212 n = 0;
1213 } 1208 {
1214 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1218 1214
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1216
1221 if (r > 0) 1217 if (r > 0)
1222 { 1218 {
1223 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1224 return true; 1220 return true;
… …
1232 } 1228 }
1233 else 1229 else
1234 { 1230 {
1235 pty_ev.stop (); 1231 pty_ev.stop ();
1236 1232
1237 if (!OPTION (Opt_hold)) 1233 if (!option (Opt_hold))
1238 destroy (); 1234 destroy ();
1239 } 1235 }
1240 1236
1241 return false; 1237 return false;
1242} 1238}
1243 1239
1244void 1240void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1241rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1242{
1247 make_current (); 1243 make_current ();
1248 1244
1249 if (revents & EVENT_READ) 1245 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1246 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1247 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1248 cmd_parse ();
1253 break;
1254 1249
1255 if (revents & EVENT_WRITE) 1250 if (revents & ev::WRITE)
1256 pty_write (); 1251 pty_write ();
1257}
1258 1252
1259void 1253 refresh_check ();
1254}
1255
1256void ecb_cold
1260rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1261{ 1258{
1262 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1263 recolour_cursor (); 1260 recolour_cursor ();
1264 1261
1265#ifdef POINTER_BLANK 1262#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1263 hidden_pointer = 0;
1267 1264
1268 if (OPTION (Opt_pointerBlank)) 1265 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1270#endif 1267#endif
1271} 1268}
1272 1269
1273#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1274void 1271void ecb_cold
1275rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1276{ 1273{
1277 if (!OPTION (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1278 return; 1275 return;
1279 1276
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1277 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1278 XFlush (dpy);
1282 1279
1283 hidden_pointer = 1; 1280 hidden_pointer = 1;
1284} 1281}
1285 1282
1286void 1283void ecb_cold
1287rxvt_term::pointer_cb (time_watcher &w) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1285{
1289 make_current (); 1286 make_current ();
1290 1287
1291 pointer_blank (); 1288 pointer_blank ();
1292} 1289}
… …
1295void 1292void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1293rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1294{
1298 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1299 int x, y; 1296 int x, y;
1297 int code = 32;
1300 1298
1301 x = ev.x; 1299 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1300 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1301
1302 if (ev.type == MotionNotify)
1303 {
1304 if (x == mouse_row && y == mouse_col)
1305 return;
1306
1307 mouse_row = x;
1308 mouse_col = y;
1309 code += 32;
1310 }
1304 1311
1305 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
1306 button_number = 3; 1313 button_number = 3;
1307 else 1314 else
1308 { 1315 {
1309 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1318 if (button_number >= 3)
1312 button_number += (64 - 3); 1319 button_number += 64 - 3;
1313 } 1320 }
1314 1321
1315 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1316 { 1323 {
1317 /* 1324 /*
… …
1349 fputc ('A', stderr); 1356 fputc ('A', stderr);
1350 if (key_state & 32) 1357 if (key_state & 32)
1351 fputc ('2', stderr); 1358 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1360 button_number,
1354 x + 1, 1361 x,
1355 y + 1); 1362 y);
1356#endif 1363#endif
1357 1364
1365#if ENABLE_FRILLS
1366 if (priv_modes & PrivMode_ExtMouseRight)
1367 tt_printf ("\033[%d;%d;%dM",
1368 code + button_number + key_state,
1369 x,
1370 y);
1371 else if (priv_modes & PrivMode_ExtModeMouse)
1372 tt_printf ("\033[M%c%lc%lc",
1373 code + button_number + key_state,
1374 wint_t (32 + x),
1375 wint_t (32 + y));
1376 else
1377#endif
1358 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1379 code + button_number + key_state,
1360 (32 + x + 1), 1380 32 + x,
1361 (32 + y + 1)); 1381 32 + y);
1362} 1382}
1363 1383
1364/*{{{ process an X event */ 1384/*{{{ process an X event */
1365void 1385void ecb_hot
1366rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1367{ 1387{
1368 make_current (); 1388 make_current ();
1369 1389
1370 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1446 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1447 focus_out ();
1428 } 1448 }
1429#endif 1449#endif
1430 } 1450 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1451 break;
1436 1452
1437 /* 1453 /*
1438 * XXX: this is not the _current_ arrangement 1454 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1455 * Here's my conclusion:
… …
1458 break; 1474 break;
1459 } 1475 }
1460 break; 1476 break;
1461 1477
1462 case FocusIn: 1478 case FocusIn:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1482 focus_in ();
1464 break; 1483 break;
1465 1484
1466 case FocusOut: 1485 case FocusOut:
1486 if (ev.xfocus.detail != NotifyInferior
1487 && ev.xfocus.detail != NotifyPointer
1488 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1489 focus_out ();
1468 break; 1490 break;
1469 1491
1470 case ConfigureNotify: 1492 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1472 { 1494 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1496 ;
1497
1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1499
1500 bool moved = false;
1501#ifdef HAVE_BG_PIXMAP
1502 if (bg_window_position_sensitive ())
1503 {
1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1508#endif
1509
1510 if (want_position_change)
1511 {
1512 int x, y;
1513
1514 if (ev.xconfigure.send_event)
1515 {
1516 x = ev.xconfigure.x;
1517 y = ev.xconfigure.y;
1518 }
1519 else
1520 get_window_origin (x, y);
1521
1522 if (x != parent_x || y != parent_y)
1523 {
1524 parent_x = x;
1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1527 moved = true;
1528 }
1529 }
1475 1530
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1532 {
1478 seen_resize = 1; 1533 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1535 }
1536 else
1537 {
1538#ifdef HAVE_BG_PIXMAP
1539 if (moved)
1540 update_background ();
1541#endif
1542 }
1481 1543
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1545 }
1489 break; 1546 break;
1490 1547
1491 case PropertyNotify: 1548 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1550 break;
1498 1551
1499 case SelectionClear: 1552 case SelectionClear:
1500 selection_clear (); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1554 break;
1507 1555
1508 case SelectionRequest: 1556 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1510 break; 1558 break;
1511 1559
1512 case MapNotify: 1560 case MapNotify:
1561#ifdef HAVE_BG_PIXMAP
1562 // This is needed at startup for the case of no window manager
1563 // or a non-reparenting window manager and also because we
1564 // defer bg image updates if the window is not mapped. The
1565 // short delay is to optimize for multiple ConfigureNotify
1566 // events at startup when the window manager reparents the
1567 // window, so as to perform the computation after we have
1568 // received all of them.
1569 if (bg_img == 0)
1570 update_background_ev.start (0.025);
1571#endif
1513 mapped = 1; 1572 mapped = 1;
1514#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1574 text_blink_ev.start ();
1516#endif 1575#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1576 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1577 break;
1519 1578
1520 case UnmapNotify: 1579 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1581#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1582 text_blink_ev.stop ();
1524#endif 1583#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1584 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1585 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1586
1534 case GraphicsExpose: 1587 case GraphicsExpose:
1535 case Expose: 1588 case Expose:
1536 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1537 { 1590 {
1538 do 1591 do
1592 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1595 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1597
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1599
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1601 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1604 }
1548 1605
1549 want_refresh = 1; 1606 want_refresh = 1;
1550 } 1607 }
1551 else 1608 else
1552 { 1609 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1613 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1615 ;
1559 1616
1560 if (isScrollbarWindow (ev.xany.window)) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1618 {
1562 scrollBar.setIdle (); 1619 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1620 scrollBar.show (0);
1564 } 1621 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1622 }
1571 break; 1623 break;
1572 1624
1573 case MotionNotify: 1625 case MotionNotify:
1574#ifdef POINTER_BLANK 1626#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1627 if (hidden_pointer)
1576 pointer_unblank (); 1628 pointer_unblank ();
1577#endif 1629#endif
1630 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1631 || priv_modes & PrivMode_MouseAnyEvent)
1632 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1633 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1634 break;
1580 1635
1581 if (ev.xany.window == vt) 1636 if (ev.xany.window == vt)
1582 { 1637 {
… …
1611 1666
1612#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1613 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1614 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1615 { 1670 {
1671 page_dirn scroll_selection_dir;
1616 int dist; 1672 int dist;
1617 1673
1618 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1620 */ 1676 */
1621 if (!sel_scroll_ev.active) 1677 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1678 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1679
1624 /* save the event params so we can highlight 1680 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1681 * the selection in the pending-scroll loop
1626 */ 1682 */
1627 selection_save_x = ev.xbutton.x; 1683 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1636 } 1692 }
1637 else 1693 else
1638 { 1694 {
1639 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1697 }
1642 1698
1643 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1701 + 1;
1646 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1647 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1648 } 1705 }
1649 else 1706 else
1650 { 1707 {
1651 /* we are within the text window, so we 1708 /* we are within the text window, so we
1652 * shouldn't be scrolling 1709 * shouldn't be scrolling
1653 */ 1710 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1711 sel_scroll_ev.stop();
1656 } 1712 }
1657#endif 1713#endif
1658#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1659 } 1715 }
1660#endif 1716#endif
1661 } 1717 }
1662 } 1718 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1720 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1667 ; 1723 ;
1668 1724
1669 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1729 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1731 scrollBar.size ());
1676 want_refresh = 1; 1732 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1733 scrollBar.show (1);
1679 } 1734 }
1680 break; 1735 break;
1681 } 1736 }
1682 1737
1683#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1685 { 1740 cursor_blink_reset ();
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif 1741#endif
1695 1742
1696#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1745 {
1699 if (ev.type == MotionNotify 1746 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1747 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1748 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1749 if (hidden_pointer)
… …
1704 1751
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1752 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1753 pointer_blank ();
1707 } 1754 }
1708#endif 1755#endif
1709}
1710 1756
1711void 1757 refresh_check ();
1758}
1759
1760#if ENABLE_FRILLS
1761void ecb_cold
1762rxvt_term::set_urgency (bool enable)
1763{
1764 if (enable == urgency_hint)
1765 return;
1766
1767 if (XWMHints *h = XGetWMHints (dpy, parent))
1768 {
1769 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1770 XSetWMHints (dpy, parent, h);
1771 urgency_hint = enable;
1772 XFree (h);
1773 }
1774}
1775#endif
1776
1777void ecb_cold
1712rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1713{ 1779{
1714 if (!focus) 1780 if (!focus)
1715 { 1781 {
1716 focus = 1; 1782 focus = 1;
1717 want_refresh = 1; 1783 want_refresh = 1;
1718 1784
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1785#if USE_XIM
1722 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1723 { 1787 {
1724 IMSetPosition (); 1788 im_set_position ();
1725 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1726 } 1790 }
1727#endif 1791#endif
1728#if CURSOR_BLINK 1792#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1794 cursor_blink_ev.again ();
1731#endif 1795#endif
1732#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1734 { 1798 {
1735 pix_colors = pix_colors_focused; 1799 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1800 scr_recolour ();
1737 } 1801 }
1738#endif 1802#endif
1739 } 1803#if ENABLE_FRILLS
1740} 1804 if (option (Opt_urgentOnBell))
1805 set_urgency (0);
1806#endif
1741 1807
1742void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1743rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1744{ 1814{
1745 if (focus) 1815 if (focus)
1746 { 1816 {
1747 focus = 0; 1817 focus = 0;
1748 want_refresh = 1; 1818 want_refresh = 1;
1749 1819
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1820#if ENABLE_FRILLS
1751 1821 if (option (Opt_urgentOnBell))
1822 set_urgency (0);
1823#endif
1752#if ENABLE_FRILLS || ISO_14755 1824#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1825 if (iso14755buf)
1754 { 1826 {
1755 iso14755buf = 0; 1827 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1828# if ISO_14755
1757 scr_overlay_off (); 1829 scr_overlay_off ();
1758# endif 1830# endif
1759 } 1831 }
1760#endif 1832#endif
1761#if USE_XIM 1833#if USE_XIM
1762 if (Input_Context != NULL) 1834 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1835 XUnsetICFocus (Input_Context);
1764#endif 1836#endif
1765#if CURSOR_BLINK 1837#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1838 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1839 cursor_blink_ev.stop ();
1840
1768 hidden_cursor = 0; 1841 hidden_cursor = 0;
1769#endif 1842#endif
1770#if OFF_FOCUS_FADING 1843#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1844 if (rs[Rs_fade])
1772 { 1845 {
1773 pix_colors = pix_colors_unfocused; 1846 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1847 scr_recolour ();
1775 } 1848 }
1776#endif 1849#endif
1777 }
1778}
1779 1850
1780void 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1852 }
1853}
1854
1855void ecb_cold
1781rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1782{ 1857{
1783#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1785 { 1860 {
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1864 }
1790#endif 1865#endif
1791} 1866}
1792 1867
1793#if TRANSPARENT 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1794void 1869void ecb_hot
1795rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1871{
1797 make_current (); 1872 make_current ();
1873
1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1876 return;
1798 1877
1799 switch (ev.type) 1878 switch (ev.type)
1800 { 1879 {
1801 case PropertyNotify: 1880 case PropertyNotify:
1802 /* 1881 /*
1803 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1804 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1805 */ 1884 */
1806 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1807 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1808 return; 1887 {
1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1896 }
1809 1897
1810 /* FALLTHROUGH */
1811 case ReparentNotify:
1812 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1813 want_refresh = want_full_refresh = 1;
1814 break; 1898 break;
1815 } 1899 }
1900
1901 refresh_check ();
1816} 1902}
1817#endif 1903#endif
1818 1904
1819void 1905void
1820rxvt_term::button_press (XButtonEvent &ev) 1906rxvt_term::button_press (XButtonEvent &ev)
… …
1851 /* save the xbutton state (for ButtonRelease) */ 1937 /* save the xbutton state (for ButtonRelease) */
1852 MEvent.state = ev.state; 1938 MEvent.state = ev.state;
1853#ifdef MOUSE_REPORT_DOUBLECLICK 1939#ifdef MOUSE_REPORT_DOUBLECLICK
1854 if (ev.button == MEvent.button && clickintime) 1940 if (ev.button == MEvent.button && clickintime)
1855 { 1941 {
1856 /* same button, within alloted time */ 1942 /* same button, within allowed time */
1857 MEvent.clicks++; 1943 MEvent.clicks++;
1858 1944
1859 if (MEvent.clicks > 1) 1945 if (MEvent.clicks > 1)
1860 { 1946 {
1861 /* only report double clicks */ 1947 /* only report double clicks */
… …
1875 mouse_report (ev); 1961 mouse_report (ev);
1876 } 1962 }
1877#else 1963#else
1878 MEvent.button = ev.button; 1964 MEvent.button = ev.button;
1879 mouse_report (ev); 1965 mouse_report (ev);
1880#endif /* MOUSE_REPORT_DOUBLECLICK */ 1966#endif /* MOUSE_REPORT_DOUBLECLICK */
1881 1967
1882 } 1968 }
1883 else 1969 else
1884 { 1970 {
1885 if (ev.button != MEvent.button) 1971 if (ev.button != MEvent.button)
… …
1933 } 2019 }
1934 2020
1935 /* 2021 /*
1936 * Scrollbar window processing of button press 2022 * Scrollbar window processing of button press
1937 */ 2023 */
1938 if (isScrollbarWindow (ev.window)) 2024 if (scrollBar.state && ev.window == scrollBar.win)
1939 { 2025 {
1940 scrollBar.setIdle (); 2026 page_dirn direction = NO_DIR;
2027
2028 if (scrollBar.upButton (ev.y))
2029 direction = UP; /* up */
2030 else if (scrollBar.dnButton (ev.y))
2031 direction = DN; /* down */
2032
2033 scrollBar.state = SB_STATE_IDLE;
1941 /* 2034 /*
1942 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1943 * move up if mouse is above slider 2036 * move up if mouse is above slider
1944 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1945 * 2038 *
… …
1954 /* 2047 /*
1955 * Mouse report disabled scrollbar: 2048 * Mouse report disabled scrollbar:
1956 * arrow buttons - send up/down 2049 * arrow buttons - send up/down
1957 * click on scrollbar - send pageup/down 2050 * click on scrollbar - send pageup/down
1958 */ 2051 */
1959 if ((scrollBar.style == R_SB_NEXT 2052 if (direction == UP)
1960 && scrollbarnext_upButton (ev.y))
1961 || (scrollBar.style == R_SB_RXVT
1962 && scrollbarrxvt_upButton (ev.y)))
1963 tt_printf ("\033[A"); 2053 tt_printf ("\033[A");
1964 else if ((scrollBar.style == R_SB_NEXT 2054 else if (direction == DN)
1965 && scrollbarnext_dnButton (ev.y))
1966 || (scrollBar.style == R_SB_RXVT
1967 && scrollbarrxvt_dnButton (ev.y)))
1968 tt_printf ("\033[B"); 2055 tt_printf ("\033[B");
1969 else 2056 else
1970 switch (ev.button) 2057 switch (ev.button)
1971 { 2058 {
1972 case Button2: 2059 case Button2:
… …
1979 tt_printf ("\033[5~"); 2066 tt_printf ("\033[5~");
1980 break; 2067 break;
1981 } 2068 }
1982 } 2069 }
1983 else 2070 else
1984#endif /* NO_SCROLLBAR_REPORT */ 2071#endif /* NO_SCROLLBAR_REPORT */
1985
1986 {
1987 char upordown = 0;
1988
1989 if (scrollBar.style == R_SB_NEXT)
1990 { 2072 {
1991 if (scrollbarnext_upButton (ev.y)) 2073 if (direction != NO_DIR)
1992 upordown = -1; /* up */
1993 else if (scrollbarnext_dnButton (ev.y))
1994 upordown = 1; /* down */
1995 }
1996 else if (scrollBar.style == R_SB_RXVT)
1997 {
1998 if (scrollbarrxvt_upButton (ev.y))
1999 upordown = -1; /* up */
2000 else if (scrollbarrxvt_dnButton (ev.y))
2001 upordown = 1; /* down */
2002 }
2003 if (upordown)
2004 { 2074 {
2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2076 if (!cont_scroll_ev.is_active ())
2006 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2078#endif
2008 if (scr_page (upordown < 0 ? UP : DN, 1)) 2079 if (scr_page (direction, 1))
2009 { 2080 {
2010 if (upordown < 0) 2081 if (direction == UP)
2011 scrollBar.setUp (); 2082 scrollBar.state = SB_STATE_UP;
2012 else 2083 else
2013 scrollBar.setDn (); 2084 scrollBar.state = SB_STATE_DOWN;
2014 } 2085 }
2015 } 2086 }
2016 else 2087 else
2017 switch (ev.button) 2088 switch (ev.button)
2018 { 2089 {
2019 case Button2: 2090 case Button2:
2020 switch (scrollbar_align) 2091 switch (scrollBar.align)
2021 { 2092 {
2022 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2023 csrO = 0; 2094 csrO = 0;
2024 break; 2095 break;
2025 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2098 break;
2028 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2101 break;
2031 } 2102 }
2032 2103
2033 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2108
2038 scrollBar.setMotion (); 2109 scrollBar.state = SB_STATE_MOTION;
2039 break; 2110 break;
2040 2111
2041 case Button1: 2112 case Button1:
2042 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2045 2116
2046 case Button3: 2117 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2119 {
2049 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2052# else 2123# else
2053 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2054# endif 2125# endif
2055 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2058# else 2129# else
2059 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2060# endif 2131# endif
2061 else 2132 else
2062 scrollBar.setMotion (); 2133 scrollBar.state = SB_STATE_MOTION;
2063 } 2134 }
2064 else 2135 else
2065 { 2136 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2138 (nrow
2068 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2069 / scrollbar_size ())); 2140 / scrollBar.size ()));
2070 } 2141 }
2071 2142
2072 break; 2143 break;
2073 } 2144 }
2074 } 2145 }
… …
2084 2155
2085 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2157 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2159
2089 if (scrollbar_isUpDn ()) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2161 {
2091 scrollBar.setIdle (); 2162 scrollBar.state = SB_STATE_IDLE;
2092 scrollbar_show (0); 2163 scrollBar.show (0);
2093 } 2164 }
2094 2165
2095#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2096 if (sel_scroll_ev.active)
2097 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
2098#endif 2168#endif
2099 2169
2100 if (ev.window == vt) 2170 if (ev.window == vt)
2101 { 2171 {
2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2172 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2126 mouse_report (ev); 2196 mouse_report (ev);
2127 } 2197 }
2128#else /* MOUSE_REPORT_DOUBLECLICK */ 2198#else /* MOUSE_REPORT_DOUBLECLICK */
2129 MEvent.button = AnyButton; 2199 MEvent.button = AnyButton;
2130 mouse_report (ev); 2200 mouse_report (ev);
2131#endif /* MOUSE_REPORT_DOUBLECLICK */ 2201#endif /* MOUSE_REPORT_DOUBLECLICK */
2132 return; 2202 return;
2133 } 2203 }
2134 2204
2135 /* 2205 /*
2136 * dumb hack to compensate for the failure of click-and-drag 2206 * dumb hack to compensate for the failure of click-and-drag
… …
2147 case Button3: 2217 case Button3:
2148 selection_make (ev.time); 2218 selection_make (ev.time);
2149 break; 2219 break;
2150 2220
2151 case Button2: 2221 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2222 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2224 break;
2155 2225
2156#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2157 case Button4: 2227 case Button4:
2158 case Button5: 2228 case Button5:
2159 { 2229 {
2160 int i; 2230 int lines;
2161 page_dirn v; 2231 page_dirn dirn;
2162 2232
2163 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2164 2234
2165 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2166 i = 1; 2236 lines = 1;
2167 else if (OPTION (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2238 lines = nrow - 1;
2169 else 2239 else
2170 i = 5; 2240 lines = 5;
2171 2241
2172# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2173 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2174 { 2244 {
2175 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178 2247
2179 if (slip_wheel_ev.at < NOW) 2248 if (!slip_wheel_ev.is_active ())
2180 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2181
2182 slip_wheel_ev.start ();
2183 } 2250 }
2184 else 2251 else
2252# endif
2185 { 2253 {
2186# endif
2187 scr_page (v, i); 2254 scr_page (dirn, lines);
2188 scrollbar_show (1); 2255 scrollBar.show (1);
2189# ifdef MOUSE_SLIP_WHEELING
2190 } 2256 }
2191# endif
2192 } 2257 }
2193 break; 2258 break;
2194#endif 2259#endif
2195 } 2260 }
2196 } 2261 }
2197} 2262}
2198 2263
2199#ifdef TRANSPARENT
2200#if TINTING
2201/* taken from aterm-0.4.2 */
2202
2203typedef uint32_t RUINT32T;
2204
2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2206{
2207 int sh_r, sh_g, sh_b;
2208 RUINT32T mask_r, mask_g, mask_b;
2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2212 int i;
2213
2214 Visual *visual = term->visual;
2215
2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2217
2218 /* for convenience */
2219 mask_r = visual->red_mask;
2220 mask_g = visual->green_mask;
2221 mask_b = visual->blue_mask;
2222
2223 /* boring lookup table pre-initialization */
2224 switch (srcImage->bits_per_pixel) {
2225 case 15:
2226 if ((mask_r != 0x7c00) ||
2227 (mask_g != 0x03e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+32;
2234 sh_r = 10;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 16:
2239 if ((mask_r != 0xf800) ||
2240 (mask_g != 0x07e0) ||
2241 (mask_b != 0x001f))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2244 lookup_r = lookup;
2245 lookup_g = lookup+32;
2246 lookup_b = lookup+32+64;
2247 sh_r = 11;
2248 sh_g = 5;
2249 sh_b = 0;
2250 break;
2251 case 24:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 case 32:
2265 if ((mask_r != 0xff0000) ||
2266 (mask_g != 0x00ff00) ||
2267 (mask_b != 0x0000ff))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2270 lookup_r = lookup;
2271 lookup_g = lookup+256;
2272 lookup_b = lookup+256+256;
2273 sh_r = 16;
2274 sh_g = 8;
2275 sh_b = 0;
2276 break;
2277 default:
2278 return; /* we do not support this color depth */
2279 }
2280
2281 /* prepare limits for color transformation (each channel is handled separately) */
2282 if (shade < 0) {
2283 shade = -shade;
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = 65535-rm;
2288 lower_lim_g = 65535-gm;
2289 lower_lim_b = 65535-bm;
2290
2291 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2292 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2293 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2294
2295 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2296 } else {
2297 if (shade < 0) shade = 0;
2298 if (shade > 100) shade = 100;
2299
2300 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2301
2302 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2303 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2304 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2305 }
2306
2307 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2308 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2309 {
2310 unsigned int tmp;
2311
2312 tmp = lower_lim_r;
2313 lower_lim_r = lower_lim_b;
2314 lower_lim_b = tmp;
2315
2316 tmp = upper_lim_r;
2317 upper_lim_r = upper_lim_b;
2318 upper_lim_b = tmp;
2319 }
2320
2321 /* fill our lookup tables */
2322 for (i = 0; i <= mask_r>>sh_r; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2326 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2327 lookup_r[i] = (tmp/65535)<<sh_r;
2328 }
2329 for (i = 0; i <= mask_g>>sh_g; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2333 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2334 lookup_g[i] = (tmp/65535)<<sh_g;
2335 }
2336 for (i = 0; i <= mask_b>>sh_b; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2340 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2341 lookup_b[i] = (tmp/65535)<<sh_b;
2342 }
2343
2344 /* apply table to input image (replacing colors by newly calculated ones) */
2345 switch (srcImage->bits_per_pixel)
2346 {
2347 case 15:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0x7c00)>>10] |
2359 lookup_g[(*p & 0x03e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 16:
2367 {
2368 unsigned short *p1, *pf, *p, *pl;
2369 p1 = (unsigned short *) srcImage->data;
2370 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width;
2375 for (; p < pl; p++)
2376 {
2377 *p = lookup_r[(*p & 0xf800)>>11] |
2378 lookup_g[(*p & 0x07e0)>> 5] |
2379 lookup_b[(*p & 0x001f)];
2380 }
2381 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 24:
2386 {
2387 unsigned char *p1, *pf, *p, *pl;
2388 p1 = (unsigned char *) srcImage->data;
2389 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width * 3;
2394 for (; p < pl; p += 3)
2395 {
2396 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2397 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2398 p[2] = lookup_r[(p[2] & 0x0000ff)];
2399 }
2400 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 32:
2405 {
2406 RUINT32T *p1, *pf, *p, *pl;
2407 p1 = (RUINT32T *) srcImage->data;
2408 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xff0000)>>16] |
2417 lookup_g[(*p & 0x00ff00)>> 8] |
2418 lookup_b[(*p & 0x0000ff)] |
2419 (*p & ~0xffffff);
2420 }
2421 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 }
2426
2427 free (lookup);
2428}
2429#endif
2430
2431/*
2432 * Check our parents are still who we think they are.
2433 * Do transparency updates if required
2434 */
2435int
2436rxvt_term::check_our_parents ()
2437{
2438 int i, pchanged, aformat, have_pixmap, rootdepth;
2439 unsigned long nitems, bytes_after;
2440 Atom atype;
2441 unsigned char *prop = NULL;
2442 Window root, oldp, *list;
2443 Pixmap rootpixmap = None;
2444 XWindowAttributes wattr, wrootattr;
2445
2446 pchanged = 0;
2447
2448 if (!OPTION (Opt_transparent))
2449 return pchanged; /* Don't try any more */
2450
2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2452 rootdepth = wrootattr.depth;
2453
2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2455
2456 if (rootdepth != wattr.depth)
2457 {
2458 if (am_transparent)
2459 {
2460 pchanged = 1;
2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2462 am_transparent = am_pixmap_trans = 0;
2463 }
2464
2465 return pchanged; /* Don't try any more */
2466 }
2467
2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2469 XSync (dpy, False);
2470
2471 /*
2472 * Make the frame window set by the window manager have
2473 * the root background. Some window managers put multiple nested frame
2474 * windows for each client, so we have to take care about that.
2475 */
2476 i = (xa[XA_XROOTPMAP_ID]
2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2479 &nitems, &bytes_after, &prop) == Success);
2480
2481 if (!i || prop == NULL)
2482 i = (xa[XA_ESETROOT_PMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL
2488#if TINTING
2489 || !ISSET_PIXCOLOR (Color_tint)
2490#endif
2491 )
2492 have_pixmap = 0;
2493 else
2494 {
2495 have_pixmap = 1;
2496 rootpixmap = *(Pixmap *)prop;
2497 XFree (prop);
2498 }
2499
2500 if (have_pixmap)
2501 {
2502 /*
2503 * Copy display->root pixmap transparency
2504 */
2505 int sx, sy, nx, ny;
2506 unsigned int nw, nh;
2507 Window cr;
2508 XImage *image;
2509 GC gc;
2510 XGCValues gcvalue;
2511
2512 XTranslateCoordinates (dpy, parent[0], display->root,
2513 0, 0, &sx, &sy, &cr);
2514 nw = (unsigned int)szHint.width;
2515 nh = (unsigned int)szHint.height;
2516 nx = ny = 0;
2517
2518 if (sx < 0)
2519 {
2520 nw += sx;
2521 nx = -sx;
2522 sx = 0;
2523 }
2524
2525 if (sy < 0)
2526 {
2527 nh += sy;
2528 ny = -sy;
2529 sy = 0;
2530 }
2531
2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2534
2535 XSync (dpy, False);
2536 allowedxerror = -1;
2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2538
2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2540 /* XXX: may need a delay here? */
2541 allowedxerror = 0;
2542
2543 if (image == NULL)
2544 {
2545 if (am_transparent && am_pixmap_trans)
2546 {
2547 pchanged = 1;
2548 if (pixmap != None)
2549 {
2550 XFreePixmap (dpy, pixmap);
2551 pixmap = None;
2552 }
2553 }
2554
2555 am_pixmap_trans = 0;
2556 }
2557 else
2558 {
2559 if (pixmap != None)
2560 XFreePixmap (dpy, pixmap);
2561
2562#if TINTING
2563 if (ISSET_PIXCOLOR (Color_tint))
2564 {
2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2566
2567 rgba c;
2568 pix_colors_focused [Color_tint].get (c);
2569
2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2571 }
2572#endif
2573
2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2577 nx, ny, image->width, image->height);
2578 XFreeGC (dpy, gc);
2579 XDestroyImage (image);
2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2581 XClearWindow (dpy, parent[0]);
2582
2583 if (!am_transparent || !am_pixmap_trans)
2584 pchanged = 1;
2585
2586 am_transparent = am_pixmap_trans = 1;
2587 }
2588 }
2589
2590 if (am_pixmap_trans)
2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2592 else
2593 {
2594 unsigned int n;
2595 /*
2596 * InheritPixmap transparency
2597 */
2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2599 {
2600 oldp = parent[i];
2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2602 XFree (list);
2603
2604 if (parent[i] == display->root)
2605 {
2606 if (oldp != None)
2607 pchanged = 1;
2608
2609 break;
2610 }
2611
2612 if (oldp != parent[i])
2613 pchanged = 1;
2614 }
2615
2616 n = 0;
2617
2618 if (pchanged)
2619 for (; n < (unsigned int)i; n++)
2620 {
2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2624 {
2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2626 break;
2627 }
2628 }
2629
2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2631 {
2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2634 am_transparent = 0;
2635 /* XXX: also turn off Opt_transparent? */
2636 }
2637 else
2638 {
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (dpy, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670
2671/*}}} */ 2264/*}}} */
2672 2265
2673bool 2266void ecb_hot
2674rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2675{ 2268{
2676 bool flag = false;
2677 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2679 2271
2680 for (;;) 2272 for (;;)
2681 { 2273 {
2682 if (ch == NOCHAR) 2274 if (ecb_unlikely (ch == NOCHAR))
2683 { 2275 {
2684 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2277 ch = next_char ();
2686 2278
2687 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2688 break; 2280 break;
2689 } 2281 }
2690 2282
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2283 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2284 {
2693 if (!seen_input) 2285 if (ecb_unlikely (!seen_input))
2694 { 2286 {
2695 seen_input = 1; 2287 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2303 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2305
2714 for (;;) 2306 for (;;)
2715 { 2307 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2308 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2309 break;
2718 2310
2719 *str++ = ch; 2311 *str++ = ch;
2720 2312
2721 if (ch == C0_LF || str >= eol) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2722 { 2314 {
2723 if (ch == C0_LF) 2315 if (ch == C0_LF)
2724 nlines++; 2316 nlines++;
2725 2317
2726 refresh_count++; 2318 refresh_count++;
2727 2319
2728 if (!OPTION (Opt_jumpScroll) 2320 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2321 {
2731 refreshnow = true;
2732 refresh_count = 0; 2322 refresh_count = 0;
2323
2324 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2325 {
2326 refreshnow = true;
2733 ch = NOCHAR; 2327 ch = NOCHAR;
2734 break; 2328 break;
2329 }
2735 } 2330 }
2736 2331
2737 // scr_add_lines only works for nlines <= nrow - 1. 2332 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2333 if (nlines >= nrow - 1)
2739 { 2334 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2362 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2363 scr_add_lines (buf, str - buf, nlines);
2769 2364
2770 /* 2365 /*
2771 * If there have been a lot of new lines, then update the screen 2366 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2367 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2368 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2369 */
2776 if (refreshnow) 2370 if (refreshnow)
2777 { 2371 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2784 scr_refresh (); 2372 scr_refresh ();
2785 want_refresh = 1; 2373 want_refresh = 1;
2786 }
2787 } 2374 }
2788
2789 } 2375 }
2790 else 2376 else
2791 { 2377 {
2792 try 2378 try
2793 { 2379 {
… …
2801 } 2387 }
2802 2388
2803 ch = NOCHAR; 2389 ch = NOCHAR;
2804 } 2390 }
2805 } 2391 }
2806
2807 return flag;
2808} 2392}
2809 2393
2810// read the next character 2394// read the next character
2811wchar_t 2395wchar_t ecb_hot
2812rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2813{ 2397{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2399 {
2816 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2817 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2818 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2819 2403
2820 wchar_t wc; 2404 wchar_t wc;
2821 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2405 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2406
… …
2826 cmdbuf_ptr = cmdbuf_endp; 2410 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2411 break;
2828 } 2412 }
2829 2413
2830 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2415 {
2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2831 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2420 }
2832 2421
2833 // assume wchar == unicode 2422 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2424 return wc & UNICODE_MASK;
2836 } 2425 }
2837 2426
2838 return NOCHAR; 2427 return NOCHAR;
2839} 2428}
2840 2429
2841// read the next octet 2430// read the next octet
2842uint32_t 2431uint32_t ecb_hot
2843rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2844{ 2433{
2845 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2846 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2847 : NOCHAR; 2436 : NOCHAR;
2848} 2437}
2849 2438
2850static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2851 2440
2852/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2853/*
2854 * Return the next input character after first passing any keyboard input
2855 * to the command.
2856 */
2857wchar_t
2858rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2859{ 2443{
2860 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2861 2445
2862 if (c == NOCHAR) 2446 if (c == NOCHAR)
2863 throw out_of_input; 2447 throw out_of_input;
2864 2448
2865 return c; 2449 return c;
2866} 2450}
2867 2451
2868uint32_t 2452uint32_t ecb_hot
2869rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2870{ 2454{
2871 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2872 2456
2873 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2877} 2461}
2878 2462
2879/*{{{ print pipe */ 2463/*{{{ print pipe */
2880/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2881#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2882FILE * 2466FILE * ecb_cold
2883rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2884{ 2468{
2885 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2886 2470
2887 if (stream == NULL) 2471 if (stream == NULL)
2888 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2889 2473
2890 return stream; 2474 return stream;
2891} 2475}
2892 2476
2893int 2477int ecb_cold
2894rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2895{ 2479{
2896 fflush (stream); 2480 fflush (stream);
2897 return pclose (stream); 2481 return pclose (stream);
2898} 2482}
2899 2483
2900/* 2484/*
2901 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2902 */ 2486 */
2903void 2487void ecb_cold
2904rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2905{ 2489{
2906 int done; 2490 FILE *fd = popen_printer ();
2907 FILE *fd;
2908 2491
2909 if ((fd = popen_printer ()) == NULL) 2492 if (!fd)
2910 return; 2493 return;
2911 2494
2912 /* 2495 /*
2913 * Send all input to the printer until either ESC[4i or ESC[?4i 2496 * Send all input to the printer until either ESC[4i or ESC[?4i
2914 * is received. 2497 * is received.
2915 */ 2498 */
2916 for (done = 0; !done;) 2499 for (int done = 0; !done; )
2917 { 2500 {
2918 unsigned char buf[8]; 2501 unsigned char buf[8];
2919 unicode_t ch; 2502 unicode_t ch;
2920 unsigned int i, len; 2503 unsigned int i, len;
2921 2504
… …
2940 { 2523 {
2941 if ((buf[len++] = cmd_getc ()) == 'i') 2524 if ((buf[len++] = cmd_getc ()) == 'i')
2942 break; /* done = 1 */ 2525 break; /* done = 1 */
2943 } 2526 }
2944 } 2527 }
2945 2528
2946 for (i = 0; i < len; i++) 2529 for (i = 0; i < len; i++)
2947 if (putc (buf[i], fd) == EOF) 2530 if (putc (buf[i], fd) == EOF)
2948 { 2531 {
2949 done = 1; 2532 done = 1;
2950 break; 2533 break;
… …
2952 } 2535 }
2953 } 2536 }
2954 2537
2955 pclose_printer (fd); 2538 pclose_printer (fd);
2956} 2539}
2957#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2958/*}}} */ 2541/*}}} */
2959 2542
2960/* *INDENT-OFF* */
2961enum { 2543enum {
2962 C1_40 = 0x40, 2544 C1_40 = 0x40,
2963 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2545 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2964 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2546 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2965 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2547 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2966 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2548 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2967}; 2549};
2968/* *INDENT-ON* */
2969 2550
2970/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2971void 2552void ecb_hot
2972rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2973{ 2554{
2974 switch (ch) 2555 switch (ch)
2975 { 2556 {
2976 case C0_ESC: 2557 case C0_ESC:
… …
3012 process_dcs_seq (); 2593 process_dcs_seq ();
3013 break; 2594 break;
3014 case 0x9b: /* CSI */ 2595 case 0x9b: /* CSI */
3015 process_csi_seq (); 2596 process_csi_seq ();
3016 break; 2597 break;
3017 case 0x9d: /* CSI */ 2598 case 0x9d: /* OSC */
3018 process_osc_seq (); 2599 process_osc_seq ();
3019 break; 2600 break;
3020#endif 2601#endif
3021 } 2602 }
3022} 2603}
3023/*}}} */ 2604/*}}} */
3024 2605
3025 2606
3026/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
3027void 2608void ecb_cold
3028rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
3029{ 2610{
3030 int row, col; 2611 int row, col;
3031 2612
3032 switch (ch) 2613 switch (ch)
… …
3066 break; 2647 break;
3067 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
3068 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3069 break; 2650 break;
3070 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
3071 PrivMode (0, PrivMode_vt52); 2652 priv_modes &= ~PrivMode_vt52;
3072 break; 2653 break;
3073 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
3074 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
3075 /* unimplemented */ 2656 /* unimplemented */
3076 break; 2657 break;
… …
3082} 2663}
3083/*}}} */ 2664/*}}} */
3084 2665
3085 2666
3086/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
3087void 2668void ecb_hot
3088rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
3089{ 2670{
3090 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
3091 2672
3092 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
3095 return; 2676 return;
3096 } 2677 }
3097 2678
3098 switch (ch) 2679 switch (ch)
3099 { 2680 {
3100 /* case 1: do_tek_mode (); break; */
3101 case '#': 2681 case '#':
3102 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
3103 scr_E (); 2683 scr_E ();
3104 break; 2684 break;
3105 case '(': 2685 case '(':
… …
3128#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
3129 case '9': 2709 case '9':
3130 scr_forwardindex (); 2710 scr_forwardindex ();
3131 break; 2711 break;
3132#endif 2712#endif
2713 // DECPAM/DECPNM
3133 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
3134 case '>': 2717 case '>':
3135 PrivMode ((ch == '='), PrivMode_aplKP); 2718 priv_modes &= ~PrivMode_aplKP;
3136 break; 2719 break;
3137 2720
3138 case C1_40: 2721 case C1_40:
3139 cmd_getc (); 2722 cmd_getc ();
3140 break; 2723 break;
… …
3144 2727
3145 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
3146 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
3147 { 2730 {
3148 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
3149 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3150 } 2733 }
3151 break; 2734 break;
3152 2735
3153 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
3154 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
3155 process_graphics (); 2738 // used by original rxvt for rob nations own graphics mode
2739 if (cmd_getc () == 'Q')
2740 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3156 break; 2741 break;
3157 2742
3158 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
3159 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
3160 scr_set_tab (1); 2745 scr_set_tab (1);
… …
3164 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
3165 scr_index (DN); 2750 scr_index (DN);
3166 break; 2751 break;
3167 2752
3168 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
3169 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
3170 2755
3171 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
3172 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
3173 2758
3174 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
3175 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
3176 process_dcs_seq (); 2761 process_dcs_seq ();
3177 break; 2762 break;
… …
3179 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2764 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3180 case C1_SCI: /* ESC Z */ 2765 case C1_SCI: /* ESC Z */
3181 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2766 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3182 break; /* steal obsolete ESC [ c */ 2767 break; /* steal obsolete ESC [ c */
3183 2768
3184 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2769 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3185 case C1_CSI: /* ESC [ */ 2770 case C1_CSI: /* ESC [ */
3186 process_csi_seq (); 2771 process_csi_seq ();
3187 break; 2772 break;
3188 2773
3189 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2774 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3190 case C1_OSC: /* ESC ] */ 2775 case C1_OSC: /* ESC ] */
3191 process_osc_seq (); 2776 process_osc_seq ();
3192 break; 2777 break;
3193 2778
3194 /* 8.3.106: RESET TO INITIAL STATE */ 2779 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3195 case 'c': 2780 case 'c':
3196 mbstate.reset (); 2781 mbstate.reset ();
3197 scr_poweron (); 2782 scr_poweron ();
3198 scrollbar_show (1); 2783 scrollBar.show (1);
3199 break; 2784 break;
3200 2785
3201 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2786 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3202 case 'n': 2787 case 'n':
3203 scr_charset_choose (2); 2788 scr_charset_choose (2);
… …
3210 } 2795 }
3211} 2796}
3212/*}}} */ 2797/*}}} */
3213 2798
3214/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3215/* *INDENT-OFF* */
3216enum { 2800enum {
3217 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
3218 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2802 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3219 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2803 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3220 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2804 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3223 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2807 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3224 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2808 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3225 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2809 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3226}; 2810};
3227 2811
3228#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3229 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3230 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3231#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
3232 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3233 2817
3234const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
3235 { 2819 {
3236 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2820 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3237 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2821 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3238 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2822 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3239 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2823 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3240 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2824 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3241 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2825 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3242 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2826 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3243 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2827 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3244 }; 2828 };
3245/* *INDENT-ON* */
3246 2829
3247void 2830void ecb_hot
3248rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
3249{ 2832{
3250 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
3251 unsigned int nargs, p; 2834 unsigned int nargs, p;
3252 int n, ndef; 2835 int n, ndef;
3253 int arg[ESC_ARGS]; 2836 int arg[ESC_ARGS] = { };
3254 2837
3255 for (nargs = ESC_ARGS; nargs > 0;) 2838 nargs = 0;
3256 arg[--nargs] = 0;
3257 2839
3258 priv = 0; 2840 priv = 0;
3259 ch = cmd_getc (); 2841 ch = cmd_getc ();
3260 if (ch >= '<' && ch <= '?') 2842 if ((ch >= '<' && ch <= '?') || ch == '!')
2843 {
3261 { /* '<' '=' '>' '?' */ 2844 /* '<' '=' '>' '?' '!' */
3262 priv = ch; 2845 priv = ch;
3263 ch = cmd_getc (); 2846 ch = cmd_getc ();
3264 } 2847 }
3265 2848
2849 prev_ch = 0;
3266 /* read any numerical arguments */ 2850 /* read any numerical arguments */
3267 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
3268 { 2852 {
3269 if (isdigit (ch)) 2853 if (isdigit (ch))
3270 { 2854 {
… …
3280 n = -1; 2864 n = -1;
3281 } 2865 }
3282 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
3283 process_nonprinting (ch); 2867 process_nonprinting (ch);
3284 2868
2869 prev_ch = ch;
3285 ch = cmd_getc (); 2870 ch = cmd_getc ();
3286 } 2871 }
3287 2872
3288 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
3289 return; 2874 return;
… …
3305 switch (priv) 2890 switch (priv)
3306 { 2891 {
3307 case '>': 2892 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2893 if (ch == CSI_DA) /* secondary device attributes */
3309 { 2894 {
3310 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2895 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2896 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 // 2897 //
3313 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2898 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3314 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2899 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3315 // that we do not support xterm mouse reporting (should be 95 when we do). 2900 // versions.
3316 // 2901 //
3317 tt_printf ("\033[>%d;94;0c", 'U'); 2902 tt_printf ("\033[>%d;95;0c", 'U');
3318 } 2903 }
3319 break; 2904 break;
2905
3320 case '?': 2906 case '?':
3321 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2907 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3322 process_terminal_mode (ch, priv, nargs, arg); 2908 process_terminal_mode (ch, priv, nargs, arg);
3323 break; 2909 break;
2910
2911 case '!':
2912 if (ch == CSI_70)
2913 {
2914 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2915 scr_soft_reset ();
2916
2917 static const int pm_h[] = { 7, 25 };
2918 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2919
2920 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2921 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3324 } 2922 }
2923 break;
2924 }
2925
3325 return; 2926 return;
3326 } 2927 }
3327 2928
3328 switch (ch) 2929 switch (ch)
3329 { 2930 {
… …
3343 } 2944 }
3344 break; 2945 break;
3345#endif 2946#endif
3346 2947
3347 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3348 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3349 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
3350 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
3351 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3352 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3353 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
3354 break; 2955 break;
3355 2956
3356 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3357 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3449 break; 3050 break;
3450 case 6: /* CPR requested */ 3051 case 6: /* CPR requested */
3451 scr_report_position (); 3052 scr_report_position ();
3452 break; 3053 break;
3453 case 7: /* unofficial extension */ 3054 case 7: /* unofficial extension */
3454 if (OPTION (Opt_insecure)) 3055 if (option (Opt_insecure))
3455 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3056 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3456 break; 3057 break;
3457 case 8: /* unofficial extension */ 3058 case 8: /* unofficial extension */
3458 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3059 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3459 break; 3060 break;
… …
3507 scr_insert_mode (1); 3108 scr_insert_mode (1);
3508 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3509 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3510 break; 3111 break;
3511 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3512 /* 3118 /*
3513 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3514 */ 3120 */
3515 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3516 if (nargs == 1) 3122 if (nargs == 1)
… …
3544 } 3150 }
3545} 3151}
3546/*}}} */ 3152/*}}} */
3547 3153
3548#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3549/* ARGSUSED */
3550void 3155void
3551rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3552{ 3157{
3553 int x, y; 3158 int x, y;
3554 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3563 { 3168 {
3564 /* 3169 /*
3565 * commands 3170 * commands
3566 */ 3171 */
3567 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3568 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3569 break; 3174 break;
3570 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3571 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3572 break; 3177 break;
3573 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3574 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3575 break; 3180 break;
3576 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3577 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3578 break; 3183 break;
3579 case 5: /* raise window */ 3184 case 5: /* raise window */
3580 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3581 break; 3186 break;
3582 case 6: /* lower window */ 3187 case 6: /* lower window */
3583 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3584 break; 3189 break;
3585 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3586 scr_touch (true); 3191 scr_touch (true);
3587 break; 3192 break;
3588 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3591 break; 3196 break;
3592 3197
3593 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3594 default: 3199 default:
3595 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3596 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3597 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3598 break; 3203 break;
3599 3204
3600 /* 3205 /*
3601 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3602 */ 3207 */
3603 case 11: /* report window state */ 3208 case 11: /* report window state */
3604 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3605 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3606 break; 3211 break;
3607 case 13: /* report window position */ 3212 case 13: /* report window position */
3608 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3609 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3610 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3611 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3612 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3613 break; 3218 break;
3614 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3615 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3616 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3617 break; 3222 break;
3618 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3619 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3620 break; 3225 break;
… …
3622 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3623 break; 3228 break;
3624 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3625 { 3230 {
3626 char *s; 3231 char *s;
3627 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3628 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3233 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3234 XFree (s);
3630 } 3235 }
3631 break; 3236 break;
3632 case 21: /* report window title */ 3237 case 21: /* report window title */
3633 { 3238 {
3634 char *s; 3239 char *s;
3635 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3636 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3241 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3242 XFree (s);
3638 } 3243 }
3639 break; 3244 break;
3640 } 3245 }
3641} 3246}
… …
3650rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3651{ 3256{
3652 unicode_t ch; 3257 unicode_t ch;
3653 bool seen_esc = false; 3258 bool seen_esc = false;
3654 unsigned int n = 0; 3259 unsigned int n = 0;
3655 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3656 3261
3657 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3658 { 3263 {
3659 if (seen_esc) 3264 if (seen_esc)
3660 { 3265 {
… …
3668 seen_esc = true; 3273 seen_esc = true;
3669 continue; 3274 continue;
3670 } 3275 }
3671 else if (ch == C0_BEL || ch == CHAR_ST) 3276 else if (ch == C0_BEL || ch == CHAR_ST)
3672 break; 3277 break;
3278 else if (ch == C0_SYN)
3279 ch = cmd_get8 ();
3673 else if (ch < 0x20) 3280 else if (ch < 0x20)
3674 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3675 3282
3676 seen_esc = false; 3283 seen_esc = false;
3677 3284
3678 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3679 // stop at some sane length 3286 // stop at some sane length
3680 return NULL; 3287 return NULL;
3681 3288
3682 if (ch == C0_SYN)
3683 string[n++] = cmd_get8 ();
3684 else
3685 string[n++] = ch; 3289 string[n++] = ch;
3686 } 3290 }
3687 3291
3688 string[n++] = '\0'; 3292 string[n++] = '\0';
3689 3293
3690 ends_how = (ch == 0x5c ? C0_ESC : ch); 3294 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3697 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3301 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3698 */ 3302 */
3699void 3303void
3700rxvt_term::process_dcs_seq () 3304rxvt_term::process_dcs_seq ()
3701{ 3305{
3702 char *s;
3703 unicode_t eh;
3704
3705 /* 3306 /*
3706 * Not handled yet 3307 * Not handled yet
3707 */ 3308 */
3309
3310 unicode_t eh;
3708 s = get_to_st (eh); 3311 char *s = get_to_st (eh);
3709 if (s) 3312 if (s)
3710 free (s); 3313 free (s);
3711 3314
3712 return; 3315 return;
3713} 3316}
… …
3717 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3320 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3718 */ 3321 */
3719void 3322void
3720rxvt_term::process_osc_seq () 3323rxvt_term::process_osc_seq ()
3721{ 3324{
3722 unicode_t ch, eh;
3723 int arg; 3325 int arg;
3724 3326
3725 ch = cmd_getc (); 3327 unicode_t ch = cmd_getc ();
3726 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3328 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3727 arg = arg * 10 + (ch - '0'); 3329 arg = arg * 10 + (ch - '0');
3728 3330
3729 if (ch == ';') 3331 if (ch == ';')
3730 { 3332 {
3333 unicode_t eh;
3731 char *s = get_to_st (eh); 3334 char *s = get_to_st (eh);
3732 3335
3733 if (s) 3336 if (s)
3734 { 3337 {
3735 process_xterm_seq (arg, s, eh); 3338 process_xterm_seq (arg, s, eh);
… …
3759 3362
3760/* 3363/*
3761 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3364 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3762 */ 3365 */
3763void 3366void
3764rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3367rxvt_term::process_xterm_seq (int op, char *str, char resp)
3765{ 3368{
3766 int color; 3369 int color;
3767 char *buf, *name; 3370 char *buf, *name;
3768 bool query = str[0] == '?' && !str[1]; 3371 bool query = str[0] == '?' && !str[1];
3769 int saveop = op; 3372 int saveop = op;
3770 3373
3771 dLocal (Display *, dpy); 3374 dLocal (Display *, dpy);
3772 3375
3773 assert (str != NULL); 3376 assert (str != NULL);
3774 3377
3775 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3378 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3776 return; 3379 return;
3777 3380
3778 switch (op) 3381 switch (op)
3779 { 3382 {
… …
3796 unsigned long bytes_after; 3399 unsigned long bytes_after;
3797 unsigned char *value = 0; 3400 unsigned char *value = 0;
3798 const char *str = ""; 3401 const char *str = "";
3799 3402
3800 if (prop 3403 if (prop
3801 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3802 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3803 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3804 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3805 && actual_type != None 3408 && actual_type != None
3806 && actual_format == 8) 3409 && actual_format == 8)
3807 str = (const char *)(value); 3410 str = (const char *)(value);
3808 3411
3809 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3810 3413
3811 XFree (value); 3414 XFree (value);
3812 } 3415 }
3813 else 3416 else
3814 { 3417 {
3815 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3418 char *eq = strchr (str, '=');
3816 3419
3817 if (eq) 3420 if (eq)
3818 { 3421 {
3819 *eq = 0; 3422 *eq = 0;
3820 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3821 } 3424 }
3822 else 3425 else
3823 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3824 display->atom (str)); 3427 display->atom (str));
3825 } 3428 }
3826 break; 3429 break;
3827 3430
3828 case XTerm_Color: 3431 case XTerm_Color:
… …
3841 *buf++ = '\0'; 3444 *buf++ = '\0';
3842 3445
3843 process_color_seq (op, color, name, resp); 3446 process_color_seq (op, color, name, resp);
3844 } 3447 }
3845 break; 3448 break;
3449 case Rxvt_restoreFG:
3846 case XTerm_Color00: 3450 case XTerm_Color00:
3847 process_color_seq (op, Color_fg, str, resp); 3451 process_color_seq (op, Color_fg, str, resp);
3848 break; 3452 break;
3453 case Rxvt_restoreBG:
3849 case XTerm_Color01: 3454 case XTerm_Color01:
3850 process_color_seq (op, Color_bg, str, resp); 3455 process_color_seq (op, Color_bg, str, resp);
3851 break; 3456 break;
3852#ifndef NO_CURSORCOLOR 3457#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3458 case XTerm_Color_cursor:
… …
3858 process_color_seq (op, Color_pointer_fg, str, resp); 3463 process_color_seq (op, Color_pointer_fg, str, resp);
3859 break; 3464 break;
3860 case XTerm_Color_pointer_bg: 3465 case XTerm_Color_pointer_bg:
3861 process_color_seq (op, Color_pointer_bg, str, resp); 3466 process_color_seq (op, Color_pointer_bg, str, resp);
3862 break; 3467 break;
3468#ifdef OPTION_HC
3469 case XTerm_Color_HC:
3470 process_color_seq (op, Color_HC, str, resp);
3471 break;
3472 case XTerm_Color_HTC:
3473 process_color_seq (op, Color_HTC, str, resp);
3474 break;
3475#endif
3863#ifndef NO_BOLD_UNDERLINE_REVERSE 3476#ifndef NO_BOLD_UNDERLINE_REVERSE
3864 case XTerm_Color_RV:
3865 process_color_seq (op, Color_RV, str, resp);
3866 break;
3867 case Rxvt_Color_BD:
3868 case URxvt_Color_BD: 3477 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp); 3478 process_color_seq (op, Color_BD, str, resp);
3870 break; 3479 break;
3871 case Rxvt_Color_UL:
3872 case URxvt_Color_UL: 3480 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp); 3481 process_color_seq (op, Color_UL, str, resp);
3874 break; 3482 break;
3875 case URxvt_Color_IT: 3483 case URxvt_Color_IT:
3876 process_color_seq (op, Color_IT, str, resp); 3484 process_color_seq (op, Color_IT, str, resp);
3877 break; 3485 break;
3878#endif 3486#endif
3879#if TRANSPARENT && TINTING 3487 case URxvt_Color_border:
3488 process_color_seq (op, Color_border, str, resp);
3489 break;
3490
3491#if BG_IMAGE_FROM_ROOT
3880 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3881 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3494 {
3495 bool changed = false;
3882 3496
3883 check_our_parents (); 3497 if (ISSET_PIXCOLOR (Color_tint))
3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3884 3499
3885 if (am_transparent) 3500 if (changed)
3886 want_full_refresh = want_refresh = 1; 3501 update_background ();
3502 }
3887 3503
3888 break; 3504 break;
3889#endif 3505#endif
3890 3506
3507#if BG_IMAGE_FROM_FILE
3891 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3509 if (!strcmp (str, "?"))
3892 { 3510 {
3511 char str[256];
3512 int h_scale = fimage.h_scale;
3513 int v_scale = fimage.v_scale;
3514 int h_align = fimage.h_align;
3515 int v_align = fimage.v_align;
3516
3517 sprintf (str, "[%dx%d+%d+%d]",
3518 h_scale, v_scale,
3519 h_align, v_align);
3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
3521 }
3522 else
3523 {
3524 bool changed = false;
3525
3893 if (*str != ';') 3526 if (*str != ';')
3894 { 3527 {
3895#if XPM_BACKGROUND 3528 try
3896 scale_pixmap (""); /* reset to default scaling */ 3529 {
3897 set_bgPixmap (str); /* change pixmap */ 3530 fimage.set_file_geometry (this, str);
3898 scr_touch (true); 3531 changed = true;
3899#endif 3532 }
3533 catch (const class rxvt_failure_exception &e)
3534 {
3535 }
3900 } 3536 }
3901 3537 else
3902 int changed = 0;
3903
3904 while ((str = strchr (str, ';')) != NULL)
3905 { 3538 {
3906 str++; 3539 str++;
3907#if XPM_BACKGROUND 3540 if (fimage.set_geometry (str, true))
3908 changed += scale_pixmap (str); 3541 changed = true;
3909#endif
3910 } 3542 }
3911 3543
3912 if (changed) 3544 if (changed)
3913 { 3545 {
3914#ifdef XPM_BACKGROUND 3546 if (bg_window_position_sensitive ())
3915 resize_pixmap (); 3547 {
3916 scr_touch (true); 3548 int x, y;
3917#endif 3549 get_window_origin (x, y);
3550 parent_x = x;
3551 parent_y = y;
3552 }
3553 update_background ();
3918 } 3554 }
3919 } 3555 }
3920 break; 3556 break;
3921 3557#endif
3922 case Rxvt_restoreFG:
3923 set_window_color (Color_fg, str);
3924 break;
3925 case Rxvt_restoreBG:
3926 set_window_color (Color_bg, str);
3927 break;
3928 3558
3929 case XTerm_logfile: 3559 case XTerm_logfile:
3930 // TODO, when secure mode? 3560 // TODO, when secure mode?
3931 break; 3561 break;
3932 3562
… …
3950 case URxvt_italicFont: 3580 case URxvt_italicFont:
3951 case URxvt_boldItalicFont: 3581 case URxvt_boldItalicFont:
3952#endif 3582#endif
3953 if (query) 3583 if (query)
3954 tt_printf ("\33]%d;%-.250s%c", saveop, 3584 tt_printf ("\33]%d;%-.250s%c", saveop,
3955 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3585 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3956 ? fontset[op - URxvt_font]->fontdesc : "", 3586 ? fontset[op - URxvt_font]->fontdesc : "",
3957 resp); 3587 resp);
3958 else 3588 else
3959 { 3589 {
3960 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3590 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3974 break; 3604 break;
3975 3605
3976#if !ENABLE_MINIMAL 3606#if !ENABLE_MINIMAL
3977 case URxvt_locale: 3607 case URxvt_locale:
3978 if (query) 3608 if (query)
3979 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3609 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3980 else 3610 else
3981 { 3611 {
3982 set_locale (str); 3612 set_locale (str);
3983 pty->set_utf8_mode (enc_utf8); 3613 pty->set_utf8_mode (enc_utf8);
3984 init_xlocale (); 3614 init_xlocale ();
… …
3999 break; 3629 break;
4000#endif 3630#endif
4001 3631
4002#if ENABLE_PERL 3632#if ENABLE_PERL
4003 case URxvt_perl: 3633 case URxvt_perl:
4004 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3634 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4005 ; // no responses yet
4006 break; 3635 break;
4007#endif 3636#endif
4008 } 3637 }
4009} 3638}
4010/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
… …
4017 * 's' = save 3646 * 's' = save
4018 * 'r' = restore 3647 * 'r' = restore
4019 * 't' = toggle 3648 * 't' = toggle
4020 * so no need for fancy checking 3649 * so no need for fancy checking
4021 */ 3650 */
4022int 3651int ecb_cold
4023rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
4024{ 3653{
4025 int state; 3654 int state;
4026 3655
4027 if (mode == 's') 3656 if (mode == 's')
4028 { 3657 {
4029 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
4030 return -1; 3662 return -1;
4031 } 3663 }
4032 else 3664 else
4033 { 3665 {
4034 if (mode == 'r') 3666 if (mode == 'r')
4035 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4036 else 3668 else
4037 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4038 PrivMode (state, bit); 3670
3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
4039 } 3675 }
4040 3676
4041 return state; 3677 return state;
4042} 3678}
4043 3679
4044/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
4045void 3681void
4046rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3682rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4047{ 3683{
4048 unsigned int i, j; 3684 unsigned int i, j;
4049 int state; 3685 int state;
4050 3686
4051 static const struct 3687 static const struct
4052 { 3688 {
4053 const int argval; 3689 const int argval;
4054 const unsigned long bit; 3690 const unsigned long bit;
4055 }
4056
4057 argtopriv[] = { 3691 } argtopriv[] = {
4058 { 1, PrivMode_aplCUR }, 3692 { 1, PrivMode_aplCUR }, // DECCKM
4059 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
4060 { 3, PrivMode_132 }, 3694 { 3, PrivMode_132 }, // DECCOLM
4061 { 4, PrivMode_smoothScroll }, 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
4062 { 5, PrivMode_rVideo }, 3696 { 5, PrivMode_rVideo }, // DECSCNM
4063 { 6, PrivMode_relOrigin }, 3697 { 6, PrivMode_relOrigin }, // DECOM
4064 { 7, PrivMode_Autowrap }, 3698 { 7, PrivMode_Autowrap }, // DECAWM
4065 // 8, bi-directional support mode 3699 // 8, auto-repeat keys // DECARM
4066 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
4067 // 18, 19 printing-related 3701 // 18 end FF to printer after print screen
3702 // 19 Print screen prints full screen/scroll region
4068 { 25, PrivMode_VisibleCursor }, 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4069#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
4070 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
4071#endif 3706#endif
4072 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3708 // 38, tektronix mode // DECTEK
4073 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
4074 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
4075 // 45 margin bell NYI 3711 // 45 margin bell NYI
4076 // 46 start logging 3712 // 46 start logging
4077 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
4078 { 66, PrivMode_aplKP }, 3714 { 66, PrivMode_aplKP }, // DECNKM
4079#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
4080 { 67, PrivMode_BackSpace }, 3716 { 67, PrivMode_BackSpace }, // DECBKM
4081#endif 3717#endif
4082 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
4083 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3719 { 1002, PrivMode_MouseBtnEvent },
4084 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3720 { 1003, PrivMode_MouseAnyEvent },
4085 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
4086 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4087 { 1011, PrivMode_Keypress }, // rxvt extension 3725 { 1011, PrivMode_Keypress }, // rxvt extension
3726#if ENABLE_FRILLS
3727 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3728#endif
4088 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
4089 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
4090 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
4091 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
4092 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
4093 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3734 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4094 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3736 { 2004, PrivMode_BracketPaste },
4095 }; 3737 };
4096 3738
4097 if (nargs == 0) 3739 if (nargs == 0)
4098 return; 3740 return;
4099 3741
… …
4106 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
4107 { 3749 {
4108 state = -1; 3750 state = -1;
4109 3751
4110 /* basic handling */ 3752 /* basic handling */
4111 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
4112 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
4113 { 3755 {
4114 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
4115 break; 3757 break;
4116 } 3758 }
… …
4124 3766
4125 scr_touch (true); 3767 scr_touch (true);
4126 break; 3768 break;
4127#endif 3769#endif
4128 case 1048: /* alternative cursor save */ 3770 case 1048: /* alternative cursor save */
4129 case 1049:
4130 if (OPTION (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
4131 if (mode == 0) 3772 if (mode == 0)
4132 scr_cursor (RESTORE); 3773 scr_cursor (RESTORE);
4133 else if (mode == 1) 3774 else if (mode == 1)
4134 scr_cursor (SAVE); 3775 scr_cursor (SAVE);
4135 break; 3776 break;
… …
4143 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
4144 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
4145 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
4146 * within VT52 mode 3787 * within VT52 mode
4147 */ 3788 */
4148 PrivMode (1, PrivMode_vt52); 3789 priv_modes |= PrivMode_vt52;
4149 break; 3790 break;
4150 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
4151 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
4152 set_widthheight (((state ? 132 : 80) * fwidth), height); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4153 break; 3794 break;
4154 case 4: /* smooth scrolling */ 3795 case 4: /* smooth scrolling */
4155 set_option (Opt_jumpScroll, !state); 3796 set_option (Opt_jumpScroll, !state);
4156 break; 3797 break;
4157 case 5: /* reverse video */ 3798 case 5: /* reverse video */
… …
4164 scr_autowrap (state); 3805 scr_autowrap (state);
4165 break; 3806 break;
4166 /* case 8: - auto repeat, can't do on a per window basis */ 3807 /* case 8: - auto repeat, can't do on a per window basis */
4167 case 9: /* X10 mouse reporting */ 3808 case 9: /* X10 mouse reporting */
4168 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX11; 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3811 break;
4171#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
4172 case scrollBar_esc: 3813 case scrollBar_esc:
4173 if (scrollbar_mapping (state)) 3814 scrollBar.map (state);
4174 {
4175 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
4176 scr_touch (true); 3816 scr_touch (true);
4177 }
4178 break; 3817 break;
4179#endif 3818#endif
4180 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
4181 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
4182 break; 3821 break;
… …
4187 break; 3826 break;
4188 /* case 66: - application key pad */ 3827 /* case 66: - application key pad */
4189 /* case 67: - backspace key */ 3828 /* case 67: - backspace key */
4190 case 1000: /* X11 mouse reporting */ 3829 case 1000: /* X11 mouse reporting */
4191 if (state) /* orthogonal */ 3830 if (state) /* orthogonal */
4192 priv_modes &= ~PrivMode_MouseX10; 3831 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4193 break; 3832 break;
4194#if 0
4195 case 1001: 3833 case 1002:
4196 break; /* X11 mouse highlighting */ 3834 case 1003:
4197#endif 3835 if (state)
3836 {
3837 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3838 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3839 mouse_row = mouse_col = 0;
3840 vt_emask_mouse = PointerMotionMask;
3841 }
3842 else
3843 vt_emask_mouse = NoEventMask;
3844
3845 vt_select_input ();
3846 break;
4198 case 1010: /* scroll to bottom on TTY output inhibit */ 3847 case 1010: /* scroll to bottom on TTY output inhibit */
4199 set_option (Opt_scrollTtyOutput, !state); 3848 set_option (Opt_scrollTtyOutput, !state);
4200 break; 3849 break;
4201 case 1011: /* scroll to bottom on key press */ 3850 case 1011: /* scroll to bottom on key press */
4202 set_option (Opt_scrollTtyKeypress, state); 3851 set_option (Opt_scrollTtyKeypress, state);
4203 break; 3852 break;
4204 case 1047: /* secondary screen w/ clearing last */ 3853 case 1047: /* secondary screen w/ clearing last */
4205 if (OPTION (Opt_secondaryScreen)) 3854 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3855 if (!state)
4207 scr_erase_screen (2); 3856 scr_erase_screen (2);
3857
4208 scr_change_screen (state); 3858 scr_change_screen (state);
4209 break; 3859 break;
4210 case 1049: /* secondary screen w/ clearing first */ 3860 case 1049: /* secondary screen w/ clearing first */
3861 if (option (Opt_secondaryScreen))
3862 if (state)
3863 scr_cursor (SAVE);
3864
4211 scr_change_screen (state); 3865 scr_change_screen (state);
3866
4212 if (OPTION (Opt_secondaryScreen)) 3867 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3868 if (state)
4214 scr_erase_screen (2); 3869 scr_erase_screen (2);
3870 else
3871 scr_cursor (RESTORE);
4215 break; 3872 break;
4216 default: 3873 default:
4217 break; 3874 break;
4218 } 3875 }
4219 } 3876 }
4220} 3877}
4221/*}}} */ 3878/*}}} */
4222 3879
4223/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
4224void 3881void ecb_hot
4225rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4226{ 3883{
4227 unsigned int i; 3884 unsigned int i;
4228 short rendset; 3885 short rendset;
4229 int rendstyle; 3886 int rendstyle;
… …
4370 break; 4027 break;
4371#endif 4028#endif
4372 } 4029 }
4373 } 4030 }
4374} 4031}
4375/*}}} */
4376 4032
4377/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4378void 4033void
4379rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
4380{ 4035{
4381 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
4382
4383 if (cmd == 'Q')
4384 { /* query graphics */
4385 tt_printf ("\033G0\012"); /* no graphics */
4386 return; 4037 return;
4387 } 4038
4388 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
4389 do 4040
4390 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
4391 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4392} 4047}
4393/*}}} */ 4048/*}}} */
4394 4049
4395/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
4396 4051
… …
4412 4067
4413/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
4414/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user, pasted with the mouse,
4415 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
4416 */ 4071 */
4417const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4418 4073
4419void 4074void
4420rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
4421{ 4076{
4422 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4427 4082
4428 if (v_buflen == 0) 4083 if (v_buflen == 0)
4429 { 4084 {
4430 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4085 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4431 4086
4087 max_it (written, 0);
4088
4432 if ((unsigned int)written == len) 4089 if (written == len)
4433 return; 4090 return;
4434 4091
4435 data += written; 4092 data += written;
4436 len -= written; 4093 len -= written;
4437 } 4094 }
4438 4095
4439 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4440 4097
4441 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
4442 v_buflen += len; 4099 v_buflen += len;
4443 4100
4444 pty_ev.set (EVENT_READ | EVENT_WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);
4445} 4102}
4446 4103
4447void rxvt_term::pty_write () 4104void rxvt_term::pty_write ()
4448{ 4105{
4449 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4106 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4454 4111
4455 if (v_buflen == 0) 4112 if (v_buflen == 0)
4456 { 4113 {
4457 free (v_buffer); 4114 free (v_buffer);
4458 v_buffer = 0; 4115 v_buffer = 0;
4459 v_buflen = 0;
4460 4116
4461 pty_ev.set (EVENT_READ); 4117 pty_ev.set (ev::READ);
4462 return; 4118 return;
4463 } 4119 }
4464 4120
4465 memmove (v_buffer, v_buffer + written, v_buflen); 4121 memmove (v_buffer, v_buffer + written, v_buflen);
4466 } 4122 }
4467 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4123 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4468 pty_ev.set (EVENT_READ); 4124 pty_ev.set (ev::READ);
4469} 4125}
4470 4126
4471/*----------------------- end-of-file (C source) -----------------------*/ 4127/*----------------------- end-of-file (C source) -----------------------*/
4472 4128

Diff Legend

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