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

Diff Legend

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