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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.546 by sf-exg, Tue Apr 29 07:50:53 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 + 1];
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
… …
519# endif 843# endif
520 return; 844 return;
521 } 845 }
522 else 846 else
523 { 847 {
524# if ENABLE_OVERLAY 848# if ISO_14755
525 scr_overlay_off (); 849 scr_overlay_off ();
526# endif 850# endif
527 iso14755buf = 0; 851 iso14755buf = 0;
528 } 852 }
529 } 853 }
854 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 855 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 856 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 857 if (!(iso14755buf & ISO_14755_STARTED))
533 { 858 {
534 iso14755buf |= ISO_14755_STARTED; 859 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 860# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 861 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 862 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 863# endif
539 } 864 }
540#endif 865#endif
… …
544 { 869 {
545 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
546 return; 871 return;
547 } 872 }
548#endif 873#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 874 }
883 875
884 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)))
885 return; 877 return;
886 878
… …
892 { 884 {
893 view_start = 0; 885 view_start = 0;
894 want_refresh = 1; 886 want_refresh = 1;
895 } 887 }
896 888
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
923} 890}
924 891
925void 892void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
927{ 894{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 896 KeySym keysym;
930 897
… …
934#if ENABLE_FRILLS || ISO_14755 901#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 902 // ISO 14755 support
936 if (iso14755buf) 903 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 904 if (iso14755buf & ISO_14755_52)
938 { 905 {
939# if ENABLE_OVERLAY 906# if ISO_14755
940 scr_overlay_off (); 907 scr_overlay_off ();
941# endif 908# endif
942# if ISO_14755 909# if ISO_14755
943 // iso14755 part 5.2 handling: release time 910 // iso14755 part 5.2 handling: release time
944 // first: controls 911 // first: controls
… …
950 commit_iso14755 (); 917 commit_iso14755 ();
951 918
952 return; 919 return;
953 } 920 }
954 921
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 922 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 923 if (i[0] == keysym)
957 { 924 {
958 iso14755buf = ISO_14755_51 | i[1]; 925 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 926 commit_iso14755 ();
960 927
… …
967 934
968 return; 935 return;
969 } 936 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 937 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 938 {
972# if ENABLE_OVERLAY 939# if ISO_14755
973 scr_overlay_off (); 940 scr_overlay_off ();
974# endif 941# endif
975 if (iso14755buf & ISO_14755_51) 942 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 943 commit_iso14755 ();
977#if ISO_14755 944#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
999#endif 966#endif
1000} 967}
1001 968
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 969void
1036rxvt_term::flush () 970rxvt_term::flush ()
1037{ 971{
1038 flush_ev.stop (); 972 flush_ev.stop ();
1039 973
1040#ifdef TRANSPARENT 974#ifdef HAVE_IMG
1041 if (want_full_refresh) 975 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 976 {
1043 want_full_refresh = 0; 977 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 978 scr_touch (false);
1046 } 979 }
1047#endif 980#endif
1048 981
1049 if (want_refresh) 982 if (want_refresh)
… …
1085 } 1018 }
1086 while (row < end_row); 1019 while (row < end_row);
1087 } 1020 }
1088 1021
1089 scr_refresh (); 1022 scr_refresh ();
1090 scrollbar_show (1); 1023 scrollBar.show (1);
1091#ifdef USE_XIM 1024#if USE_XIM
1092 IMSendSpot (); 1025 im_send_spot ();
1093#endif 1026#endif
1094 } 1027 }
1095 1028
1096 display->flush (); 1029 display->flush ();
1097} 1030}
1098 1031
1032/* checks whether a refresh is requested and starts the refresh timer */
1099void 1033void
1100rxvt_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)
1101{ 1044{
1102 make_current (); 1045 make_current ();
1103 1046
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1047 refresh_count = 0;
1117 flush (); 1048 flush ();
1118} 1049}
1119 1050
1120#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1121void 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
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1069{
1124 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1071 want_refresh = 1;
1126 1072 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1073}
1129#endif 1074#endif
1130 1075
1131#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1132void 1077void
1133rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1079{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1081 {
1137 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1138 want_refresh = 1; 1083 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1140 } 1085 }
1086 else
1087 w.stop ();
1141} 1088}
1142#endif 1089#endif
1143 1090
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1092void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1094{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1150 { 1097 {
1151 want_refresh = 1; 1098 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1153 } 1100 }
1101 else
1102 w.stop ();
1154} 1103}
1155#endif 1104#endif
1156 1105
1157#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1158void 1107void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1109{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1162 { 1111 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1113 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1166 } 1115 }
1116 else
1117 w.stop ();
1167} 1118}
1168#endif 1119#endif
1169 1120
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1122void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1124{
1174 if (mouse_slip_wheel_speed == 0 1125 if (scr_page (mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1126 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1127 want_refresh = 1;
1182 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 ();
1183 } 1135 }
1184} 1136}
1185#endif 1137#endif
1186 1138
1187#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1188static struct event_handler 1140static struct event_handler
1189{ 1141{
1190 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1191 1143
1192 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1193 { 1145 {
1194 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1147 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1153
1199 struct timespec ts = { 0, 0 }; 1154 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1155 nanosleep (&ts, 0);
1201 1156
1202 w.stop (); 1157 w.stop ();
1203 } 1158 }
1204 1159
… …
1207 { 1162 {
1208 } 1163 }
1209} event_handler; 1164} event_handler;
1210#endif 1165#endif
1211 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
1212bool 1200bool
1213rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1214{ 1202{
1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1216 1204
1217 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1218 { 1206
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1220 n = 0;
1221 } 1208 {
1222 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1224 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1225 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1226 1214
1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1228 1216
1229 if (r > 0) 1217 if (r > 0)
1230 { 1218 {
1231 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1232 return true; 1220 return true;
… …
1248 1236
1249 return false; 1237 return false;
1250} 1238}
1251 1239
1252void 1240void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1241rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1242{
1255 make_current (); 1243 make_current ();
1256 1244
1257 if (revents & EVENT_READ) 1245 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1246 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1247 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1248 cmd_parse ();
1261 break;
1262 1249
1263 if (revents & EVENT_WRITE) 1250 if (revents & ev::WRITE)
1264 pty_write (); 1251 pty_write ();
1265}
1266 1252
1267void 1253 refresh_check ();
1254}
1255
1256void ecb_cold
1268rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1269{ 1258{
1270 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor (); 1260 recolour_cursor ();
1272 1261
1273#ifdef POINTER_BLANK 1262#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1263 hidden_pointer = 0;
1275 1264
1276 if (option (Opt_pointerBlank)) 1265 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1278#endif 1267#endif
1279} 1268}
1280 1269
1281#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1282void 1271void ecb_cold
1283rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1284{ 1273{
1285 if (!option (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1286 return; 1275 return;
1287 1276
… …
1289 XFlush (dpy); 1278 XFlush (dpy);
1290 1279
1291 hidden_pointer = 1; 1280 hidden_pointer = 1;
1292} 1281}
1293 1282
1294void 1283void ecb_cold
1295rxvt_term::pointer_cb (time_watcher &w) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1285{
1297 make_current (); 1286 make_current ();
1298 1287
1299 pointer_blank (); 1288 pointer_blank ();
1300} 1289}
… …
1303void 1292void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1293rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1294{
1306 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1307 int x, y; 1296 int x, y;
1297 int code = 32;
1308 1298
1309 x = ev.x; 1299 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1300 y = Pixel2Row (ev.y) + 1;
1311 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 }
1312 1311
1313 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
1314 button_number = 3; 1313 button_number = 3;
1315 else 1314 else
1316 { 1315 {
1317 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1318 if (button_number >= 3)
1320 button_number += (64 - 3); 1319 button_number += 64 - 3;
1321 } 1320 }
1322 1321
1323 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1324 { 1323 {
1325 /* 1324 /*
… …
1357 fputc ('A', stderr); 1356 fputc ('A', stderr);
1358 if (key_state & 32) 1357 if (key_state & 32)
1359 fputc ('2', stderr); 1358 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1360 button_number,
1362 x + 1, 1361 x,
1363 y + 1); 1362 y);
1364#endif 1363#endif
1365 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
1366 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1379 code + button_number + key_state,
1368 (32 + x + 1), 1380 32 + x,
1369 (32 + y + 1)); 1381 32 + y);
1370} 1382}
1371 1383
1372/*{{{ process an X event */ 1384/*{{{ process an X event */
1373void 1385void ecb_hot
1374rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1375{ 1387{
1376 make_current (); 1388 make_current ();
1377 1389
1378 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1446 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1447 focus_out ();
1436 } 1448 }
1437#endif 1449#endif
1438 } 1450 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1451 break;
1444 1452
1445 /* 1453 /*
1446 * XXX: this is not the _current_ arrangement 1454 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1455 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1488 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1489 focus_out ();
1482 break; 1490 break;
1483 1491
1484 case ConfigureNotify: 1492 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1486 { 1494 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 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 }
1489 1530
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1532 {
1492 seen_resize = 1; 1533 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1535 }
1536 else
1537 {
1538#ifdef HAVE_BG_PIXMAP
1539 if (moved)
1540 update_background ();
1541#endif
1542 }
1502 1543
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1545 }
1510 break; 1546 break;
1511 1547
1512 case PropertyNotify: 1548 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1550 break;
1519 1551
1520 case SelectionClear: 1552 case SelectionClear:
1521 selection_clear (); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1554 break;
1528 1555
1529 case SelectionRequest: 1556 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1531 break; 1558 break;
1532 1559
1533 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
1534 mapped = 1; 1572 mapped = 1;
1535#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1574 text_blink_ev.start ();
1537#endif 1575#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1576 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1577 break;
1540 1578
1541 case UnmapNotify: 1579 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1581#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1582 text_blink_ev.stop ();
1545#endif 1583#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1584 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1585 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1586
1555 case GraphicsExpose: 1587 case GraphicsExpose:
1556 case Expose: 1588 case Expose:
1557 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1558 { 1590 {
1559 do 1591 do
1592 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1595 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1597
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1599
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1601 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1604 }
1569 1605
1570 want_refresh = 1; 1606 want_refresh = 1;
1571 } 1607 }
1572 else 1608 else
1573 { 1609 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1613 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1615 ;
1580 1616
1581 if (isScrollbarWindow (ev.xany.window)) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1618 {
1583 scrollBar.setIdle (); 1619 scrollBar.state = SB_STATE_IDLE;
1584 scrollbar_show (0); 1620 scrollBar.show (0);
1585 } 1621 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1622 }
1592 break; 1623 break;
1593 1624
1594 case MotionNotify: 1625 case MotionNotify:
1595#ifdef POINTER_BLANK 1626#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1627 if (hidden_pointer)
1597 pointer_unblank (); 1628 pointer_unblank ();
1598#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);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1633 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1634 break;
1601 1635
1602 if (ev.xany.window == vt) 1636 if (ev.xany.window == vt)
1603 { 1637 {
… …
1632 1666
1633#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1634 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1635 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1636 { 1670 {
1671 page_dirn scroll_selection_dir;
1637 int dist; 1672 int dist;
1638 1673
1639 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1641 */ 1676 */
1642 if (!sel_scroll_ev.active) 1677 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1678 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1679
1645 /* save the event params so we can highlight 1680 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1681 * the selection in the pending-scroll loop
1647 */ 1682 */
1648 selection_save_x = ev.xbutton.x; 1683 selection_save_x = ev.xbutton.x;
… …
1656 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1657 } 1692 }
1658 else 1693 else
1659 { 1694 {
1660 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1661 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1662 } 1697 }
1663 1698
1664 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1665 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1; 1701 + 1;
1667 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1668 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1669 } 1705 }
1670 else 1706 else
1671 { 1707 {
1672 /* we are within the text window, so we 1708 /* we are within the text window, so we
1673 * shouldn't be scrolling 1709 * shouldn't be scrolling
1674 */ 1710 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1711 sel_scroll_ev.stop();
1677 } 1712 }
1678#endif 1713#endif
1679#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1680 } 1715 }
1681#endif 1716#endif
1682 } 1717 }
1683 } 1718 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1720 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1688 ; 1723 ;
1689 1724
1690 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1729 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1731 scrollBar.size ());
1697 want_refresh = 1; 1732 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1733 scrollBar.show (1);
1700 } 1734 }
1701 break; 1735 break;
1702 } 1736 }
1703 1737
1704#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1706 { 1740 cursor_blink_reset ();
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif 1741#endif
1716 1742
1717#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 { 1745 {
… …
1725 1751
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1752 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1753 pointer_blank ();
1728 } 1754 }
1729#endif 1755#endif
1730}
1731 1756
1732void 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
1733rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1734{ 1779{
1735 if (!focus) 1780 if (!focus)
1736 { 1781 {
1737 focus = 1; 1782 focus = 1;
1738 want_refresh = 1; 1783 want_refresh = 1;
1739 1784
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1785#if USE_XIM
1743 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1744 { 1787 {
1745 IMSetPosition (); 1788 im_set_position ();
1746 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1747 } 1790 }
1748#endif 1791#endif
1749#if CURSOR_BLINK 1792#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1794 cursor_blink_ev.again ();
1752#endif 1795#endif
1753#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1755 { 1798 {
1756 pix_colors = pix_colors_focused; 1799 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1800 scr_recolour ();
1758 } 1801 }
1759#endif 1802#endif
1760#if ENABLE_FRILLS 1803#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1804 if (option (Opt_urgentOnBell))
1762 { 1805 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1806#endif
1773 }
1774}
1775 1807
1776void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1777rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1778{ 1814{
1779 if (focus) 1815 if (focus)
1780 { 1816 {
1781 focus = 0; 1817 focus = 0;
1782 want_refresh = 1; 1818 want_refresh = 1;
1783 1819
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1820#if ENABLE_FRILLS
1785 1821 if (option (Opt_urgentOnBell))
1822 set_urgency (0);
1823#endif
1786#if ENABLE_FRILLS || ISO_14755 1824#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1825 if (iso14755buf)
1788 { 1826 {
1789 iso14755buf = 0; 1827 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1828# if ISO_14755
1791 scr_overlay_off (); 1829 scr_overlay_off ();
1792# endif 1830# endif
1793 } 1831 }
1794#endif 1832#endif
1795#if USE_XIM 1833#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1835 XUnsetICFocus (Input_Context);
1798#endif 1836#endif
1799#if CURSOR_BLINK 1837#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1838 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1839 cursor_blink_ev.stop ();
1840
1802 hidden_cursor = 0; 1841 hidden_cursor = 0;
1803#endif 1842#endif
1804#if OFF_FOCUS_FADING 1843#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1844 if (rs[Rs_fade])
1806 { 1845 {
1807 pix_colors = pix_colors_unfocused; 1846 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1847 scr_recolour ();
1809 } 1848 }
1810#endif 1849#endif
1811 }
1812}
1813 1850
1814void 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1852 }
1853}
1854
1855void ecb_cold
1815rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1816{ 1857{
1817#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1819 { 1860 {
… …
1822 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);
1823 } 1864 }
1824#endif 1865#endif
1825} 1866}
1826 1867
1827#if TRANSPARENT || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1828void 1869void ecb_hot
1829rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1871{
1831 make_current (); 1872 make_current ();
1832 1873
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1876 return;
1836 1877
1837# if TRANSPARENT
1838 switch (ev.type) 1878 switch (ev.type)
1839 { 1879 {
1840 case PropertyNotify: 1880 case PropertyNotify:
1841 /* 1881 /*
1842 * 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,
1843 * 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.
1844 */ 1884 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1887 {
1848 1888#if BG_IMAGE_FROM_ROOT
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent)) 1889 if (option (Opt_transparent))
1852 check_our_parents (); 1890 {
1853 break; 1891 rxvt_img::new_from_root (this)->replace (root_img);
1854 } 1892 update_background ();
1893 }
1855# endif 1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1896 }
1897
1898 break;
1899 }
1900
1901 refresh_check ();
1856} 1902}
1857#endif 1903#endif
1858 1904
1859void 1905void
1860rxvt_term::button_press (XButtonEvent &ev) 1906rxvt_term::button_press (XButtonEvent &ev)
… …
1891 /* save the xbutton state (for ButtonRelease) */ 1937 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1938 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1939#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1940 if (ev.button == MEvent.button && clickintime)
1895 { 1941 {
1896 /* same button, within alloted time */ 1942 /* same button, within allowed time */
1897 MEvent.clicks++; 1943 MEvent.clicks++;
1898 1944
1899 if (MEvent.clicks > 1) 1945 if (MEvent.clicks > 1)
1900 { 1946 {
1901 /* only report double clicks */ 1947 /* only report double clicks */
… …
1915 mouse_report (ev); 1961 mouse_report (ev);
1916 } 1962 }
1917#else 1963#else
1918 MEvent.button = ev.button; 1964 MEvent.button = ev.button;
1919 mouse_report (ev); 1965 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1966#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1967
1922 } 1968 }
1923 else 1969 else
1924 { 1970 {
1925 if (ev.button != MEvent.button) 1971 if (ev.button != MEvent.button)
… …
1973 } 2019 }
1974 2020
1975 /* 2021 /*
1976 * Scrollbar window processing of button press 2022 * Scrollbar window processing of button press
1977 */ 2023 */
1978 if (isScrollbarWindow (ev.window)) 2024 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 2025 {
1980 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;
1981 /* 2034 /*
1982 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 2036 * move up if mouse is above slider
1984 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1985 * 2038 *
… …
1994 /* 2047 /*
1995 * Mouse report disabled scrollbar: 2048 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2049 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2050 * click on scrollbar - send pageup/down
1998 */ 2051 */
1999 if ((scrollBar.style == R_SB_NEXT 2052 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2053 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2054 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2055 tt_printf ("\033[B");
2009 else 2056 else
2010 switch (ev.button) 2057 switch (ev.button)
2011 { 2058 {
2012 case Button2: 2059 case Button2:
… …
2019 tt_printf ("\033[5~"); 2066 tt_printf ("\033[5~");
2020 break; 2067 break;
2021 } 2068 }
2022 } 2069 }
2023 else 2070 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2071#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2072 {
2031 if (scrollbarnext_upButton (ev.y)) 2073 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2074 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2076 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2078#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2079 if (scr_page (direction, 1))
2049 { 2080 {
2050 if (upordown < 0) 2081 if (direction == UP)
2051 scrollBar.setUp (); 2082 scrollBar.state = SB_STATE_UP;
2052 else 2083 else
2053 scrollBar.setDn (); 2084 scrollBar.state = SB_STATE_DOWN;
2054 } 2085 }
2055 } 2086 }
2056 else 2087 else
2057 switch (ev.button) 2088 switch (ev.button)
2058 { 2089 {
2059 case Button2: 2090 case Button2:
2060 switch (scrollbar_align) 2091 switch (scrollBar.align)
2061 { 2092 {
2062 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2063 csrO = 0; 2094 csrO = 0;
2064 break; 2095 break;
2065 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2066 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2067 break; 2098 break;
2068 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2069 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2070 break; 2101 break;
2071 } 2102 }
2072 2103
2073 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2074 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2077 2108
2078 scrollBar.setMotion (); 2109 scrollBar.state = SB_STATE_MOTION;
2079 break; 2110 break;
2080 2111
2081 case Button1: 2112 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2085 2116
2086 case Button3: 2117 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2088 { 2119 {
2089 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2091 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2092# else 2123# else
2093 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2094# endif 2125# endif
2095 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2096# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2097 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2098# else 2129# else
2099 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2100# endif 2131# endif
2101 else 2132 else
2102 scrollBar.setMotion (); 2133 scrollBar.state = SB_STATE_MOTION;
2103 } 2134 }
2104 else 2135 else
2105 { 2136 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2138 (nrow
2108 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2109 / scrollbar_size ())); 2140 / scrollBar.size ()));
2110 } 2141 }
2111 2142
2112 break; 2143 break;
2113 } 2144 }
2114 } 2145 }
… …
2124 2155
2125 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2157 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2159
2129 if (scrollbar_isUpDn ()) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2130 { 2161 {
2131 scrollBar.setIdle (); 2162 scrollBar.state = SB_STATE_IDLE;
2132 scrollbar_show (0); 2163 scrollBar.show (0);
2133 } 2164 }
2134 2165
2135#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
2138#endif 2168#endif
2139 2169
2140 if (ev.window == vt) 2170 if (ev.window == vt)
2141 { 2171 {
2142 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)))
… …
2166 mouse_report (ev); 2196 mouse_report (ev);
2167 } 2197 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2198#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2199 MEvent.button = AnyButton;
2170 mouse_report (ev); 2200 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2201#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2202 return;
2173 } 2203 }
2174 2204
2175 /* 2205 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2206 * dumb hack to compensate for the failure of click-and-drag
… …
2187 case Button3: 2217 case Button3:
2188 selection_make (ev.time); 2218 selection_make (ev.time);
2189 break; 2219 break;
2190 2220
2191 case Button2: 2221 case Button2:
2192 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?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2224 break;
2195 2225
2196#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2197 case Button4: 2227 case Button4:
2198 case Button5: 2228 case Button5:
2199 { 2229 {
2200 int i; 2230 int lines;
2201 page_dirn v; 2231 page_dirn dirn;
2202 2232
2203 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2204 2234
2205 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2206 i = 1; 2236 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2238 lines = nrow - 1;
2209 else 2239 else
2210 i = 5; 2240 lines = 5;
2211 2241
2212# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2214 { 2244 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2247
2219 if (slip_wheel_ev.at < NOW) 2248 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2250 }
2224 else 2251 else
2252# endif
2225 { 2253 {
2226# endif
2227 scr_page (v, i); 2254 scr_page (dirn, lines);
2228 scrollbar_show (1); 2255 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2256 }
2231# endif
2232 } 2257 }
2233 break; 2258 break;
2234#endif 2259#endif
2235 } 2260 }
2236 } 2261 }
2237} 2262}
2238 2263
2239/*}}} */ 2264/*}}} */
2240 2265
2241bool 2266void ecb_hot
2242rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2243{ 2268{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2247 2271
2248 for (;;) 2272 for (;;)
2249 { 2273 {
2250 if (ch == NOCHAR) 2274 if (ecb_unlikely (ch == NOCHAR))
2251 { 2275 {
2252 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2277 ch = next_char ();
2254 2278
2255 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2256 break; 2280 break;
2257 } 2281 }
2258 2282
2259 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))
2260 { 2284 {
2261 if (!seen_input) 2285 if (ecb_unlikely (!seen_input))
2262 { 2286 {
2263 seen_input = 1; 2287 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2303 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2305
2282 for (;;) 2306 for (;;)
2283 { 2307 {
2284 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)))
2285 break; 2309 break;
2286 2310
2287 *str++ = ch; 2311 *str++ = ch;
2288 2312
2289 if (ch == C0_LF || str >= eol) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2290 { 2314 {
2291 if (ch == C0_LF) 2315 if (ch == C0_LF)
2292 nlines++; 2316 nlines++;
2293 2317
2294 refresh_count++; 2318 refresh_count++;
2295 2319
2296 if (!option (Opt_jumpScroll) 2320 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2321 {
2299 refreshnow = true;
2300 refresh_count = 0; 2322 refresh_count = 0;
2323
2324 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2325 {
2326 refreshnow = true;
2301 ch = NOCHAR; 2327 ch = NOCHAR;
2302 break; 2328 break;
2329 }
2303 } 2330 }
2304 2331
2305 // scr_add_lines only works for nlines <= nrow - 1. 2332 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2333 if (nlines >= nrow - 1)
2307 { 2334 {
… …
2335 && 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))))
2336 scr_add_lines (buf, str - buf, nlines); 2363 scr_add_lines (buf, str - buf, nlines);
2337 2364
2338 /* 2365 /*
2339 * 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
2340 * 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.
2341 * the number of pages between refreshes is refresh_limit, which 2368 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2369 */
2344 if (refreshnow) 2370 if (refreshnow)
2345 { 2371 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2372 scr_refresh ();
2353 want_refresh = 1; 2373 want_refresh = 1;
2354 }
2355 } 2374 }
2356
2357 } 2375 }
2358 else 2376 else
2359 { 2377 {
2360 try 2378 try
2361 { 2379 {
… …
2369 } 2387 }
2370 2388
2371 ch = NOCHAR; 2389 ch = NOCHAR;
2372 } 2390 }
2373 } 2391 }
2374
2375 return flag;
2376} 2392}
2377 2393
2378// read the next character 2394// read the next character
2379wchar_t 2395wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2381{ 2397{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2399 {
2384 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2387 2403
2388 wchar_t wc; 2404 wchar_t wc;
2389 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);
2390 2406
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2410 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2411 break;
2396 } 2412 }
2397 2413
2398 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.
2399 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 }
2400 2421
2401 // assume wchar == unicode 2422 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2424 return wc & UNICODE_MASK;
2404 } 2425 }
2405 2426
2406 return NOCHAR; 2427 return NOCHAR;
2407} 2428}
2408 2429
2409// read the next octet 2430// read the next octet
2410uint32_t 2431uint32_t ecb_hot
2411rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2412{ 2433{
2413 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR; 2436 : NOCHAR;
2416} 2437}
2417 2438
2418static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2419 2440
2420/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2421/*
2422 * Return the next input character after first passing any keyboard input
2423 * to the command.
2424 */
2425wchar_t
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2427{ 2443{
2428 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2429 2445
2430 if (c == NOCHAR) 2446 if (c == NOCHAR)
2431 throw out_of_input; 2447 throw out_of_input;
2432 2448
2433 return c; 2449 return c;
2434} 2450}
2435 2451
2436uint32_t 2452uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2438{ 2454{
2439 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2440 2456
2441 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2445} 2461}
2446 2462
2447/*{{{ print pipe */ 2463/*{{{ print pipe */
2448/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2450FILE * 2466FILE * ecb_cold
2451rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2452{ 2468{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2470
2455 if (stream == NULL) 2471 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2473
2458 return stream; 2474 return stream;
2459} 2475}
2460 2476
2461int 2477int ecb_cold
2462rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2463{ 2479{
2464 fflush (stream); 2480 fflush (stream);
2465 return pclose (stream); 2481 return pclose (stream);
2466} 2482}
2467 2483
2468/* 2484/*
2469 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2470 */ 2486 */
2471void 2487void ecb_cold
2472rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2473{ 2489{
2474 int done; 2490 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2491
2477 if ((fd = popen_printer ()) == NULL) 2492 if (!fd)
2478 return; 2493 return;
2479 2494
2480 /* 2495 /*
2481 * 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
2482 * is received. 2497 * is received.
2483 */ 2498 */
2484 for (done = 0; !done;) 2499 for (int done = 0; !done; )
2485 { 2500 {
2486 unsigned char buf[8]; 2501 unsigned char buf[8];
2487 unicode_t ch; 2502 unicode_t ch;
2488 unsigned int i, len; 2503 unsigned int i, len;
2489 2504
… …
2520 } 2535 }
2521 } 2536 }
2522 2537
2523 pclose_printer (fd); 2538 pclose_printer (fd);
2524} 2539}
2525#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2526/*}}} */ 2541/*}}} */
2527 2542
2528/* *INDENT-OFF* */
2529enum { 2543enum {
2530 C1_40 = 0x40, 2544 C1_40 = 0x40,
2531 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,
2532 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,
2533 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,
2534 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,
2535}; 2549};
2536/* *INDENT-ON* */
2537 2550
2538/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2539void 2552void ecb_hot
2540rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2541{ 2554{
2542 switch (ch) 2555 switch (ch)
2543 { 2556 {
2544 case C0_ESC: 2557 case C0_ESC:
… …
2580 process_dcs_seq (); 2593 process_dcs_seq ();
2581 break; 2594 break;
2582 case 0x9b: /* CSI */ 2595 case 0x9b: /* CSI */
2583 process_csi_seq (); 2596 process_csi_seq ();
2584 break; 2597 break;
2585 case 0x9d: /* CSI */ 2598 case 0x9d: /* OSC */
2586 process_osc_seq (); 2599 process_osc_seq ();
2587 break; 2600 break;
2588#endif 2601#endif
2589 } 2602 }
2590} 2603}
2591/*}}} */ 2604/*}}} */
2592 2605
2593 2606
2594/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
2595void 2608void ecb_cold
2596rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
2597{ 2610{
2598 int row, col; 2611 int row, col;
2599 2612
2600 switch (ch) 2613 switch (ch)
… …
2634 break; 2647 break;
2635 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2650 break;
2638 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2652 priv_modes &= ~PrivMode_vt52;
2640 break; 2653 break;
2641 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
2643 /* unimplemented */ 2656 /* unimplemented */
2644 break; 2657 break;
… …
2650} 2663}
2651/*}}} */ 2664/*}}} */
2652 2665
2653 2666
2654/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
2655void 2668void ecb_hot
2656rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
2657{ 2670{
2658 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
2659 2672
2660 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
2663 return; 2676 return;
2664 } 2677 }
2665 2678
2666 switch (ch) 2679 switch (ch)
2667 { 2680 {
2668 /* case 1: do_tek_mode (); break; */
2669 case '#': 2681 case '#':
2670 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
2671 scr_E (); 2683 scr_E ();
2672 break; 2684 break;
2673 case '(': 2685 case '(':
… …
2696#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
2697 case '9': 2709 case '9':
2698 scr_forwardindex (); 2710 scr_forwardindex ();
2699 break; 2711 break;
2700#endif 2712#endif
2713 // DECPAM/DECPNM
2701 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
2702 case '>': 2717 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2718 priv_modes &= ~PrivMode_aplKP;
2704 break; 2719 break;
2705 2720
2706 case C1_40: 2721 case C1_40:
2707 cmd_getc (); 2722 cmd_getc ();
2708 break; 2723 break;
… …
2712 2727
2713 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
2714 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
2715 { 2730 {
2716 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2718 } 2733 }
2719 break; 2734 break;
2720 2735
2721 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
2722 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
2723 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 */
2724 break; 2741 break;
2725 2742
2726 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
2727 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
2728 scr_set_tab (1); 2745 scr_set_tab (1);
… …
2732 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
2733 scr_index (DN); 2750 scr_index (DN);
2734 break; 2751 break;
2735 2752
2736 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
2737 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
2738 2755
2739 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
2740 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
2741 2758
2742 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
2743 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
2744 process_dcs_seq (); 2761 process_dcs_seq ();
2745 break; 2762 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2764 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2765 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2766 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2767 break; /* steal obsolete ESC [ c */
2751 2768
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2769 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2770 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2771 process_csi_seq ();
2755 break; 2772 break;
2756 2773
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2774 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2775 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2776 process_osc_seq ();
2760 break; 2777 break;
2761 2778
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2779 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2780 case 'c':
2764 mbstate.reset (); 2781 mbstate.reset ();
2765 scr_poweron (); 2782 scr_poweron ();
2766 scrollbar_show (1); 2783 scrollBar.show (1);
2767 break; 2784 break;
2768 2785
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2786 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2787 case 'n':
2771 scr_charset_choose (2); 2788 scr_charset_choose (2);
… …
2778 } 2795 }
2779} 2796}
2780/*}}} */ 2797/*}}} */
2781 2798
2782/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2783/* *INDENT-OFF* */
2784enum { 2800enum {
2785 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
2786 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,
2787 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 ,
2788 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,
… …
2791 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,
2792 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 ,
2793 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
2794}; 2810};
2795 2811
2796#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2799#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
2800 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2801 2817
2802const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
2803 { 2819 {
2804 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, */
2805 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, */
2806 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, */
2807 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, [, \, ], ^, _, */
2808 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, */
2809 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, */
2810 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, */
2811 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, {, |, }, ~, */
2812 }; 2828 };
2813/* *INDENT-ON* */
2814 2829
2815void 2830void ecb_hot
2816rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2817{ 2832{
2818 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2819 unsigned int nargs, p; 2834 unsigned int nargs, p;
2820 int n, ndef; 2835 int n, ndef;
2821 int arg[ESC_ARGS]; 2836 int arg[ESC_ARGS] = { };
2822 2837
2823 for (nargs = ESC_ARGS; nargs > 0;) 2838 nargs = 0;
2824 arg[--nargs] = 0;
2825 2839
2826 priv = 0; 2840 priv = 0;
2827 ch = cmd_getc (); 2841 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2842 if ((ch >= '<' && ch <= '?') || ch == '!')
2843 {
2829 { /* '<' '=' '>' '?' */ 2844 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2845 priv = ch;
2831 ch = cmd_getc (); 2846 ch = cmd_getc ();
2832 } 2847 }
2833 2848
2849 prev_ch = 0;
2834 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2835 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2836 { 2852 {
2837 if (isdigit (ch)) 2853 if (isdigit (ch))
2838 { 2854 {
… …
2848 n = -1; 2864 n = -1;
2849 } 2865 }
2850 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2851 process_nonprinting (ch); 2867 process_nonprinting (ch);
2852 2868
2869 prev_ch = ch;
2853 ch = cmd_getc (); 2870 ch = cmd_getc ();
2854 } 2871 }
2855 2872
2856 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2857 return; 2874 return;
… …
2873 switch (priv) 2890 switch (priv)
2874 { 2891 {
2875 case '>': 2892 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2893 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2894 {
2878 // 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,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2896 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2897 //
2881 // 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
2882 // 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
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2900 // versions.
2884 // 2901 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2902 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2903 }
2887 break; 2904 break;
2905
2888 case '?': 2906 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2907 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2908 process_terminal_mode (ch, priv, nargs, arg);
2891 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);
2892 } 2922 }
2923 break;
2924 }
2925
2893 return; 2926 return;
2894 } 2927 }
2895 2928
2896 switch (ch) 2929 switch (ch)
2897 { 2930 {
… …
2911 } 2944 }
2912 break; 2945 break;
2913#endif 2946#endif
2914 2947
2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2917 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
2918 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2921 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
2922 break; 2955 break;
2923 2956
2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3075 scr_insert_mode (1); 3108 scr_insert_mode (1);
3076 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3077 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3078 break; 3111 break;
3079 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3080 /* 3118 /*
3081 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3082 */ 3120 */
3083 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3084 if (nargs == 1) 3122 if (nargs == 1)
… …
3112 } 3150 }
3113} 3151}
3114/*}}} */ 3152/*}}} */
3115 3153
3116#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3117/* ARGSUSED */
3118void 3155void
3119rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3120{ 3157{
3121 int x, y; 3158 int x, y;
3122 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3131 { 3168 {
3132 /* 3169 /*
3133 * commands 3170 * commands
3134 */ 3171 */
3135 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3136 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3137 break; 3174 break;
3138 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3139 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3140 break; 3177 break;
3141 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3142 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3143 break; 3180 break;
3144 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3146 break; 3183 break;
3147 case 5: /* raise window */ 3184 case 5: /* raise window */
3148 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3149 break; 3186 break;
3150 case 6: /* lower window */ 3187 case 6: /* lower window */
3151 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3152 break; 3189 break;
3153 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3154 scr_touch (true); 3191 scr_touch (true);
3155 break; 3192 break;
3156 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3159 break; 3196 break;
3160 3197
3161 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3162 default: 3199 default:
3163 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3164 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3165 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3166 break; 3203 break;
3167 3204
3168 /* 3205 /*
3169 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3170 */ 3207 */
3171 case 11: /* report window state */ 3208 case 11: /* report window state */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3174 break; 3211 break;
3175 case 13: /* report window position */ 3212 case 13: /* report window position */
3176 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3177 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3178 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3179 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3180 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3181 break; 3218 break;
3182 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3183 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3185 break; 3222 break;
3186 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3187 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3188 break; 3225 break;
… …
3190 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3191 break; 3228 break;
3192 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3193 { 3230 {
3194 char *s; 3231 char *s;
3195 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3196 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 */
3197 XFree (s); 3234 XFree (s);
3198 } 3235 }
3199 break; 3236 break;
3200 case 21: /* report window title */ 3237 case 21: /* report window title */
3201 { 3238 {
3202 char *s; 3239 char *s;
3203 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3204 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 */
3205 XFree (s); 3242 XFree (s);
3206 } 3243 }
3207 break; 3244 break;
3208 } 3245 }
… …
3218rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3219{ 3256{
3220 unicode_t ch; 3257 unicode_t ch;
3221 bool seen_esc = false; 3258 bool seen_esc = false;
3222 unsigned int n = 0; 3259 unsigned int n = 0;
3223 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3224 3261
3225 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3226 { 3263 {
3227 if (seen_esc) 3264 if (seen_esc)
3228 { 3265 {
… …
3243 else if (ch < 0x20) 3280 else if (ch < 0x20)
3244 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3245 3282
3246 seen_esc = false; 3283 seen_esc = false;
3247 3284
3248 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3249 // stop at some sane length 3286 // stop at some sane length
3250 return NULL; 3287 return NULL;
3251 3288
3252 string[n++] = ch; 3289 string[n++] = ch;
3253 } 3290 }
… …
3264 * 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)'
3265 */ 3302 */
3266void 3303void
3267rxvt_term::process_dcs_seq () 3304rxvt_term::process_dcs_seq ()
3268{ 3305{
3269 char *s;
3270 unicode_t eh;
3271
3272 /* 3306 /*
3273 * Not handled yet 3307 * Not handled yet
3274 */ 3308 */
3309
3310 unicode_t eh;
3275 s = get_to_st (eh); 3311 char *s = get_to_st (eh);
3276 if (s) 3312 if (s)
3277 free (s); 3313 free (s);
3278 3314
3279 return; 3315 return;
3280} 3316}
… …
3284 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3320 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3285 */ 3321 */
3286void 3322void
3287rxvt_term::process_osc_seq () 3323rxvt_term::process_osc_seq ()
3288{ 3324{
3289 unicode_t ch, eh;
3290 int arg; 3325 int arg;
3291 3326
3292 ch = cmd_getc (); 3327 unicode_t ch = cmd_getc ();
3293 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3328 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3294 arg = arg * 10 + (ch - '0'); 3329 arg = arg * 10 + (ch - '0');
3295 3330
3296 if (ch == ';') 3331 if (ch == ';')
3297 { 3332 {
3333 unicode_t eh;
3298 char *s = get_to_st (eh); 3334 char *s = get_to_st (eh);
3299 3335
3300 if (s) 3336 if (s)
3301 { 3337 {
3302 process_xterm_seq (arg, s, eh); 3338 process_xterm_seq (arg, s, eh);
… …
3326 3362
3327/* 3363/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3364 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3365 */
3330void 3366void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3367rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3368{
3333 int color; 3369 int color;
3334 char *buf, *name; 3370 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3371 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3372 int saveop = op;
… …
3363 unsigned long bytes_after; 3399 unsigned long bytes_after;
3364 unsigned char *value = 0; 3400 unsigned char *value = 0;
3365 const char *str = ""; 3401 const char *str = "";
3366 3402
3367 if (prop 3403 if (prop
3368 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3408 && actual_type != None
3373 && actual_format == 8) 3409 && actual_format == 8)
3374 str = (const char *)(value); 3410 str = (const char *)(value);
3375 3411
3376 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3377 3413
3378 XFree (value); 3414 XFree (value);
3379 } 3415 }
3380 else 3416 else
3381 { 3417 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3418 char *eq = strchr (str, '=');
3383 3419
3384 if (eq) 3420 if (eq)
3385 { 3421 {
3386 *eq = 0; 3422 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3388 } 3424 }
3389 else 3425 else
3390 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3391 display->atom (str)); 3427 display->atom (str));
3392 } 3428 }
3393 break; 3429 break;
3394 3430
3395 case XTerm_Color: 3431 case XTerm_Color:
… …
3408 *buf++ = '\0'; 3444 *buf++ = '\0';
3409 3445
3410 process_color_seq (op, color, name, resp); 3446 process_color_seq (op, color, name, resp);
3411 } 3447 }
3412 break; 3448 break;
3449 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3450 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3451 process_color_seq (op, Color_fg, str, resp);
3415 break; 3452 break;
3453 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3454 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3455 process_color_seq (op, Color_bg, str, resp);
3418 break; 3456 break;
3419#ifndef NO_CURSORCOLOR 3457#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3458 case XTerm_Color_cursor:
… …
3425 process_color_seq (op, Color_pointer_fg, str, resp); 3463 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break; 3464 break;
3427 case XTerm_Color_pointer_bg: 3465 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp); 3466 process_color_seq (op, Color_pointer_bg, str, resp);
3429 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
3430#ifndef NO_BOLD_UNDERLINE_REVERSE 3476#ifndef NO_BOLD_UNDERLINE_REVERSE
3431 case XTerm_Color_RV:
3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD: 3477 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp); 3478 process_color_seq (op, Color_BD, str, resp);
3437 break; 3479 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL: 3480 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp); 3481 process_color_seq (op, Color_UL, str, resp);
3441 break; 3482 break;
3442 case URxvt_Color_IT: 3483 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3484 process_color_seq (op, Color_IT, str, resp);
3444 break; 3485 break;
3445#endif 3486#endif
3446#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
3447 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3494 {
3495 bool changed = false;
3449 3496
3450 check_our_parents (); 3497 if (ISSET_PIXCOLOR (Color_tint))
3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3451 3499
3452 if (am_transparent) 3500 if (changed)
3453 want_full_refresh = want_refresh = 1; 3501 update_background ();
3502 }
3454 3503
3455 break; 3504 break;
3456#endif 3505#endif
3457 3506
3507#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3509 if (!strcmp (str, "?"))
3459 { 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
3460 if (*str != ';') 3526 if (*str != ';')
3461 { 3527 {
3462#if XPM_BACKGROUND 3528 try
3463 scale_pixmap (""); /* reset to default scaling */ 3529 {
3464 set_bgPixmap (str); /* change pixmap */ 3530 fimage.set_file_geometry (this, str);
3465 scr_touch (true); 3531 changed = true;
3466#endif 3532 }
3533 catch (const class rxvt_failure_exception &e)
3534 {
3535 }
3467 } 3536 }
3468 3537 else
3469 int changed = 0;
3470
3471 while ((str = strchr (str, ';')) != NULL)
3472 { 3538 {
3473 str++; 3539 str++;
3474#if XPM_BACKGROUND 3540 if (fimage.set_geometry (str, true))
3475 changed += scale_pixmap (str); 3541 changed = true;
3476#endif
3477 } 3542 }
3478 3543
3479 if (changed) 3544 if (changed)
3480 { 3545 {
3481#ifdef XPM_BACKGROUND 3546 if (bg_window_position_sensitive ())
3482 resize_pixmap (); 3547 {
3483 scr_touch (true); 3548 int x, y;
3484#endif 3549 get_window_origin (x, y);
3550 parent_x = x;
3551 parent_y = y;
3552 }
3553 update_background ();
3485 } 3554 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 } 3555 }
3491 break; 3556 break;
3492 3557#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3558
3500 case XTerm_logfile: 3559 case XTerm_logfile:
3501 // TODO, when secure mode? 3560 // TODO, when secure mode?
3502 break; 3561 break;
3503 3562
… …
3570 break; 3629 break;
3571#endif 3630#endif
3572 3631
3573#if ENABLE_PERL 3632#if ENABLE_PERL
3574 case URxvt_perl: 3633 case URxvt_perl:
3575 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));
3576 ; // no responses yet
3577 break; 3635 break;
3578#endif 3636#endif
3579 } 3637 }
3580} 3638}
3581/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
… …
3588 * 's' = save 3646 * 's' = save
3589 * 'r' = restore 3647 * 'r' = restore
3590 * 't' = toggle 3648 * 't' = toggle
3591 * so no need for fancy checking 3649 * so no need for fancy checking
3592 */ 3650 */
3593int 3651int ecb_cold
3594rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
3595{ 3653{
3596 int state; 3654 int state;
3597 3655
3598 if (mode == 's') 3656 if (mode == 's')
3599 { 3657 {
3600 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
3601 return -1; 3662 return -1;
3602 } 3663 }
3603 else 3664 else
3604 { 3665 {
3605 if (mode == 'r') 3666 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3668 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 PrivMode (state, bit); 3670
3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
3610 } 3675 }
3611 3676
3612 return state; 3677 return state;
3613} 3678}
3614 3679
3615/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
3616void 3681void
3617rxvt_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)
3618{ 3683{
3619 unsigned int i, j; 3684 unsigned int i, j;
3620 int state; 3685 int state;
3621 3686
3622 static const struct 3687 static const struct
3623 { 3688 {
3624 const int argval; 3689 const int argval;
3625 const unsigned long bit; 3690 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3691 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3692 { 1, PrivMode_aplCUR }, // DECCKM
3630 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
3631 { 3, PrivMode_132 }, 3694 { 3, PrivMode_132 }, // DECCOLM
3632 { 4, PrivMode_smoothScroll }, 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
3633 { 5, PrivMode_rVideo }, 3696 { 5, PrivMode_rVideo }, // DECSCNM
3634 { 6, PrivMode_relOrigin }, 3697 { 6, PrivMode_relOrigin }, // DECOM
3635 { 7, PrivMode_Autowrap }, 3698 { 7, PrivMode_Autowrap }, // DECAWM
3636 // 8, bi-directional support mode 3699 // 8, auto-repeat keys // DECARM
3637 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
3638 // 18, 19 printing-related 3701 // 18 end FF to printer after print screen
3702 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3706#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3708 // 38, tektronix mode // DECTEK
3644 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
3645 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
3646 // 45 margin bell NYI 3711 // 45 margin bell NYI
3647 // 46 start logging 3712 // 46 start logging
3648 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
3649 { 66, PrivMode_aplKP }, 3714 { 66, PrivMode_aplKP }, // DECNKM
3650#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3716 { 67, PrivMode_BackSpace }, // DECBKM
3652#endif 3717#endif
3653 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3719 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3720 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 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
3659 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
3664 { 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 */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3736 { 2004, PrivMode_BracketPaste },
3666 }; 3737 };
3667 3738
3668 if (nargs == 0) 3739 if (nargs == 0)
3669 return; 3740 return;
3670 3741
… …
3677 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3678 { 3749 {
3679 state = -1; 3750 state = -1;
3680 3751
3681 /* basic handling */ 3752 /* basic handling */
3682 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
3683 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
3684 { 3755 {
3685 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
3686 break; 3757 break;
3687 } 3758 }
… …
3695 3766
3696 scr_touch (true); 3767 scr_touch (true);
3697 break; 3768 break;
3698#endif 3769#endif
3699 case 1048: /* alternative cursor save */ 3770 case 1048: /* alternative cursor save */
3700 case 1049:
3701 if (option (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
3702 if (mode == 0) 3772 if (mode == 0)
3703 scr_cursor (RESTORE); 3773 scr_cursor (RESTORE);
3704 else if (mode == 1) 3774 else if (mode == 1)
3705 scr_cursor (SAVE); 3775 scr_cursor (SAVE);
… …
3714 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
3715 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
3716 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
3717 * within VT52 mode 3787 * within VT52 mode
3718 */ 3788 */
3719 PrivMode (1, PrivMode_vt52); 3789 priv_modes |= PrivMode_vt52;
3720 break; 3790 break;
3721 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3724 break; 3794 break;
3725 case 4: /* smooth scrolling */ 3795 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3796 set_option (Opt_jumpScroll, !state);
3727 break; 3797 break;
3728 case 5: /* reverse video */ 3798 case 5: /* reverse video */
… …
3735 scr_autowrap (state); 3805 scr_autowrap (state);
3736 break; 3806 break;
3737 /* 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 */
3738 case 9: /* X10 mouse reporting */ 3808 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3811 break;
3742#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
3743 case scrollBar_esc: 3813 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3814 scrollBar.map (state);
3745 {
3746 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
3747 scr_touch (true); 3816 scr_touch (true);
3748 }
3749 break; 3817 break;
3750#endif 3818#endif
3751 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
3752 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
3753 break; 3821 break;
… …
3758 break; 3826 break;
3759 /* case 66: - application key pad */ 3827 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3828 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3829 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3830 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3831 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3832 break;
3765#if 0
3766 case 1001: 3833 case 1002:
3767 break; /* X11 mouse highlighting */ 3834 case 1003:
3768#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;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3847 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3848 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3849 break;
3772 case 1011: /* scroll to bottom on key press */ 3850 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3851 set_option (Opt_scrollTtyKeypress, state);
3774 break; 3852 break;
3775 case 1047: /* secondary screen w/ clearing last */ 3853 case 1047: /* secondary screen w/ clearing last */
3776 if (option (Opt_secondaryScreen)) 3854 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3855 if (!state)
3778 scr_erase_screen (2); 3856 scr_erase_screen (2);
3857
3779 scr_change_screen (state); 3858 scr_change_screen (state);
3780 break; 3859 break;
3781 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
3782 scr_change_screen (state); 3865 scr_change_screen (state);
3866
3783 if (option (Opt_secondaryScreen)) 3867 if (option (Opt_secondaryScreen))
3784 if (current_screen != PRIMARY) 3868 if (state)
3785 scr_erase_screen (2); 3869 scr_erase_screen (2);
3870 else
3871 scr_cursor (RESTORE);
3786 break; 3872 break;
3787 default: 3873 default:
3788 break; 3874 break;
3789 } 3875 }
3790 } 3876 }
3791} 3877}
3792/*}}} */ 3878/*}}} */
3793 3879
3794/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
3795void 3881void ecb_hot
3796rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3797{ 3883{
3798 unsigned int i; 3884 unsigned int i;
3799 short rendset; 3885 short rendset;
3800 int rendstyle; 3886 int rendstyle;
… …
3941 break; 4027 break;
3942#endif 4028#endif
3943 } 4029 }
3944 } 4030 }
3945} 4031}
3946/*}}} */
3947 4032
3948/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3949void 4033void
3950rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
3951{ 4035{
3952 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
3953
3954 if (cmd == 'Q')
3955 { /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */
3957 return; 4037 return;
3958 } 4038
3959 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
3960 do 4040
3961 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
3962 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
3963} 4047}
3964/*}}} */ 4048/*}}} */
3965 4049
3966/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
3967 4051
… …
3983 4067
3984/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
3985/* 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,
3986 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
3987 */ 4071 */
3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3989 4073
3990void 4074void
3991rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
3992{ 4076{
3993 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)))
… …
3998 4082
3999 if (v_buflen == 0) 4083 if (v_buflen == 0)
4000 { 4084 {
4001 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));
4002 4086
4087 max_it (written, 0);
4088
4003 if ((unsigned int)written == len) 4089 if (written == len)
4004 return; 4090 return;
4005 4091
4006 data += written; 4092 data += written;
4007 len -= written; 4093 len -= written;
4008 } 4094 }
4009 4095
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4011 4097
4012 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 4099 v_buflen += len;
4014 4100
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);
4016} 4102}
4017 4103
4018void rxvt_term::pty_write () 4104void rxvt_term::pty_write ()
4019{ 4105{
4020 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));
… …
4025 4111
4026 if (v_buflen == 0) 4112 if (v_buflen == 0)
4027 { 4113 {
4028 free (v_buffer); 4114 free (v_buffer);
4029 v_buffer = 0; 4115 v_buffer = 0;
4030 v_buflen = 0;
4031 4116
4032 pty_ev.set (EVENT_READ); 4117 pty_ev.set (ev::READ);
4033 return; 4118 return;
4034 } 4119 }
4035 4120
4036 memmove (v_buffer, v_buffer + written, v_buflen); 4121 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 4122 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4123 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4124 pty_ev.set (ev::READ);
4040} 4125}
4041 4126
4042/*----------------------- end-of-file (C source) -----------------------*/ 4127/*----------------------- end-of-file (C source) -----------------------*/
4043 4128

Diff Legend

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