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.299 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.592 by root, Thu Jun 17 00:49:20 2021 UTC

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

Diff Legend

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