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.358 by sasha, Tue Sep 18 22:27:41 2007 UTC vs.
Revision 1.564 by sf-exg, Fri Mar 27 15:06:09 2015 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 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
394 { 704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
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, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
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 (kp)
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 (kp)
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 } 868 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 869
887 if (len <= 0) 870 if (len <= 0)
888 return; /* not mapped */ 871 return; /* not mapped */
889 872
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
923} 874}
924 875
925void 876void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
927{ 878{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 880 KeySym keysym;
930 881
… …
950 commit_iso14755 (); 901 commit_iso14755 ();
951 902
952 return; 903 return;
953 } 904 }
954 905
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 907 if (i[0] == keysym)
957 { 908 {
958 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 910 commit_iso14755 ();
960 911
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
999#endif 950#endif
1000} 951}
1001 952
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 953void
1036rxvt_term::flush () 954rxvt_term::flush ()
1037{ 955{
1038 flush_ev.stop (); 956 flush_ev.stop ();
1039 957
1040#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
1041 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 960 {
1043// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 962 scr_touch (false);
1045 } 963 }
1046#endif 964#endif
1047 965
1048 if (want_refresh) 966 if (want_refresh)
… …
1084 } 1002 }
1085 while (row < end_row); 1003 while (row < end_row);
1086 } 1004 }
1087 1005
1088 scr_refresh (); 1006 scr_refresh ();
1089 scrollbar_show (1); 1007 scrollBar.show (1);
1090#ifdef USE_XIM 1008#if USE_XIM
1091 IMSendSpot (); 1009 im_send_spot ();
1092#endif 1010#endif
1093 } 1011 }
1094 1012
1095 display->flush (); 1013 display->flush ();
1096} 1014}
1097 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1098void 1017void
1099rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1100{ 1019{
1101 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1022
1103 display->flush (); 1023 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1024}
1108 1025
1109void 1026void
1110rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1028{
1112 make_current (); 1029 make_current ();
1113 1030
1114 refresh_count = 0; 1031 refresh_count = 0;
1115 flush (); 1032 flush ();
1116} 1033}
1117 1034
1118#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1119void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1056{
1122 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1058 want_refresh = 1;
1124 1059 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1060}
1127#endif 1061#endif
1128 1062
1129#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1130void 1064void
1131rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1066{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1068 {
1135 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1136 want_refresh = 1; 1070 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1138 } 1072 }
1073 else
1074 w.stop ();
1139} 1075}
1140#endif 1076#endif
1141 1077
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1079void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1081{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1084 {
1149 want_refresh = 1; 1085 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1151 } 1087 }
1088 else
1089 w.stop ();
1152} 1090}
1153#endif 1091#endif
1154 1092
1155#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1156void 1094void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1096{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1160 { 1098 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1100 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1164 } 1102 }
1103 else
1104 w.stop ();
1165} 1105}
1166#endif 1106#endif
1167 1107
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1109void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1111{
1172 if (mouse_slip_wheel_speed == 0 1112 if (scr_page (mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1113 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1114 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1181 } 1122 }
1182} 1123}
1183#endif 1124#endif
1184 1125
1185#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1186static struct event_handler 1127static struct event_handler
1187{ 1128{
1188 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1189 1130
1190 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1191 { 1132 {
1192 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1196 1140
1197 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1199 1143
1200 w.stop (); 1144 w.stop ();
1201 } 1145 }
1202 1146
… …
1205 { 1149 {
1206 } 1150 }
1207} event_handler; 1151} event_handler;
1208#endif 1152#endif
1209 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1210bool 1187bool
1211rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1212{ 1189{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1214 1191
1215 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1193
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1218 n = 0;
1219 } 1195 {
1220 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1224 1201
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1203
1227 if (r > 0) 1204 if (r > 0)
1228 { 1205 {
1229 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1230 return true; 1207 return true;
… …
1246 1223
1247 return false; 1224 return false;
1248} 1225}
1249 1226
1250void 1227void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1229{
1253 make_current (); 1230 make_current ();
1254 1231
1255 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1235 cmd_parse ();
1259 break;
1260 1236
1261 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1262 pty_write (); 1238 pty_write ();
1263}
1264 1239
1265void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1266rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1267{ 1245{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1247 recolor_cursor ();
1270 1248
1271#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1250 hidden_pointer = 0;
1273 1251
1274 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1276#endif 1254#endif
1277} 1255}
1278 1256
1279#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1280void 1258void ecb_cold
1281rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1282{ 1260{
1283 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1284 return; 1262 return;
1285 1263
… …
1287 XFlush (dpy); 1265 XFlush (dpy);
1288 1266
1289 hidden_pointer = 1; 1267 hidden_pointer = 1;
1290} 1268}
1291 1269
1292void 1270void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1272{
1295 make_current (); 1273 make_current ();
1296 1274
1297 pointer_blank (); 1275 pointer_blank ();
1298} 1276}
… …
1301void 1279void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1281{
1304 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1305 int x, y; 1283 int x, y;
1284 int code = 32;
1306 1285
1307 x = ev.x; 1286 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1287 y = Pixel2Row (ev.y) + 1;
1309 pixel_position (&x, &y); 1288
1289 if (ev.type == MotionNotify)
1290 {
1291 if (x == mouse_row && y == mouse_col)
1292 return;
1293
1294 mouse_row = x;
1295 mouse_col = y;
1296 code += 32;
1297 }
1310 1298
1311 if (MEvent.button == AnyButton) 1299 if (MEvent.button == AnyButton)
1312 button_number = 3; 1300 button_number = 3;
1313 else 1301 else
1314 { 1302 {
1315 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1305 if (button_number >= 3)
1318 button_number += (64 - 3); 1306 button_number += 64 - 3;
1319 } 1307 }
1320 1308
1321 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1322 { 1310 {
1323 /* 1311 /*
… …
1355 fputc ('A', stderr); 1343 fputc ('A', stderr);
1356 if (key_state & 32) 1344 if (key_state & 32)
1357 fputc ('2', stderr); 1345 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1347 button_number,
1360 x + 1, 1348 x,
1361 y + 1); 1349 y);
1362#endif 1350#endif
1363 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1364 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1366 code + button_number + key_state,
1366 (32 + x + 1), 1367 32 + x,
1367 (32 + y + 1)); 1368 32 + y);
1368} 1369}
1369 1370
1370/*{{{ process an X event */ 1371/*{{{ process an X event */
1371void 1372void ecb_hot
1372rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1373{ 1374{
1374 make_current (); 1375 make_current ();
1375 1376
1376 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1474 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1476 focus_out ();
1476 break; 1477 break;
1477 1478
1478 case ConfigureNotify: 1479 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1483 { 1481 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1486 1517
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1519 {
1489 seen_resize = 1; 1520 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1522 }
1492 else 1523 else
1493 { 1524 {
1494#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ()) 1526 if (moved)
1496 update_background (); 1527 update_background ();
1497#endif 1528#endif
1498 } 1529 }
1530
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1532 }
1501 break; 1533 break;
1502 1534
1503 case PropertyNotify: 1535 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1506 && ev.xproperty.state == PropertyNewValue)
1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508
1509 break; 1537 break;
1510 1538
1511 case SelectionClear: 1539 case SelectionClear:
1512 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513 break;
1514
1515 case SelectionNotify:
1516 if (selection_wait == Sel_normal)
1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1518 break; 1541 break;
1519 1542
1520 case SelectionRequest: 1543 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1522 break; 1545 break;
1523 1546
1524 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1525 mapped = 1; 1559 mapped = 1;
1526#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1561 text_blink_ev.start ();
1528#endif 1562#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1564 break;
1531 1565
1532 case UnmapNotify: 1566 case UnmapNotify:
… …
1542 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1543 { 1577 {
1544 do 1578 do
1545 { 1579 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1548 } 1582 }
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1550 1584
1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1552 1586
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 { 1588 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1591 }
1592
1558 want_refresh = 1; 1593 want_refresh = 1;
1559 } 1594 }
1560 else 1595 else
1561 { 1596 {
1562 XEvent unused_event; 1597 XEvent unused_event;
… …
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1565 ; 1600 ;
1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1567 ; 1602 ;
1568 1603
1569 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1570 { 1605 {
1571 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1572 scrollbar_show (0); 1607 scrollBar.show (0);
1573 } 1608 }
1574 } 1609 }
1575 break; 1610 break;
1576 1611
1577 case MotionNotify: 1612 case MotionNotify:
1578#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1614 if (hidden_pointer)
1580 pointer_unblank (); 1615 pointer_unblank ();
1581#endif 1616#endif
1617 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1618 || priv_modes & PrivMode_MouseAnyEvent)
1619 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1621 break;
1584 1622
1585 if (ev.xany.window == vt) 1623 if (ev.xany.window == vt)
1586 { 1624 {
… …
1615 1653
1616#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1617 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1618 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1619 { 1657 {
1658 page_dirn scroll_selection_dir;
1620 int dist; 1659 int dist;
1621 1660
1622 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1624 */ 1663 */
1625 if (!sel_scroll_ev.active) 1664 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1665 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1666
1628 /* save the event params so we can highlight 1667 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1668 * the selection in the pending-scroll loop
1630 */ 1669 */
1631 selection_save_x = ev.xbutton.x; 1670 selection_save_x = ev.xbutton.x;
… …
1639 dist = int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1640 } 1679 }
1641 else 1680 else
1642 { 1681 {
1643 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1644 dist = ev.xbutton.y - (int_bwidth + height); 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1645 } 1684 }
1646 1685
1647 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1648 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1; 1688 + 1;
1650 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1651 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1652 } 1692 }
1653 else 1693 else
1654 { 1694 {
1655 /* we are within the text window, so we 1695 /* we are within the text window, so we
1656 * shouldn't be scrolling 1696 * shouldn't be scrolling
1657 */ 1697 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1698 sel_scroll_ev.stop();
1660 } 1699 }
1661#endif 1700#endif
1662#ifdef MOUSE_THRESHOLD 1701#ifdef MOUSE_THRESHOLD
1663 } 1702 }
1664#endif 1703#endif
1665 } 1704 }
1666 } 1705 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1706 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1707 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1708 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1709 MotionNotify, &ev))
1671 ; 1710 ;
1672 1711
1673 XQueryPointer (dpy, scrollBar.win, 1712 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1713 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1716 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1718 scrollBar.size ());
1680 want_refresh = 1; 1719 want_refresh = 1;
1681 scrollbar_show (1); 1720 scrollBar.show (1);
1682 } 1721 }
1683 break; 1722 break;
1684 } 1723 }
1685 1724
1686#if defined(CURSOR_BLINK) 1725#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1726 if (ev.type == KeyPress)
1688 { 1727 cursor_blink_reset ();
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696 }
1697#endif 1728#endif
1698 1729
1699#if defined(POINTER_BLANK) 1730#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1731 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 { 1732 {
… …
1707 1738
1708 if (ev.type == KeyPress && hidden_pointer == 0) 1739 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank (); 1740 pointer_blank ();
1710 } 1741 }
1711#endif 1742#endif
1712}
1713 1743
1714void 1744 refresh_check ();
1745}
1746
1747#if ENABLE_FRILLS
1748void ecb_cold
1749rxvt_term::set_urgency (bool enable)
1750{
1751 if (enable == urgency_hint)
1752 return;
1753
1754 if (XWMHints *h = XGetWMHints (dpy, parent))
1755 {
1756 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1757 XSetWMHints (dpy, parent, h);
1758 urgency_hint = enable;
1759 XFree (h);
1760 }
1761}
1762#endif
1763
1764void ecb_cold
1715rxvt_term::focus_in () 1765rxvt_term::focus_in ()
1716{ 1766{
1717 if (!focus) 1767 if (!focus)
1718 { 1768 {
1719 focus = 1; 1769 focus = 1;
1720 want_refresh = 1; 1770 want_refresh = 1;
1721 1771
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724#if USE_XIM 1772#if USE_XIM
1725 if (Input_Context != NULL) 1773 if (Input_Context != NULL)
1726 { 1774 {
1727 IMSetPosition (); 1775 im_set_position ();
1728 XSetICFocus (Input_Context); 1776 XSetICFocus (Input_Context);
1729 } 1777 }
1730#endif 1778#endif
1731#if CURSOR_BLINK 1779#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink)) 1780 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1781 cursor_blink_ev.again ();
1734#endif 1782#endif
1735#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
1737 { 1785 {
1738 pix_colors = pix_colors_focused; 1786 pix_colors = pix_colors_focused;
1739 scr_recolour (); 1787 scr_recolor ();
1740 } 1788 }
1741#endif 1789#endif
1742#if ENABLE_FRILLS 1790#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell)) 1791 if (option (Opt_urgentOnBell))
1744 { 1792 set_urgency (0);
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif 1793#endif
1752 }
1753}
1754 1794
1755void 1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1796 }
1797}
1798
1799void ecb_cold
1756rxvt_term::focus_out () 1800rxvt_term::focus_out ()
1757{ 1801{
1758 if (focus) 1802 if (focus)
1759 { 1803 {
1760 focus = 0; 1804 focus = 0;
1761 want_refresh = 1; 1805 want_refresh = 1;
1762 1806
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1807#if ENABLE_FRILLS
1764 1808 if (option (Opt_urgentOnBell))
1809 set_urgency (0);
1810#endif
1765#if ENABLE_FRILLS || ISO_14755 1811#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf) 1812 if (iso14755buf)
1767 { 1813 {
1768 iso14755buf = 0; 1814 iso14755buf = 0;
1769# if ISO_14755 1815# if ISO_14755
… …
1776 XUnsetICFocus (Input_Context); 1822 XUnsetICFocus (Input_Context);
1777#endif 1823#endif
1778#if CURSOR_BLINK 1824#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink)) 1825 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop (); 1826 cursor_blink_ev.stop ();
1827
1781 hidden_cursor = 0; 1828 hidden_cursor = 0;
1782#endif 1829#endif
1783#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1785 { 1832 {
1786 pix_colors = pix_colors_unfocused; 1833 pix_colors = pix_colors_unfocused;
1787 scr_recolour (); 1834 scr_recolor ();
1788 } 1835 }
1789#endif 1836#endif
1790 }
1791}
1792 1837
1793void 1838 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1839 }
1840}
1841
1842void ecb_cold
1794rxvt_term::update_fade_color (unsigned int idx) 1843rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1795{ 1844{
1796#if OFF_FOCUS_FADING 1845#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1846 if (rs[Rs_fade])
1798 { 1847 {
1848 if (!first_time)
1849 pix_colors_focused [idx].free (this);
1850
1799 rgba c; 1851 rgba c;
1800 pix_colors [Color_fade].get (c); 1852 pix_colors [Color_fade].get (c);
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1853 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 } 1854 }
1803#endif 1855#endif
1804} 1856}
1805 1857
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL 1858#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1807void 1859void ecb_hot
1808rxvt_term::rootwin_cb (XEvent &ev) 1860rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1861{
1810 make_current (); 1862 make_current ();
1811 1863
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1864 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1865 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return; 1866 return;
1815 1867
1816# if ENABLE_TRANSPARENCY
1817 switch (ev.type) 1868 switch (ev.type)
1818 { 1869 {
1819 case PropertyNotify: 1870 case PropertyNotify:
1820 /* 1871 /*
1821 * if user used some Esetroot compatible prog to set the root bg, 1872 * if user used some Esetroot compatible prog to set the root bg,
1822 * use the property to determine the pixmap. We use it later on. 1873 * use the property to determine the pixmap. We use it later on.
1823 */ 1874 */
1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1875 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1876 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826 { 1877 {
1827 bgPixmap.set_root_pixmap (); 1878#if BG_IMAGE_FROM_ROOT
1879 if (option (Opt_transparent))
1880 {
1881 rxvt_img::new_from_root (this)->replace (root_img);
1828 update_background (); 1882 update_background ();
1883 }
1884#endif
1885 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1829 } 1886 }
1887
1830 break; 1888 break;
1831 } 1889 }
1832# endif 1890
1891 refresh_check ();
1833} 1892}
1834#endif 1893#endif
1835 1894
1836void 1895void
1837rxvt_term::button_press (XButtonEvent &ev) 1896rxvt_term::button_press (XButtonEvent &ev)
… …
1858 iso14755_54 (ev.x, ev.y); 1917 iso14755_54 (ev.x, ev.y);
1859 return; 1918 return;
1860 } 1919 }
1861#endif 1920#endif
1862 1921
1863 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1922 clickintime = ev.time - MEvent.time < multiClickTime;
1864 1923
1865 if (reportmode) 1924 if (reportmode)
1866 { 1925 {
1867 /* mouse report from vt window */ 1926 /* mouse report from vt window */
1868 /* save the xbutton state (for ButtonRelease) */ 1927 /* save the xbutton state (for ButtonRelease) */
1869 MEvent.state = ev.state; 1928 MEvent.state = ev.state;
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1929#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1930 if (ev.button == MEvent.button && clickintime)
1872 { 1931 {
1873 /* same button, within alloted time */ 1932 /* same button, within allowed time */
1874 MEvent.clicks++; 1933 MEvent.clicks++;
1875 1934
1876 if (MEvent.clicks > 1) 1935 if (MEvent.clicks > 1)
1877 { 1936 {
1878 /* only report double clicks */ 1937 /* only report double clicks */
… …
1892 mouse_report (ev); 1951 mouse_report (ev);
1893 } 1952 }
1894#else 1953#else
1895 MEvent.button = ev.button; 1954 MEvent.button = ev.button;
1896 mouse_report (ev); 1955 mouse_report (ev);
1897#endif /* MOUSE_REPORT_DOUBLECLICK */ 1956#endif /* MOUSE_REPORT_DOUBLECLICK */
1898 1957
1899 } 1958 }
1900 else 1959 else
1901 { 1960 {
1902 if (ev.button != MEvent.button) 1961 if (ev.button != MEvent.button)
… …
1950 } 2009 }
1951 2010
1952 /* 2011 /*
1953 * Scrollbar window processing of button press 2012 * Scrollbar window processing of button press
1954 */ 2013 */
1955 if (isScrollbarWindow (ev.window)) 2014 if (scrollBar.state && ev.window == scrollBar.win)
1956 { 2015 {
1957 scrollBar.setIdle (); 2016 page_dirn direction = NO_DIR;
2017
2018 if (scrollBar.upButton (ev.y))
2019 direction = UP; /* up */
2020 else if (scrollBar.dnButton (ev.y))
2021 direction = DN; /* down */
2022
2023 scrollBar.state = SB_STATE_IDLE;
1958 /* 2024 /*
1959 * Rxvt-style scrollbar: 2025 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 2026 * move up if mouse is above slider
1961 * move dn if mouse is below slider 2027 * move dn if mouse is below slider
1962 * 2028 *
… …
1971 /* 2037 /*
1972 * Mouse report disabled scrollbar: 2038 * Mouse report disabled scrollbar:
1973 * arrow buttons - send up/down 2039 * arrow buttons - send up/down
1974 * click on scrollbar - send pageup/down 2040 * click on scrollbar - send pageup/down
1975 */ 2041 */
1976 if ((scrollBar.style == R_SB_NEXT 2042 if (direction == UP)
1977 && scrollbarnext_upButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_upButton (ev.y)))
1980 tt_printf ("\033[A"); 2043 tt_printf ("\033[A");
1981 else if ((scrollBar.style == R_SB_NEXT 2044 else if (direction == DN)
1982 && scrollbarnext_dnButton (ev.y))
1983 || (scrollBar.style == R_SB_RXVT
1984 && scrollbarrxvt_dnButton (ev.y)))
1985 tt_printf ("\033[B"); 2045 tt_printf ("\033[B");
1986 else 2046 else
1987 switch (ev.button) 2047 switch (ev.button)
1988 { 2048 {
1989 case Button2: 2049 case Button2:
… …
1996 tt_printf ("\033[5~"); 2056 tt_printf ("\033[5~");
1997 break; 2057 break;
1998 } 2058 }
1999 } 2059 }
2000 else 2060 else
2001#endif /* NO_SCROLLBAR_REPORT */ 2061#endif /* NO_SCROLLBAR_REPORT */
2002
2003 {
2004 char upordown = 0;
2005
2006 if (scrollBar.style == R_SB_NEXT)
2007 { 2062 {
2008 if (scrollbarnext_upButton (ev.y)) 2063 if (direction != NO_DIR)
2009 upordown = -1; /* up */
2010 else if (scrollbarnext_dnButton (ev.y))
2011 upordown = 1; /* down */
2012 }
2013 else if (scrollBar.style == R_SB_RXVT)
2014 {
2015 if (scrollbarrxvt_upButton (ev.y))
2016 upordown = -1; /* up */
2017 else if (scrollbarrxvt_dnButton (ev.y))
2018 upordown = 1; /* down */
2019 }
2020 if (upordown)
2021 { 2064 {
2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2065#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2066 if (!cont_scroll_ev.is_active ())
2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2067 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024#endif 2068#endif
2025 if (scr_page (upordown < 0 ? UP : DN, 1)) 2069 if (scr_page (direction, 1))
2026 { 2070 {
2027 if (upordown < 0) 2071 if (direction == UP)
2028 scrollBar.setUp (); 2072 scrollBar.state = SB_STATE_UP;
2029 else 2073 else
2030 scrollBar.setDn (); 2074 scrollBar.state = SB_STATE_DOWN;
2031 } 2075 }
2032 } 2076 }
2033 else 2077 else
2034 switch (ev.button) 2078 switch (ev.button)
2035 { 2079 {
2036 case Button2: 2080 case Button2:
2037 switch (scrollbar_align) 2081 switch (scrollBar.align)
2038 { 2082 {
2039 case R_SB_ALIGN_TOP: 2083 case SB_ALIGN_TOP:
2040 csrO = 0; 2084 csrO = 0;
2041 break; 2085 break;
2042 case R_SB_ALIGN_CENTRE: 2086 case SB_ALIGN_CENTRE:
2043 csrO = (scrollBar.bot - scrollBar.top) / 2; 2087 csrO = (scrollBar.bot - scrollBar.top) / 2;
2044 break; 2088 break;
2045 case R_SB_ALIGN_BOTTOM: 2089 case SB_ALIGN_BOTTOM:
2046 csrO = scrollBar.bot - scrollBar.top; 2090 csrO = scrollBar.bot - scrollBar.top;
2047 break; 2091 break;
2048 } 2092 }
2049 2093
2050 if (scrollBar.style == R_SB_XTERM 2094 if (scrollBar.style == SB_STYLE_XTERM
2051 || scrollbar_above_slider (ev.y) 2095 || scrollBar.above_slider (ev.y)
2052 || scrollbar_below_slider (ev.y)) 2096 || scrollBar.below_slider (ev.y))
2053 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2097 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2054 2098
2055 scrollBar.setMotion (); 2099 scrollBar.state = SB_STATE_MOTION;
2056 break; 2100 break;
2057 2101
2058 case Button1: 2102 case Button1:
2059 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2103 if (scrollBar.align == SB_ALIGN_CENTRE)
2060 csrO = ev.y - scrollBar.top; 2104 csrO = ev.y - scrollBar.top;
2061 /* FALLTHROUGH */ 2105 /* FALLTHROUGH */
2062 2106
2063 case Button3: 2107 case Button3:
2064 if (scrollBar.style != R_SB_XTERM) 2108 if (scrollBar.style != SB_STYLE_XTERM)
2065 { 2109 {
2066 if (scrollbar_above_slider (ev.y)) 2110 if (scrollBar.above_slider (ev.y))
2067# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2068 scr_page (UP, nrow - 1); 2112 scr_page (UP, nrow - 1);
2069# else 2113# else
2070 scr_page (UP, nrow / 4); 2114 scr_page (UP, nrow / 4);
2071# endif 2115# endif
2072 else if (scrollbar_below_slider (ev.y)) 2116 else if (scrollBar.below_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2074 scr_page (DN, nrow - 1); 2118 scr_page (DN, nrow - 1);
2075# else 2119# else
2076 scr_page (DN, nrow / 4); 2120 scr_page (DN, nrow / 4);
2077# endif 2121# endif
2078 else 2122 else
2079 scrollBar.setMotion (); 2123 scrollBar.state = SB_STATE_MOTION;
2080 } 2124 }
2081 else 2125 else
2082 { 2126 {
2083 scr_page ((ev.button == Button1 ? DN : UP), 2127 scr_page ((ev.button == Button1 ? DN : UP),
2084 (nrow 2128 (nrow
2085 * scrollbar_position (ev.y) 2129 * scrollBar.position (ev.y)
2086 / scrollbar_size ())); 2130 / scrollBar.size ()));
2087 } 2131 }
2088 2132
2089 break; 2133 break;
2090 } 2134 }
2091 } 2135 }
… …
2101 2145
2102 csrO = 0; /* reset csr Offset */ 2146 csrO = 0; /* reset csr Offset */
2103 if (!bypass_keystate) 2147 if (!bypass_keystate)
2104 reportmode = !! (priv_modes & PrivMode_mouse_report); 2148 reportmode = !! (priv_modes & PrivMode_mouse_report);
2105 2149
2106 if (scrollbar_isUpDn ()) 2150 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2107 { 2151 {
2108 scrollBar.setIdle (); 2152 scrollBar.state = SB_STATE_IDLE;
2109 scrollbar_show (0); 2153 scrollBar.show (0);
2110 } 2154 }
2111 2155
2112#ifdef SELECTION_SCROLLING 2156#ifdef SELECTION_SCROLLING
2113 if (sel_scroll_ev.active)
2114 sel_scroll_ev.stop(); 2157 sel_scroll_ev.stop();
2115#endif 2158#endif
2116 2159
2117 if (ev.window == vt) 2160 if (ev.window == vt)
2118 { 2161 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2162 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2134#ifdef MOUSE_REPORT_DOUBLECLICK 2177#ifdef MOUSE_REPORT_DOUBLECLICK
2135 /* only report the release of 'slow' single clicks */ 2178 /* only report the release of 'slow' single clicks */
2136 if (MEvent.button != AnyButton 2179 if (MEvent.button != AnyButton
2137 && (ev.button != MEvent.button 2180 && (ev.button != MEvent.button
2138 || (ev.time - MEvent.time 2181 || (ev.time - MEvent.time
2139 > MULTICLICK_TIME / 2))) 2182 > multiClickTime / 2)))
2140 { 2183 {
2141 MEvent.clicks = 0; 2184 MEvent.clicks = 0;
2142 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2143 mouse_report (ev); 2186 mouse_report (ev);
2144 } 2187 }
2145#else /* MOUSE_REPORT_DOUBLECLICK */ 2188#else /* MOUSE_REPORT_DOUBLECLICK */
2146 MEvent.button = AnyButton; 2189 MEvent.button = AnyButton;
2147 mouse_report (ev); 2190 mouse_report (ev);
2148#endif /* MOUSE_REPORT_DOUBLECLICK */ 2191#endif /* MOUSE_REPORT_DOUBLECLICK */
2149 return; 2192 return;
2150 } 2193 }
2151 2194
2152 /* 2195 /*
2153 * dumb hack to compensate for the failure of click-and-drag 2196 * dumb hack to compensate for the failure of click-and-drag
… …
2164 case Button3: 2207 case Button3:
2165 selection_make (ev.time); 2208 selection_make (ev.time);
2166 break; 2209 break;
2167 2210
2168 case Button2: 2211 case Button2:
2169 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2212 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2213 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2171 break; 2214 break;
2172 2215
2173#ifdef MOUSE_WHEEL 2216#ifdef MOUSE_WHEEL
2174 case Button4: 2217 case Button4:
2175 case Button5: 2218 case Button5:
2176 { 2219 {
2177 int i; 2220 int lines;
2178 page_dirn v; 2221 page_dirn dirn;
2179 2222
2180 v = ev.button == Button4 ? UP : DN; 2223 dirn = ev.button == Button4 ? UP : DN;
2181 2224
2182 if (ev.state & ShiftMask) 2225 if (ev.state & ShiftMask)
2183 i = 1; 2226 lines = 1;
2184 else if (option (Opt_mouseWheelScrollPage)) 2227 else if (option (Opt_mouseWheelScrollPage))
2185 i = nrow - 1; 2228 lines = nrow - 1;
2186 else 2229 else
2187 i = 5; 2230 lines = 5;
2188 2231
2189# ifdef MOUSE_SLIP_WHEELING 2232# ifdef MOUSE_SLIP_WHEELING
2190 if (ev.state & ControlMask) 2233 if (ev.state & ControlMask)
2191 { 2234 {
2192 mouse_slip_wheel_speed += v ? -1 : 1; 2235 mouse_slip_wheel_speed += dirn;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2236 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195 2237
2196 if (slip_wheel_ev.at < NOW) 2238 if (!slip_wheel_ev.is_active ())
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2239 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199 slip_wheel_ev.start ();
2200 } 2240 }
2201 else 2241 else
2242# endif
2202 { 2243 {
2203# endif
2204 scr_page (v, i); 2244 scr_page (dirn, lines);
2205 scrollbar_show (1); 2245 scrollBar.show (1);
2206# ifdef MOUSE_SLIP_WHEELING
2207 } 2246 }
2208# endif
2209 } 2247 }
2210 break; 2248 break;
2211#endif 2249#endif
2212 } 2250 }
2213 } 2251 }
2214} 2252}
2215 2253
2216/*}}} */ 2254/*}}} */
2217 2255
2218bool 2256void ecb_hot
2219rxvt_term::cmd_parse () 2257rxvt_term::cmd_parse ()
2220{ 2258{
2221 bool flag = false;
2222 wchar_t ch = NOCHAR; 2259 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2260 char *seq_begin; // remember start of esc-sequence here
2224 2261
2225 for (;;) 2262 for (;;)
2226 { 2263 {
2227 if (ch == NOCHAR) 2264 if (ecb_unlikely (ch == NOCHAR))
2228 { 2265 {
2229 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2267 ch = next_char ();
2231 2268
2232 if (ch == NOCHAR) 2269 if (ch == NOCHAR)
2233 break; 2270 break;
2234 } 2271 }
2235 2272
2236 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2273 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2274 {
2238 if (!seen_input) 2275 if (ecb_unlikely (!seen_input))
2239 { 2276 {
2240 seen_input = 1; 2277 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2278 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2279 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2280 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2293 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2294 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2295
2259 for (;;) 2296 for (;;)
2260 { 2297 {
2261 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2298 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2299 break;
2263 2300
2264 *str++ = ch; 2301 *str++ = ch;
2265 2302
2266 if (ch == C0_LF || str >= eol) 2303 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2304 {
2268 if (ch == C0_LF) 2305 if (ch == C0_LF)
2269 nlines++; 2306 nlines++;
2270 2307
2271 refresh_count++; 2308 refresh_count++;
2272 2309
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2310 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 { 2311 {
2275 refresh_count = 0; 2312 refresh_count = 0;
2276 2313
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2314 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 { 2315 {
2279 refreshnow = true; 2316 refreshnow = true;
2280 ch = NOCHAR; 2317 ch = NOCHAR;
2281 break; 2318 break;
2282 } 2319 }
… …
2320 * What the heck we'll cheat and only refresh less than every page-full. 2357 * What the heck we'll cheat and only refresh less than every page-full.
2321 * if skipScroll is enabled. 2358 * if skipScroll is enabled.
2322 */ 2359 */
2323 if (refreshnow) 2360 if (refreshnow)
2324 { 2361 {
2325 flag = true;
2326 scr_refresh (); 2362 scr_refresh ();
2327 want_refresh = 1; 2363 want_refresh = 1;
2328 } 2364 }
2329
2330 } 2365 }
2331 else 2366 else
2332 { 2367 {
2333 try 2368 try
2334 { 2369 {
… …
2342 } 2377 }
2343 2378
2344 ch = NOCHAR; 2379 ch = NOCHAR;
2345 } 2380 }
2346 } 2381 }
2347
2348 return flag;
2349} 2382}
2350 2383
2351// read the next character 2384// read the next character
2352wchar_t 2385wchar_t ecb_hot
2353rxvt_term::next_char () NOTHROW 2386rxvt_term::next_char () NOTHROW
2354{ 2387{
2355 while (cmdbuf_ptr < cmdbuf_endp) 2388 while (cmdbuf_ptr < cmdbuf_endp)
2356 { 2389 {
2357 // assume 7-bit to be ascii ALWAYS 2390 // assume 7-bit to be ascii ALWAYS
2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2391 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2359 return *cmdbuf_ptr++; 2392 return *cmdbuf_ptr++;
2360 2393
2361 wchar_t wc; 2394 wchar_t wc;
2362 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2395 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2363 2396
… …
2367 cmdbuf_ptr = cmdbuf_endp; 2400 cmdbuf_ptr = cmdbuf_endp;
2368 break; 2401 break;
2369 } 2402 }
2370 2403
2371 if (len == (size_t)-1) 2404 if (len == (size_t)-1)
2405 {
2406 mbstate.reset (); // reset now undefined conversion state
2407 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2408 // in which case we "erroneously" return the next byte which might be valid.
2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2409 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2410 }
2373 2411
2374 // assume wchar == unicode 2412 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2413 cmdbuf_ptr += len;
2376 return wc & UNICODE_MASK; 2414 return wc & UNICODE_MASK;
2377 } 2415 }
2378 2416
2379 return NOCHAR; 2417 return NOCHAR;
2380} 2418}
2381 2419
2382// read the next octet 2420// read the next octet
2383uint32_t 2421uint32_t ecb_hot
2384rxvt_term::next_octet () NOTHROW 2422rxvt_term::next_octet () NOTHROW
2385{ 2423{
2386 return cmdbuf_ptr < cmdbuf_endp 2424 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++ 2425 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR; 2426 : NOCHAR;
2389} 2427}
2390 2428
2391static class out_of_input out_of_input; 2429static class out_of_input out_of_input;
2392 2430
2393/* rxvt_cmd_getc () - Return next input character */ 2431wchar_t ecb_hot
2394/*
2395 * Return the next input character after first passing any keyboard input
2396 * to the command.
2397 */
2398wchar_t
2399rxvt_term::cmd_getc () THROW ((class out_of_input)) 2432rxvt_term::cmd_getc () THROW ((class out_of_input))
2400{ 2433{
2401 wchar_t c = next_char (); 2434 wchar_t c = next_char ();
2402 2435
2403 if (c == NOCHAR) 2436 if (c == NOCHAR)
2404 throw out_of_input; 2437 throw out_of_input;
2405 2438
2406 return c; 2439 return c;
2407} 2440}
2408 2441
2409uint32_t 2442uint32_t ecb_hot
2410rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2443rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2444{
2412 uint32_t c = next_octet (); 2445 uint32_t c = next_octet ();
2413 2446
2414 if (c == NOCHAR) 2447 if (c == NOCHAR)
… …
2418} 2451}
2419 2452
2420/*{{{ print pipe */ 2453/*{{{ print pipe */
2421/*----------------------------------------------------------------------*/ 2454/*----------------------------------------------------------------------*/
2422#ifdef PRINTPIPE 2455#ifdef PRINTPIPE
2423FILE * 2456FILE * ecb_cold
2424rxvt_term::popen_printer () 2457rxvt_term::popen_printer ()
2425{ 2458{
2426 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2459 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427 2460
2428 if (stream == NULL) 2461 if (stream == NULL)
2429 rxvt_warn ("can't open printer pipe, not printing.\n"); 2462 rxvt_warn ("can't open printer pipe, not printing.\n");
2430 2463
2431 return stream; 2464 return stream;
2432} 2465}
2433 2466
2434int 2467int ecb_cold
2435rxvt_term::pclose_printer (FILE *stream) 2468rxvt_term::pclose_printer (FILE *stream)
2436{ 2469{
2437 fflush (stream); 2470 fflush (stream);
2438 return pclose (stream); 2471 return pclose (stream);
2439} 2472}
2440 2473
2441/* 2474/*
2442 * simulate attached vt100 printer 2475 * simulate attached vt100 printer
2443 */ 2476 */
2444void 2477void ecb_cold
2445rxvt_term::process_print_pipe () 2478rxvt_term::process_print_pipe ()
2446{ 2479{
2447 int done; 2480 FILE *fd = popen_printer ();
2448 FILE *fd;
2449 2481
2450 if ((fd = popen_printer ()) == NULL) 2482 if (!fd)
2451 return; 2483 return;
2452 2484
2453 /* 2485 /*
2454 * Send all input to the printer until either ESC[4i or ESC[?4i 2486 * Send all input to the printer until either ESC[4i or ESC[?4i
2455 * is received. 2487 * is received.
2456 */ 2488 */
2457 for (done = 0; !done;) 2489 for (int done = 0; !done; )
2458 { 2490 {
2459 unsigned char buf[8]; 2491 unsigned char buf[8];
2460 unicode_t ch; 2492 unicode_t ch;
2461 unsigned int i, len; 2493 unsigned int i, len;
2462 2494
… …
2493 } 2525 }
2494 } 2526 }
2495 2527
2496 pclose_printer (fd); 2528 pclose_printer (fd);
2497} 2529}
2498#endif /* PRINTPIPE */ 2530#endif /* PRINTPIPE */
2499/*}}} */ 2531/*}}} */
2500 2532
2501/* *INDENT-OFF* */
2502enum { 2533enum {
2503 C1_40 = 0x40, 2534 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2535 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2536 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2537 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2538 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2539};
2509/* *INDENT-ON* */
2510 2540
2511/*{{{ process non-printing single characters */ 2541/*{{{ process non-printing single characters */
2512void 2542void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2543rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2544{
2515 switch (ch) 2545 switch (ch)
2516 { 2546 {
2517 case C0_ESC: 2547 case C0_ESC:
… …
2547 scr_charset_choose (0); 2577 scr_charset_choose (0);
2548 break; 2578 break;
2549 2579
2550#ifdef EIGHT_BIT_CONTROLS 2580#ifdef EIGHT_BIT_CONTROLS
2551 // 8-bit controls 2581 // 8-bit controls
2552 case 0x90: /* DCS */ 2582 case 0x90: /* DCS */
2553 process_dcs_seq (); 2583 process_dcs_seq ();
2554 break; 2584 break;
2555 case 0x9b: /* CSI */ 2585 case 0x9b: /* CSI */
2556 process_csi_seq (); 2586 process_csi_seq ();
2557 break; 2587 break;
2558 case 0x9d: /* OSC */ 2588 case 0x9d: /* OSC */
2559 process_osc_seq (); 2589 process_osc_seq ();
2560 break; 2590 break;
2561#endif 2591#endif
2562 } 2592 }
2563} 2593}
2564/*}}} */ 2594/*}}} */
2565 2595
2566 2596
2567/*{{{ process VT52 escape sequences */ 2597/*{{{ process VT52 escape sequences */
2568void 2598void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2599rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2600{
2571 int row, col; 2601 int row, col;
2572 2602
2573 switch (ch) 2603 switch (ch)
… …
2607 break; 2637 break;
2608 case 'Z': /* identify the terminal type */ 2638 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2639 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2640 break;
2611 case '<': /* turn off VT52 mode */ 2641 case '<': /* turn off VT52 mode */
2612 PrivMode (0, PrivMode_vt52); 2642 priv_modes &= ~PrivMode_vt52;
2613 break; 2643 break;
2614 case 'F': /* use special graphics character set */ 2644 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2645 case 'G': /* use regular character set */
2616 /* unimplemented */ 2646 /* unimplemented */
2617 break; 2647 break;
… …
2623} 2653}
2624/*}}} */ 2654/*}}} */
2625 2655
2626 2656
2627/*{{{ process escape sequences */ 2657/*{{{ process escape sequences */
2628void 2658void ecb_hot
2629rxvt_term::process_escape_seq () 2659rxvt_term::process_escape_seq ()
2630{ 2660{
2631 unicode_t ch = cmd_getc (); 2661 unicode_t ch = cmd_getc ();
2632 2662
2633 if (priv_modes & PrivMode_vt52) 2663 if (priv_modes & PrivMode_vt52)
… …
2636 return; 2666 return;
2637 } 2667 }
2638 2668
2639 switch (ch) 2669 switch (ch)
2640 { 2670 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2671 case '#':
2643 if (cmd_getc () == '8') 2672 if (cmd_getc () == '8')
2644 scr_E (); 2673 scr_E ();
2645 break; 2674 break;
2646 case '(': 2675 case '(':
… …
2669#if !ENABLE_MINIMAL 2698#if !ENABLE_MINIMAL
2670 case '9': 2699 case '9':
2671 scr_forwardindex (); 2700 scr_forwardindex ();
2672 break; 2701 break;
2673#endif 2702#endif
2703 // DECPAM/DECPNM
2674 case '=': 2704 case '=':
2705 priv_modes |= PrivMode_aplKP;
2706 break;
2675 case '>': 2707 case '>':
2676 PrivMode ((ch == '='), PrivMode_aplKP); 2708 priv_modes &= ~PrivMode_aplKP;
2677 break; 2709 break;
2678 2710
2679 case C1_40: 2711 case C1_40:
2680 cmd_getc (); 2712 cmd_getc ();
2681 break; 2713 break;
… …
2685 2717
2686 /* 8.3.87: NEXT LINE */ 2718 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2719 case C1_NEL: /* ESC E */
2688 { 2720 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2721 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2722 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2723 }
2692 break; 2724 break;
2693 2725
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2726 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2727 case C1_ESA: /* ESC G */
2696 process_graphics (); 2728 // used by original rxvt for rob nations own graphics mode
2729 if (cmd_getc () == 'Q')
2730 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2731 break;
2698 2732
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2733 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2734 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2735 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2739 case C1_RI: /* ESC M */
2706 scr_index (DN); 2740 scr_index (DN);
2707 break; 2741 break;
2708 2742
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2743 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2744 /* case C1_SS2: break; */
2711 2745
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2746 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2747 /* case C1_SS3: break; */
2714 2748
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2749 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2750 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2751 process_dcs_seq ();
2718 break; 2752 break;
… …
2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2754 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2721 case C1_SCI: /* ESC Z */ 2755 case C1_SCI: /* ESC Z */
2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2756 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2723 break; /* steal obsolete ESC [ c */ 2757 break; /* steal obsolete ESC [ c */
2724 2758
2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2759 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2726 case C1_CSI: /* ESC [ */ 2760 case C1_CSI: /* ESC [ */
2727 process_csi_seq (); 2761 process_csi_seq ();
2728 break; 2762 break;
2729 2763
2730 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2764 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2731 case C1_OSC: /* ESC ] */ 2765 case C1_OSC: /* ESC ] */
2732 process_osc_seq (); 2766 process_osc_seq ();
2733 break; 2767 break;
2734 2768
2735 /* 8.3.106: RESET TO INITIAL STATE */ 2769 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2736 case 'c': 2770 case 'c':
2737 mbstate.reset (); 2771 mbstate.reset ();
2738 scr_poweron (); 2772 scr_poweron ();
2739 scrollbar_show (1); 2773 scrollBar.show (1);
2740 break; 2774 break;
2741 2775
2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2776 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2743 case 'n': 2777 case 'n':
2744 scr_charset_choose (2); 2778 scr_charset_choose (2);
… …
2751 } 2785 }
2752} 2786}
2753/*}}} */ 2787/*}}} */
2754 2788
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2789/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2790enum {
2758 CSI_ICH = 0x40, 2791 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2792 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2793 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2794 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2797 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2798 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2799 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2767}; 2800};
2768 2801
2769#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2802#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2803 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2804 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2772#define get_byte_array_bit(array, bit) \ 2805#define get_byte_array_bit(array, bit) \
2773 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2806 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2774 2807
2775const unsigned char csi_defaults[] = 2808static const unsigned char csi_defaults[] =
2776 { 2809 {
2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2810 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2811 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2812 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2813 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2814 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2815 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2783 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2784 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2817 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2785 }; 2818 };
2786/* *INDENT-ON* */
2787 2819
2788void 2820void ecb_hot
2789rxvt_term::process_csi_seq () 2821rxvt_term::process_csi_seq ()
2790{ 2822{
2791 unicode_t ch, priv, i; 2823 unicode_t ch, priv, prev_ch, i;
2792 unsigned int nargs, p; 2824 unsigned int nargs, p;
2793 int n, ndef; 2825 int n, ndef;
2794 int arg[ESC_ARGS] = { }; 2826 int arg[ESC_ARGS] = { };
2795 2827
2796 nargs = 0; 2828 nargs = 0;
2797 2829
2798 priv = 0; 2830 priv = 0;
2799 ch = cmd_getc (); 2831 ch = cmd_getc ();
2800 if (ch >= '<' && ch <= '?') 2832 if ((ch >= '<' && ch <= '?') || ch == '!')
2833 {
2801 { /* '<' '=' '>' '?' */ 2834 /* '<' '=' '>' '?' '!' */
2802 priv = ch; 2835 priv = ch;
2803 ch = cmd_getc (); 2836 ch = cmd_getc ();
2804 } 2837 }
2805 2838
2839 prev_ch = 0;
2806 /* read any numerical arguments */ 2840 /* read any numerical arguments */
2807 for (n = -1; ch < CSI_ICH; ) 2841 for (n = -1; ch < CSI_ICH; )
2808 { 2842 {
2809 if (isdigit (ch)) 2843 if (isdigit (ch))
2810 { 2844 {
… …
2820 n = -1; 2854 n = -1;
2821 } 2855 }
2822 else if (IS_CONTROL (ch)) 2856 else if (IS_CONTROL (ch))
2823 process_nonprinting (ch); 2857 process_nonprinting (ch);
2824 2858
2859 prev_ch = ch;
2825 ch = cmd_getc (); 2860 ch = cmd_getc ();
2826 } 2861 }
2827 2862
2828 if (ch > CSI_7F) 2863 if (ch > CSI_7F)
2829 return; 2864 return;
… …
2849 { 2884 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2885 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2886 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 // 2887 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2888 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2889 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855 // that we do not support xterm mouse reporting (should be 95 when we do). 2890 // versions.
2856 // 2891 //
2857 tt_printf ("\033[>%d;94;0c", 'U'); 2892 tt_printf ("\033[>%d;95;0c", 'U');
2858 } 2893 }
2859 break; 2894 break;
2895
2860 case '?': 2896 case '?':
2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2897 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862 process_terminal_mode (ch, priv, nargs, arg); 2898 process_terminal_mode (ch, priv, nargs, arg);
2863 break; 2899 break;
2900
2901 case '!':
2902 if (ch == CSI_70)
2903 {
2904 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2905 scr_soft_reset ();
2906
2907 static const int pm_h[] = { 7, 25 };
2908 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2909
2910 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2911 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2864 } 2912 }
2913 break;
2914 }
2915
2865 return; 2916 return;
2866 } 2917 }
2867 2918
2868 switch (ch) 2919 switch (ch)
2869 { 2920 {
… …
2883 } 2934 }
2884 break; 2935 break;
2885#endif 2936#endif
2886 2937
2887 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2938 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2888 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2939 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2889 arg[0] = -arg[0]; 2940 arg[0] = -arg[0];
2890 /* FALLTHROUGH */ 2941 /* FALLTHROUGH */
2891 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2942 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2943 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2893 scr_gotorc (arg[0], 0, RELATIVE); 2944 scr_gotorc (arg[0], 0, RELATIVE);
2894 break; 2945 break;
2895 2946
2896 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2947 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2897 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2948 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3047 scr_insert_mode (1); 3098 scr_insert_mode (1);
3048 else if (arg[0] == 20) 3099 else if (arg[0] == 20)
3049 priv_modes |= PrivMode_LFNL; 3100 priv_modes |= PrivMode_LFNL;
3050 break; 3101 break;
3051 3102
3103 case CSI_71: // DECSCUSR: set cursor style
3104 if (prev_ch == ' ')
3105 set_cursor_style (arg[0]);
3106 break;
3107
3052 /* 3108 /*
3053 * PRIVATE USE beyond this point. All CSI_7? sequences here 3109 * PRIVATE USE beyond this point. All CSI_7? sequences here
3054 */ 3110 */
3055 case CSI_72: /* DECSTBM: set top and bottom margins */ 3111 case CSI_72: /* DECSTBM: set top and bottom margins */
3056 if (nargs == 1) 3112 if (nargs == 1)
… …
3084 } 3140 }
3085} 3141}
3086/*}}} */ 3142/*}}} */
3087 3143
3088#if !ENABLE_MINIMAL 3144#if !ENABLE_MINIMAL
3089/* ARGSUSED */
3090void 3145void
3091rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3146rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3092{ 3147{
3093 int x, y; 3148 int x, y;
3094 XWindowAttributes wattr; 3149 XWindowAttributes wattr;
… …
3103 { 3158 {
3104 /* 3159 /*
3105 * commands 3160 * commands
3106 */ 3161 */
3107 case 1: /* deiconify window */ 3162 case 1: /* deiconify window */
3108 XMapWindow (dpy, parent[0]); 3163 XMapWindow (dpy, parent);
3109 break; 3164 break;
3110 case 2: /* iconify window */ 3165 case 2: /* iconify window */
3111 XIconifyWindow (dpy, parent[0], display->screen); 3166 XIconifyWindow (dpy, parent, display->screen);
3112 break; 3167 break;
3113 case 3: /* set position (pixels) */ 3168 case 3: /* set position (pixels) */
3114 XMoveWindow (dpy, parent[0], args[1], args[2]); 3169 XMoveWindow (dpy, parent, args[1], args[2]);
3115 break; 3170 break;
3116 case 4: /* set size (pixels) */ 3171 case 4: /* set size (pixels) */
3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3172 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3118 break; 3173 break;
3119 case 5: /* raise window */ 3174 case 5: /* raise window */
3120 XRaiseWindow (dpy, parent[0]); 3175 XRaiseWindow (dpy, parent);
3121 break; 3176 break;
3122 case 6: /* lower window */ 3177 case 6: /* lower window */
3123 XLowerWindow (dpy, parent[0]); 3178 XLowerWindow (dpy, parent);
3124 break; 3179 break;
3125 case 7: /* refresh window */ 3180 case 7: /* refresh window */
3126 scr_touch (true); 3181 scr_touch (true);
3127 break; 3182 break;
3128 case 8: /* set size (chars) */ 3183 case 8: /* set size (chars) */
… …
3131 break; 3186 break;
3132 3187
3133 //case 9: NYI, TODO, restore maximized window or maximize window 3188 //case 9: NYI, TODO, restore maximized window or maximize window
3134 default: 3189 default:
3135 if (args[0] >= 24) /* set height (chars) */ 3190 if (args[0] >= 24) /* set height (chars) */
3136 set_widthheight ((unsigned int)width, 3191 set_widthheight ((unsigned int)vt_width,
3137 (unsigned int) (args[1] * fheight)); 3192 (unsigned int) (args[1] * fheight));
3138 break; 3193 break;
3139 3194
3140 /* 3195 /*
3141 * reports - some output format copied from XTerm 3196 * reports - some output format copied from XTerm
3142 */ 3197 */
3143 case 11: /* report window state */ 3198 case 11: /* report window state */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3200 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3146 break; 3201 break;
3147 case 13: /* report window position */ 3202 case 13: /* report window position */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3203 XGetWindowAttributes (dpy, parent, &wattr);
3149 XTranslateCoordinates (dpy, parent[0], wattr.root, 3204 XTranslateCoordinates (dpy, parent, wattr.root,
3150 -wattr.border_width, -wattr.border_width, 3205 -wattr.border_width, -wattr.border_width,
3151 &x, &y, &wdummy); 3206 &x, &y, &wdummy);
3152 tt_printf ("\033[3;%d;%dt", x, y); 3207 tt_printf ("\033[3;%d;%dt", x, y);
3153 break; 3208 break;
3154 case 14: /* report window size (pixels) */ 3209 case 14: /* report window size (pixels) */
3155 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3211 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3157 break; 3212 break;
3158 case 18: /* report text area size (chars) */ 3213 case 18: /* report text area size (chars) */
3159 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3214 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3160 break; 3215 break;
… …
3162 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3163 break; 3218 break;
3164 case 20: /* report icon label */ 3219 case 20: /* report icon label */
3165 { 3220 {
3166 char *s; 3221 char *s;
3167 XGetIconName (dpy, parent[0], &s); 3222 XGetIconName (dpy, parent, &s);
3168 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3224 XFree (s);
3170 } 3225 }
3171 break; 3226 break;
3172 case 21: /* report window title */ 3227 case 21: /* report window title */
3173 { 3228 {
3174 char *s; 3229 char *s;
3175 XFetchName (dpy, parent[0], &s); 3230 XFetchName (dpy, parent, &s);
3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3177 XFree (s); 3232 XFree (s);
3178 } 3233 }
3179 break; 3234 break;
3180 } 3235 }
… …
3190rxvt_term::get_to_st (unicode_t &ends_how) 3245rxvt_term::get_to_st (unicode_t &ends_how)
3191{ 3246{
3192 unicode_t ch; 3247 unicode_t ch;
3193 bool seen_esc = false; 3248 bool seen_esc = false;
3194 unsigned int n = 0; 3249 unsigned int n = 0;
3195 wchar_t string[STRING_MAX]; 3250 wchar_t string[CBUFSIZ];
3196 3251
3197 while ((ch = cmd_getc ()) != NOCHAR) 3252 while ((ch = cmd_getc ()) != NOCHAR)
3198 { 3253 {
3199 if (seen_esc) 3254 if (seen_esc)
3200 { 3255 {
… …
3215 else if (ch < 0x20) 3270 else if (ch < 0x20)
3216 return NULL; /* other control character - exit */ 3271 return NULL; /* other control character - exit */
3217 3272
3218 seen_esc = false; 3273 seen_esc = false;
3219 3274
3220 if (n >= STRING_MAX - 1) 3275 if (n >= sizeof (string) - 1)
3221 // stop at some sane length 3276 // stop at some sane length
3222 return NULL; 3277 return NULL;
3223 3278
3224 string[n++] = ch; 3279 string[n++] = ch;
3225 } 3280 }
… …
3236 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3291 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3237 */ 3292 */
3238void 3293void
3239rxvt_term::process_dcs_seq () 3294rxvt_term::process_dcs_seq ()
3240{ 3295{
3241 char *s;
3242 unicode_t eh;
3243
3244 /* 3296 /*
3245 * Not handled yet 3297 * Not handled yet
3246 */ 3298 */
3299
3300 unicode_t eh;
3247 s = get_to_st (eh); 3301 char *s = get_to_st (eh);
3248 if (s) 3302 if (s)
3249 free (s); 3303 free (s);
3250 3304
3251 return; 3305 return;
3252} 3306}
… …
3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3310 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3257 */ 3311 */
3258void 3312void
3259rxvt_term::process_osc_seq () 3313rxvt_term::process_osc_seq ()
3260{ 3314{
3261 unicode_t ch, eh;
3262 int arg; 3315 int arg;
3263 3316
3264 ch = cmd_getc (); 3317 unicode_t ch = cmd_getc ();
3265 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3318 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3266 arg = arg * 10 + (ch - '0'); 3319 arg = arg * 10 + (ch - '0');
3267 3320
3268 if (ch == ';') 3321 if (ch == ';')
3269 { 3322 {
3323 unicode_t eh;
3270 char *s = get_to_st (eh); 3324 char *s = get_to_st (eh);
3271 3325
3272 if (s) 3326 if (s)
3273 { 3327 {
3274 process_xterm_seq (arg, s, eh); 3328 process_xterm_seq (arg, s, eh);
… …
3298 3352
3299/* 3353/*
3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3354 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3301 */ 3355 */
3302void 3356void
3303rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3357rxvt_term::process_xterm_seq (int op, char *str, char resp)
3304{ 3358{
3305 int color; 3359 int color;
3306 char *buf, *name; 3360 char *buf, *name;
3307 bool query = str[0] == '?' && !str[1]; 3361 bool query = str[0] == '?' && !str[1];
3308 int saveop = op; 3362 int saveop = op;
… …
3335 unsigned long bytes_after; 3389 unsigned long bytes_after;
3336 unsigned char *value = 0; 3390 unsigned char *value = 0;
3337 const char *str = ""; 3391 const char *str = "";
3338 3392
3339 if (prop 3393 if (prop
3340 && XGetWindowProperty (dpy, parent[0], 3394 && XGetWindowProperty (dpy, parent,
3341 prop, 0, 1<<16, 0, AnyPropertyType, 3395 prop, 0, 1<<16, 0, AnyPropertyType,
3342 &actual_type, &actual_format, 3396 &actual_type, &actual_format,
3343 &nitems, &bytes_after, &value) == Success 3397 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3398 && actual_type != None
3345 && actual_format == 8) 3399 && actual_format == 8)
3346 str = (const char *)(value); 3400 str = (const char *)(value);
3347 3401
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3402 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3349 3403
3350 XFree (value); 3404 XFree (value);
3351 } 3405 }
3352 else 3406 else
3353 { 3407 {
3354 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3408 char *eq = strchr (str, '=');
3355 3409
3356 if (eq) 3410 if (eq)
3357 { 3411 {
3358 *eq = 0; 3412 *eq = 0;
3359 set_utf8_property (display->atom (str), eq + 1); 3413 set_utf8_property (display->atom (str), eq + 1);
3360 } 3414 }
3361 else 3415 else
3362 XDeleteProperty (dpy, parent[0], 3416 XDeleteProperty (dpy, parent,
3363 display->atom (str)); 3417 display->atom (str));
3364 } 3418 }
3365 break; 3419 break;
3366 3420
3367 case XTerm_Color: 3421 case XTerm_Color:
… …
3380 *buf++ = '\0'; 3434 *buf++ = '\0';
3381 3435
3382 process_color_seq (op, color, name, resp); 3436 process_color_seq (op, color, name, resp);
3383 } 3437 }
3384 break; 3438 break;
3439 case Rxvt_restoreFG:
3385 case XTerm_Color00: 3440 case XTerm_Color00:
3386 process_color_seq (op, Color_fg, str, resp); 3441 process_color_seq (op, Color_fg, str, resp);
3387 break; 3442 break;
3443 case Rxvt_restoreBG:
3388 case XTerm_Color01: 3444 case XTerm_Color01:
3389 process_color_seq (op, Color_bg, str, resp); 3445 process_color_seq (op, Color_bg, str, resp);
3390 break; 3446 break;
3391#ifndef NO_CURSORCOLOR 3447#ifndef NO_CURSORCOLOR
3392 case XTerm_Color_cursor: 3448 case XTerm_Color_cursor:
… …
3397 process_color_seq (op, Color_pointer_fg, str, resp); 3453 process_color_seq (op, Color_pointer_fg, str, resp);
3398 break; 3454 break;
3399 case XTerm_Color_pointer_bg: 3455 case XTerm_Color_pointer_bg:
3400 process_color_seq (op, Color_pointer_bg, str, resp); 3456 process_color_seq (op, Color_pointer_bg, str, resp);
3401 break; 3457 break;
3458#ifdef OPTION_HC
3459 case XTerm_Color_HC:
3460 process_color_seq (op, Color_HC, str, resp);
3461 break;
3462 case XTerm_Color_HTC:
3463 process_color_seq (op, Color_HTC, str, resp);
3464 break;
3465#endif
3402#ifndef NO_BOLD_UNDERLINE_REVERSE 3466#ifndef NO_BOLD_UNDERLINE_REVERSE
3403 case XTerm_Color_RV:
3404 process_color_seq (op, Color_RV, str, resp);
3405 break;
3406 case Rxvt_Color_BD:
3407 case URxvt_Color_BD: 3467 case URxvt_Color_BD:
3408 process_color_seq (op, Color_BD, str, resp); 3468 process_color_seq (op, Color_BD, str, resp);
3409 break; 3469 break;
3410 case Rxvt_Color_UL:
3411 case URxvt_Color_UL: 3470 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp); 3471 process_color_seq (op, Color_UL, str, resp);
3413 break; 3472 break;
3414 case URxvt_Color_IT: 3473 case URxvt_Color_IT:
3415 process_color_seq (op, Color_IT, str, resp); 3474 process_color_seq (op, Color_IT, str, resp);
3416 break; 3475 break;
3417#endif 3476#endif
3418#if ENABLE_TRANSPARENCY 3477 case URxvt_Color_border:
3478 process_color_seq (op, Color_border, str, resp);
3479 break;
3480
3481#if BG_IMAGE_FROM_ROOT
3419 case URxvt_Color_tint: 3482 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp); 3483 process_color_seq (op, Color_tint, str, resp);
3421 { 3484 {
3422 bool changed = false; 3485 bool changed = false;
3486
3423 if (ISSET_PIXCOLOR (Color_tint)) 3487 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3488 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3425 else 3489
3426 changed = bgPixmap.unset_tint ();
3427 if (changed) 3490 if (changed)
3428 update_background (); 3491 update_background ();
3429 } 3492 }
3430 3493
3431 break; 3494 break;
… …
3434#if BG_IMAGE_FROM_FILE 3497#if BG_IMAGE_FROM_FILE
3435 case Rxvt_Pixmap: 3498 case Rxvt_Pixmap:
3436 if (!strcmp (str, "?")) 3499 if (!strcmp (str, "?"))
3437 { 3500 {
3438 char str[256]; 3501 char str[256];
3502 int h_scale = fimage.h_scale;
3503 int v_scale = fimage.v_scale;
3504 int h_align = fimage.h_align;
3505 int v_align = fimage.v_align;
3439 3506
3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3507 sprintf (str, "[%dx%d+%d+%d]",
3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3508 h_scale, v_scale,
3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3509 h_align, v_align);
3443 process_xterm_seq (XTerm_title, str, CHAR_ST); 3510 process_xterm_seq (XTerm_title, str, CHAR_ST);
3444 } 3511 }
3445 else 3512 else
3446 { 3513 {
3447 int changed = 0; 3514 bool changed = false;
3448 3515
3449 if (*str != ';') 3516 if (*str != ';')
3450 { 3517 {
3451 /* reset to default scaling :*/ 3518 try
3452 bgPixmap.unset_geometry (); 3519 {
3453 if (bgPixmap.set_file (str)) /* change pixmap */ 3520 fimage.set_file_geometry (this, str);
3454 changed++; 3521 changed = true;
3455 str = strchr (str, ';'); 3522 }
3456 if (str == NULL) 3523 catch (const class rxvt_failure_exception &e)
3457 bgPixmap.set_defaultGeometry (); 3524 {
3525 }
3458 } 3526 }
3459 while (str) 3527 else
3460 { 3528 {
3461 str++; 3529 str++;
3462 if (bgPixmap.set_geometry (str)) 3530 if (fimage.set_geometry (str, true))
3463 changed++; 3531 changed = true;
3464 str = strchr (str, ';');
3465 } 3532 }
3533
3466 if (changed) 3534 if (changed)
3535 {
3536 if (bg_window_position_sensitive ())
3537 {
3538 int x, y;
3539 get_window_origin (x, y);
3540 parent_x = x;
3541 parent_y = y;
3542 }
3467 update_background (); 3543 update_background ();
3544 }
3468 } 3545 }
3469 break; 3546 break;
3470#endif 3547#endif
3471
3472 case Rxvt_restoreFG:
3473 set_window_color (Color_fg, str);
3474 break;
3475 case Rxvt_restoreBG:
3476 set_window_color (Color_bg, str);
3477 break;
3478 3548
3479 case XTerm_logfile: 3549 case XTerm_logfile:
3480 // TODO, when secure mode? 3550 // TODO, when secure mode?
3481 break; 3551 break;
3482 3552
… …
3549 break; 3619 break;
3550#endif 3620#endif
3551 3621
3552#if ENABLE_PERL 3622#if ENABLE_PERL
3553 case URxvt_perl: 3623 case URxvt_perl:
3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3624 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3555 ; // no responses yet
3556 break; 3625 break;
3557#endif 3626#endif
3558 } 3627 }
3559} 3628}
3560/*----------------------------------------------------------------------*/ 3629/*----------------------------------------------------------------------*/
… …
3567 * 's' = save 3636 * 's' = save
3568 * 'r' = restore 3637 * 'r' = restore
3569 * 't' = toggle 3638 * 't' = toggle
3570 * so no need for fancy checking 3639 * so no need for fancy checking
3571 */ 3640 */
3572int 3641int ecb_cold
3573rxvt_term::privcases (int mode, unsigned long bit) 3642rxvt_term::privcases (int mode, unsigned long bit)
3574{ 3643{
3575 int state; 3644 int state;
3576 3645
3577 if (mode == 's') 3646 if (mode == 's')
3578 { 3647 {
3579 SavedModes |= (priv_modes & bit); 3648 if (priv_modes & bit)
3649 SavedModes |= bit;
3650 else
3651 SavedModes &= ~bit;
3580 return -1; 3652 return -1;
3581 } 3653 }
3582 else 3654 else
3583 { 3655 {
3584 if (mode == 'r') 3656 if (mode == 'r')
3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3657 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586 else 3658 else
3587 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3659 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588 PrivMode (state, bit); 3660
3661 if (state)
3662 priv_modes |= bit;
3663 else
3664 priv_modes &= ~bit;
3589 } 3665 }
3590 3666
3591 return state; 3667 return state;
3592} 3668}
3593 3669
3594/* we're not using priv _yet_ */ 3670/* we're not using priv _yet_ */
3595void 3671void
3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3672rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3597{ 3673{
3598 unsigned int i, j; 3674 unsigned int i, j;
3599 int state; 3675 int state;
3600 3676
3601 static const struct 3677 static const struct
3602 { 3678 {
3603 const int argval; 3679 const int argval;
3604 const unsigned long bit; 3680 const unsigned long bit;
3605 } argtopriv[] = { 3681 } argtopriv[] = {
3606 { 1, PrivMode_aplCUR }, 3682 { 1, PrivMode_aplCUR }, // DECCKM
3607 { 2, PrivMode_vt52 }, 3683 { 2, PrivMode_vt52 }, // DECANM
3608 { 3, PrivMode_132 }, 3684 { 3, PrivMode_132 }, // DECCOLM
3609 { 4, PrivMode_smoothScroll }, 3685 { 4, PrivMode_smoothScroll }, // DECSCLM
3610 { 5, PrivMode_rVideo }, 3686 { 5, PrivMode_rVideo }, // DECSCNM
3611 { 6, PrivMode_relOrigin }, 3687 { 6, PrivMode_relOrigin }, // DECOM
3612 { 7, PrivMode_Autowrap }, 3688 { 7, PrivMode_Autowrap }, // DECAWM
3613 // 8, bi-directional support mode 3689 // 8, auto-repeat keys // DECARM
3614 { 9, PrivMode_MouseX10 }, 3690 { 9, PrivMode_MouseX10 },
3615 // 18, 19 printing-related
3616 { 25, PrivMode_VisibleCursor }, 3691 { 12, PrivMode_BlinkingCursor },
3692 // 18 end FF to printer after print screen
3693 // 19 Print screen prints full screen/scroll region
3694 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3696 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3697#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3698 { 35, PrivMode_ShiftKeys }, // rxvt extension
3699 // 38, tektronix mode // DECTEK
3621 { 40, PrivMode_132OK }, 3700 { 40, PrivMode_132OK },
3622 // 41 xterm more fixes NYI 3701 // 41 xterm more fixes NYI
3623 // 45 margin bell NYI 3702 // 45 margin bell NYI
3624 // 46 start logging 3703 // 46 start logging
3625 { 47, PrivMode_Screen }, 3704 { 47, PrivMode_Screen },
3626 { 66, PrivMode_aplKP }, 3705 { 66, PrivMode_aplKP }, // DECNKM
3627#ifndef NO_BACKSPACE_KEY 3706#ifndef NO_BACKSPACE_KEY
3628 { 67, PrivMode_BackSpace }, 3707 { 67, PrivMode_BackSpace }, // DECBKM
3629#endif 3708#endif
3630 { 1000, PrivMode_MouseX11 }, 3709 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3710 { 1002, PrivMode_MouseBtnEvent },
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3711 { 1003, PrivMode_MouseAnyEvent },
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3712#if ENABLE_FRILLS
3713 { 1005, PrivMode_ExtModeMouse },
3714#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3715 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3716 { 1011, PrivMode_Keypress }, // rxvt extension
3717#if ENABLE_FRILLS
3718 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3719#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3720 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3721 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3722 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3723 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3724 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3725 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3726 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3727 { 2004, PrivMode_BracketPaste },
3643 }; 3728 };
3644 3729
3645 if (nargs == 0) 3730 if (nargs == 0)
3646 return; 3731 return;
3647 3732
… …
3654 for (i = 0; i < nargs; i++) 3739 for (i = 0; i < nargs; i++)
3655 { 3740 {
3656 state = -1; 3741 state = -1;
3657 3742
3658 /* basic handling */ 3743 /* basic handling */
3659 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3744 for (j = 0; j < ecb_array_length (argtopriv); j++)
3660 if (argtopriv[j].argval == arg[i]) 3745 if (argtopriv[j].argval == arg[i])
3661 { 3746 {
3662 state = privcases (mode, argtopriv[j].bit); 3747 state = privcases (mode, argtopriv[j].bit);
3663 break; 3748 break;
3664 } 3749 }
… …
3672 3757
3673 scr_touch (true); 3758 scr_touch (true);
3674 break; 3759 break;
3675#endif 3760#endif
3676 case 1048: /* alternative cursor save */ 3761 case 1048: /* alternative cursor save */
3677 case 1049:
3678 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3679 if (mode == 0) 3763 if (mode == 0)
3680 scr_cursor (RESTORE); 3764 scr_cursor (RESTORE);
3681 else if (mode == 1) 3765 else if (mode == 1)
3682 scr_cursor (SAVE); 3766 scr_cursor (SAVE);
… …
3691 case 2: /* VT52 mode */ 3775 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3776 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3777 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3778 * within VT52 mode
3695 */ 3779 */
3696 PrivMode (1, PrivMode_vt52); 3780 priv_modes |= PrivMode_vt52;
3697 break; 3781 break;
3698 case 3: /* 80/132 */ 3782 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3783 if (priv_modes & PrivMode_132OK)
3700 set_widthheight (((state ? 132 : 80) * fwidth), height); 3784 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701 break; 3785 break;
3702 case 4: /* smooth scrolling */ 3786 case 4: /* smooth scrolling */
3703 set_option (Opt_jumpScroll, !state); 3787 set_option (Opt_jumpScroll, !state);
3704 break; 3788 break;
3705 case 5: /* reverse video */ 3789 case 5: /* reverse video */
… …
3712 scr_autowrap (state); 3796 scr_autowrap (state);
3713 break; 3797 break;
3714 /* case 8: - auto repeat, can't do on a per window basis */ 3798 /* case 8: - auto repeat, can't do on a per window basis */
3715 case 9: /* X10 mouse reporting */ 3799 case 9: /* X10 mouse reporting */
3716 if (state) /* orthogonal */ 3800 if (state) /* orthogonal */
3717 priv_modes &= ~PrivMode_MouseX11; 3801 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3802 break;
3719#ifdef scrollBar_esc 3803#ifdef scrollBar_esc
3720 case scrollBar_esc: 3804 case scrollBar_esc:
3721 if (scrollbar_mapping (state)) 3805 scrollBar.map (state);
3722 {
3723 resize_all_windows (0, 0, 0); 3806 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3807 scr_touch (true);
3725 } 3808 break;
3809#endif
3810#ifdef CURSOR_BLINK
3811 case 12:
3812 cursor_blink_reset ();
3726 break; 3813 break;
3727#endif 3814#endif
3728 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3729 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3730 break; 3817 break;
… …
3735 break; 3822 break;
3736 /* case 66: - application key pad */ 3823 /* case 66: - application key pad */
3737 /* case 67: - backspace key */ 3824 /* case 67: - backspace key */
3738 case 1000: /* X11 mouse reporting */ 3825 case 1000: /* X11 mouse reporting */
3739 if (state) /* orthogonal */ 3826 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX10; 3827 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3828 break;
3742#if 0
3743 case 1001: 3829 case 1002:
3744 break; /* X11 mouse highlighting */ 3830 case 1003:
3745#endif 3831 if (state)
3832 {
3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3836 vt_emask_mouse = PointerMotionMask;
3837 }
3838 else
3839 vt_emask_mouse = NoEventMask;
3840
3841 vt_select_input ();
3842 break;
3746 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3747 set_option (Opt_scrollTtyOutput, !state); 3844 set_option (Opt_scrollTtyOutput, !state);
3748 break; 3845 break;
3749 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3750 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3751 break; 3848 break;
3752 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3753 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3754 if (current_screen != PRIMARY) 3851 if (!state)
3755 scr_erase_screen (2); 3852 scr_erase_screen (2);
3853
3756 scr_change_screen (state); 3854 scr_change_screen (state);
3757 break; 3855 break;
3758 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3759 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3760 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3761 if (current_screen != PRIMARY) 3864 if (state)
3762 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3763 break; 3868 break;
3764 default: 3869 default:
3765 break; 3870 break;
3766 } 3871 }
3767 } 3872 }
3768} 3873}
3769/*}}} */ 3874/*}}} */
3770 3875
3771/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3772void 3877void ecb_hot
3773rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3774{ 3879{
3775 unsigned int i; 3880 unsigned int i;
3776 short rendset; 3881 short rendset;
3777 int rendstyle; 3882 int rendstyle;
… …
3819 //case 19: // ninth alt font 3924 //case 19: // ninth alt font
3820 //case 20: // gothic 3925 //case 20: // gothic
3821 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3822 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3823 break; 3928 break;
3824 case 22: // normal intensity 3929 case 22: // bold off (vt220)
3825 rendset = 0, rendstyle = RS_Bold; 3930 rendset = 0, rendstyle = RS_Bold;
3826 break; 3931 break;
3827 case 23: // disable italic 3932 case 23: // disable italic
3828 rendset = 0, rendstyle = RS_Italic; 3933 rendset = 0, rendstyle = RS_Italic;
3829 break; 3934 break;
3830 case 24: 3935 case 24: // underline off (vt220)
3831 rendset = 0, rendstyle = RS_Uline; 3936 rendset = 0, rendstyle = RS_Uline;
3832 break; 3937 break;
3833 case 25: 3938 case 25: // blink off (vt220)
3834 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3835 break; 3940 break;
3836 case 26: // variable spacing (iso 8613) 3941 case 26: // variable spacing (iso 8613)
3837 rendset = 0, rendstyle = RS_Blink; 3942 rendset = 0, rendstyle = RS_Blink;
3838 break; 3943 break;
3839 case 27: 3944 case 27: // reverse off (vt220)
3840 rendset = 0, rendstyle = RS_RVid; 3945 rendset = 0, rendstyle = RS_RVid;
3841 break; 3946 break;
3842 //case 28: // visible. NYI 3947 //case 28: // visible. NYI
3843 //case 29: // not crossed-out 3948 //case 29: // not crossed-out
3844 } 3949 }
… …
3918 break; 4023 break;
3919#endif 4024#endif
3920 } 4025 }
3921 } 4026 }
3922} 4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 6))
4033 return;
4034
4035 if (style == 0)
4036 style = 1;
4037
4038 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, cursor_type == 1);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4047}
3923/*}}} */ 4048/*}}} */
3924 4049
3925/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3926void
3927rxvt_term::process_graphics ()
3928{
3929 unicode_t ch, cmd = cmd_getc ();
3930
3931 if (cmd == 'Q')
3932 { /* query graphics */
3933 tt_printf ("\033G0\012"); /* no graphics */
3934 return;
3935 }
3936 /* swallow other graphics sequences until terminating ':' */
3937 do
3938 ch = cmd_getc ();
3939 while (ch != ':');
3940}
3941/*}}} */
3942
3943/* ------------------------------------------------------------------------- */ 4050/* ---------------------------------------------------------------------- */
4051/* Write data to the pty as typed by the user, pasted with the mouse,
4052 * or generated by us in response to a query ESC sequence.
4053 */
3944 4054
3945/* 4055/*
3946 * Send printf () formatted output to the command. 4056 * Send printf () formatted output to the command.
3947 * Only use for small amounts of data. 4057 * Only use for small amounts of data.
3948 */ 4058 */
… …
3956 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4066 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3957 va_end (arg_ptr); 4067 va_end (arg_ptr);
3958 tt_write (buf, strlen (buf)); 4068 tt_write (buf, strlen (buf));
3959} 4069}
3960 4070
3961/* ---------------------------------------------------------------------- */
3962/* Write data to the pty as typed by the user, pasted with the mouse, 4071/* Write data to the pty as typed by the user. */
3963 * or generated by us in response to a query ESC sequence. 4072void
3964 */ 4073rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3965const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4074{
4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4076 return;
4077
4078 if (option (Opt_scrollTtyKeypress))
4079 if (view_start)
4080 {
4081 view_start = 0;
4082 want_refresh = 1;
4083 }
4084
4085 tt_write_ (data, len);
4086}
3966 4087
3967void 4088void
3968rxvt_term::tt_write (const char *data, unsigned int len) 4089rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4090{
3970 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4091 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3971 return; 4092 return;
3972 4093
4094 tt_write_ (data, len);
4095}
4096
4097static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4098
4099void
4100rxvt_term::tt_write_ (const char *data, unsigned int len)
4101{
3973 if (pty->pty < 0) 4102 if (pty->pty < 0)
3974 return; 4103 return;
3975 4104
3976 if (v_buflen == 0) 4105 if (v_buflen == 0)
3977 { 4106 {
3978 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4107 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3979 4108
4109 max_it (written, 0);
4110
3980 if ((unsigned int)written == len) 4111 if (written == len)
3981 return; 4112 return;
3982 4113
3983 data += written; 4114 data += written;
3984 len -= written; 4115 len -= written;
3985 } 4116 }
3986 4117
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4118 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3988 4119
3989 memcpy (v_buffer + v_buflen, data, len); 4120 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len; 4121 v_buflen += len;
3991 4122
3992 pty_ev.set (EVENT_READ | EVENT_WRITE); 4123 pty_ev.set (ev::READ | ev::WRITE);
3993} 4124}
3994 4125
3995void rxvt_term::pty_write () 4126void rxvt_term::pty_write ()
3996{ 4127{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4128 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4003 if (v_buflen == 0) 4134 if (v_buflen == 0)
4004 { 4135 {
4005 free (v_buffer); 4136 free (v_buffer);
4006 v_buffer = 0; 4137 v_buffer = 0;
4007 4138
4008 pty_ev.set (EVENT_READ); 4139 pty_ev.set (ev::READ);
4009 return; 4140 return;
4010 } 4141 }
4011 4142
4012 memmove (v_buffer, v_buffer + written, v_buflen); 4143 memmove (v_buffer, v_buffer + written, v_buflen);
4013 } 4144 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4145 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ); 4146 pty_ev.set (ev::READ);
4016} 4147}
4017 4148
4018/*----------------------- end-of-file (C source) -----------------------*/ 4149/*----------------------- end-of-file (C source) -----------------------*/
4019 4150

Diff Legend

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