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

Diff Legend

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