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.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

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

Diff Legend

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