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.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.552 by sf-exg, Fri Jul 25 17:03:38 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; 418 KeySym keysym = NoSymbol;
306 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym;
311 char kbuf[KBUFSZ]; 419 char rkbuf[KBUFSZ + 1];
420 char *kbuf = rkbuf + 1;
421
422#if ISO_14755
423 if (iso14755buf & ISO_14755_52)
424 return;
425#endif
312 426
313 /* 427 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 428 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 429 * escape sequence to toggle the Keypad.
316 * 430 *
… …
318 */ 432 */
319 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
320 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
321 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
322 436
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; 437 kbuf[0] = 0;
330 438
331#ifdef USE_XIM 439#if USE_XIM
332 if (Input_Context) 440 if (Input_Context)
333 { 441 {
334 Status status_return; 442 Status status_return;
335 443
336#if 0 444#if 0
… …
374 } 482 }
375 } 483 }
376 else 484 else
377 len = 0; 485 len = 0;
378 } 486 }
379
380 valid_keysym = status_return == XLookupKeySym
381 || status_return == XLookupBoth;
382 } 487 }
383 else 488 else
384#endif 489#endif
385 { 490 {
386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 491 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 492 }
493
494 if (keysym != NoSymbol)
388 } 495 {
496 KeySym orig_keysym = keysym;
389 497
390 if (valid_keysym) 498 /* Shift + F1 - F10 generates F11 - F20 */
499 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
500 {
501 keysym += (XK_F11 - XK_F1);
502 shft = 0; /* turn off Shift */
503 }
504
505 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
506 {
507 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
508 unsigned int newlen = 1;
509
510 if (ev.state & ModNumLockMask)
511 kp = false;
512
513 keysym = translate_keypad (keysym, kp);
514
515 switch (keysym)
516 {
517#ifndef NO_BACKSPACE_KEY
518 case XK_BackSpace:
519 if (priv_modes & PrivMode_HaveBackSpace)
520 {
521 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
522 ^ !!ctrl) ? '\b' : '\177';
523 kbuf[1] = '\0';
524 }
525 else
526 strcpy (kbuf, rs[Rs_backspace_key]);
527 break;
528#endif
529#ifndef NO_DELETE_KEY
530 case XK_Delete:
531 strcpy (kbuf, rs[Rs_delete_key]);
532 break;
533#endif
534 case XK_Tab:
535 if (shft)
536 strcpy (kbuf, "\033[Z");
537 else
538 {
539#ifdef CTRL_TAB_MAKES_META
540 if (ctrl)
541 meta = 1;
542#endif
543#ifdef MOD4_TAB_MAKES_META
544 if (ev.state & Mod4Mask)
545 meta = 1;
546#endif
547 newlen = 0;
548 }
549 break;
550
551 case XK_Up: /* "\033[A" */
552 case XK_Down: /* "\033[B" */
553 case XK_Right: /* "\033[C" */
554 case XK_Left: /* "\033[D" */
555 strcpy (kbuf, "\033[Z");
556 kbuf[2] = "DACB"[keysym - XK_Left];
557 /* do Shift first */
558 if (shft)
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 else if (ctrl)
561 {
562 kbuf[1] = 'O';
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 }
565 else if (priv_modes & PrivMode_aplCUR)
566 kbuf[1] = 'O';
567 break;
568
569 case XK_KP_Enter:
570 /* allow shift to override */
571 if (kp)
572 {
573 strcpy (kbuf, "\033OM");
574 break;
575 }
576
577 /* FALLTHROUGH */
578
579 case XK_Return:
580 if (priv_modes & PrivMode_LFNL)
581 {
582 kbuf[0] = '\015';
583 kbuf[1] = '\012';
584 kbuf[2] = '\0';
585 }
586 else
587 {
588 kbuf[0] = '\015';
589 kbuf[1] = '\0';
590 }
591 break;
592
593 case XK_KP_F1: /* "\033OP" */
594 case XK_KP_F2: /* "\033OQ" */
595 case XK_KP_F3: /* "\033OR" */
596 case XK_KP_F4: /* "\033OS" */
597 strcpy (kbuf, "\033OP");
598 kbuf[2] += (keysym - XK_KP_F1);
599 break;
600
601 case XK_KP_Multiply: /* "\033Oj" : "*" */
602 case XK_KP_Add: /* "\033Ok" : "+" */
603 case XK_KP_Separator: /* "\033Ol" : "," */
604 case XK_KP_Subtract: /* "\033Om" : "-" */
605 case XK_KP_Decimal: /* "\033On" : "." */
606 case XK_KP_Divide: /* "\033Oo" : "/" */
607 case XK_KP_0: /* "\033Op" : "0" */
608 case XK_KP_1: /* "\033Oq" : "1" */
609 case XK_KP_2: /* "\033Or" : "2" */
610 case XK_KP_3: /* "\033Os" : "3" */
611 case XK_KP_4: /* "\033Ot" : "4" */
612 case XK_KP_5: /* "\033Ou" : "5" */
613 case XK_KP_6: /* "\033Ov" : "6" */
614 case XK_KP_7: /* "\033Ow" : "7" */
615 case XK_KP_8: /* "\033Ox" : "8" */
616 case XK_KP_9: /* "\033Oy" : "9" */
617 /* allow shift to override */
618 if (kp)
619 {
620 strcpy (kbuf, "\033Oj");
621 kbuf[2] += (keysym - XK_KP_Multiply);
622 }
623 else
624 {
625 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
626 kbuf[1] = '\0';
627 }
628 break;
629
630 default:
631 {
632 int param = map_function_key (keysym);
633 if (param > 0)
634 sprintf (kbuf,"\033[%d~", param);
635 else
636 newlen = 0;
637 }
638 break;
639 }
640
641 if (newlen)
642 len = strlen (kbuf);
643
644 if (len > 0)
645 {
646 /*
647 * pass Shift/Control indicators for function keys ending with `~'
648 *
649 * eg,
650 * Prior = "ESC[5~"
651 * Shift+Prior = "ESC[5$"
652 * Ctrl+Prior = "ESC[5^"
653 * Ctrl+Shift+Prior = "ESC[5@"
654 */
655 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
656 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
657
658 /*
659 * Pass meta for all function keys, if 'meta' option set
660 */
661#ifdef META8_OPTION
662 if (meta && (meta_char == 0x80))
663 kbuf[len - 1] |= 0x80;
664#endif
665 }
666
667 }
668 else if (ctrl && keysym == XK_minus)
669 {
670 len = 1;
671 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
672 }
673 else if (keysym == XK_ISO_Left_Tab)
674 {
675 strcpy (kbuf, "\033[Z");
676 len = 3;
677 }
678 else
679 {
680#ifdef META8_OPTION
681 /* set 8-bit on */
682 if (meta && (meta_char == 0x80))
683 {
684 char *ch;
685
686 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80;
688
689 meta = 0;
690 }
691#endif
692 /* nil */ ;
693 }
694
695 keysym = orig_keysym;
696 }
697
698 /* escape prefix */
699 if (len && meta
700#ifdef META8_OPTION
701 && meta_char == C0_ESC
702#endif
703 )
704 {
705 *--kbuf = C0_ESC;
706 len++;
707 }
708
709 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
710 return;
711
712 if (keysym != NoSymbol)
391 { 713 {
392#ifdef KEYSYM_RESOURCE 714#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state)) 715 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
394 return; 716 return;
395#endif 717#endif
396 718
397 if (saveLines) 719 if (saveLines)
398 { 720 {
… …
407#ifdef PAGING_CONTEXT_LINES 729#ifdef PAGING_CONTEXT_LINES
408 lnsppg = nrow - PAGING_CONTEXT_LINES; 730 lnsppg = nrow - PAGING_CONTEXT_LINES;
409#else 731#else
410 lnsppg = nrow * 4 / 5; 732 lnsppg = nrow * 4 / 5;
411#endif 733#endif
734 max_it (lnsppg, 1);
735
412 if (keysym == XK_Prior) 736 if (keysym == XK_Prior)
413 { 737 {
414 scr_page (UP, lnsppg); 738 scr_page (lnsppg);
415 return; 739 return;
416 } 740 }
417 else if (keysym == XK_Next) 741 else if (keysym == XK_Next)
418 { 742 {
419 scr_page (DN, lnsppg); 743 scr_page (-lnsppg);
420 return; 744 return;
421 } 745 }
422 } 746 }
423#ifdef SCROLL_ON_UPDOWN_KEYS 747#ifdef SCROLL_ON_UPDOWN_KEYS
424 if (IS_SCROLL_MOD) 748 if (IS_SCROLL_MOD)
425 { 749 {
426 if (keysym == XK_Up) 750 if (keysym == XK_Up)
427 { 751 {
428 scr_page (UP, 1); 752 scr_page (1);
429 return; 753 return;
430 } 754 }
431 else if (keysym == XK_Down) 755 else if (keysym == XK_Down)
432 { 756 {
433 scr_page (DN, 1); 757 scr_page (-1);
434 return; 758 return;
435 } 759 }
436 } 760 }
437#endif 761#endif
438#ifdef SCROLL_ON_HOMEEND_KEYS 762#ifdef SCROLL_ON_HOMEEND_KEYS
439 if (IS_SCROLL_MOD) 763 if (IS_SCROLL_MOD)
440 { 764 {
441 if (keysym == XK_Home) 765 if (keysym == XK_Home)
442 { 766 {
443 scr_move_to (0, 1); 767 scr_changeview (top_row);
444 return; 768 return;
445 } 769 }
446 else if (keysym == XK_End) 770 else if (keysym == XK_End)
447 { 771 {
448 scr_move_to (1, 1); 772 scr_changeview (0);
449 return; 773 return;
450 } 774 }
451 } 775 }
452#endif 776#endif
453 } 777 }
454 778
455 if (shft) 779 if (shft)
456 { 780 {
457 /* Shift + F1 - F10 generates F11 - F20 */
458 if (keysym >= XK_F1 && keysym <= XK_F10)
459 {
460 keysym += (XK_F11 - XK_F1);
461 shft = 0; /* turn off Shift */
462 }
463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 781 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
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
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1388 return;
… …
1318 unsigned int unused_mask; 1393 unsigned int unused_mask;
1319 1394
1320 switch (ev.type) 1395 switch (ev.type)
1321 { 1396 {
1322 case KeyPress: 1397 case KeyPress:
1323#if ISO_14755 1398 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1399 break;
1329 1400
1330 case KeyRelease: 1401 case KeyRelease:
1331 { 1402 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1403 break;
1403 }
1404 1404
1405 case ButtonPress: 1405 case ButtonPress:
1406 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1407 break; 1407 break;
1408 1408
… …
1410 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1411 break; 1411 break;
1412 1412
1413 case ClientMessage: 1413 case ClientMessage:
1414 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1415 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 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 {
1417 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)))
1418 destroy (); 1424 destroy ();
1425 }
1419#if ENABLE_EWMH 1426#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &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 }
1424#endif 1442#endif
1425 } 1443 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1444 break;
1466 1445
1467 /* 1446 /*
1468 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1488 break; 1467 break;
1489 } 1468 }
1490 break; 1469 break;
1491 1470
1492 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1475 focus_in ();
1494 break; 1476 break;
1495 1477
1496 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1482 focus_out ();
1498 break; 1483 break;
1499 1484
1500 case ConfigureNotify: 1485 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1502 { 1487 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 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 }
1505 1523
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1525 {
1508 seen_resize = 1; 1526 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1528 }
1511 1529 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1530 {
1513 if (OPTION (Opt_transparent)) 1531#ifdef HAVE_BG_PIXMAP
1514 check_our_parents (); 1532 if (moved)
1533 update_background ();
1515#endif 1534#endif
1535 }
1536
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1538 }
1517 break; 1539 break;
1518 1540
1519 case PropertyNotify: 1541 case PropertyNotify:
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523
1524 break; 1543 break;
1525 1544
1526 case SelectionClear: 1545 case SelectionClear:
1527 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1528 break;
1529
1530 case SelectionNotify:
1531 if (selection_wait == Sel_normal)
1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1533 break; 1547 break;
1534 1548
1535 case SelectionRequest: 1549 case SelectionRequest:
1536 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1537 break; 1551 break;
1538 1552
1539 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
1540 mapped = 1; 1565 mapped = 1;
1541#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1567 text_blink_ev.start ();
1543#endif 1568#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1570 break;
1546 1571
1547 case UnmapNotify: 1572 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1574#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1575 text_blink_ev.stop ();
1551#endif 1576#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1577 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1578 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1579
1561 case GraphicsExpose: 1580 case GraphicsExpose:
1562 case Expose: 1581 case Expose:
1563 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1564 { 1583 {
1565 do 1584 do
1585 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1590
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1592
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1594 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1597 }
1575 1598
1576 want_refresh = 1; 1599 want_refresh = 1;
1577 } 1600 }
1578 else 1601 else
1579 { 1602 {
1580 XEvent unused_event; 1603 XEvent unused_event;
1581 1604
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1605 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1606 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1608 ;
1586 1609
1587 if (isScrollbarWindow (ev.xany.window)) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1588 { 1611 {
1589 scrollBar.setIdle (); 1612 scrollBar.state = SB_STATE_IDLE;
1590 scrollbar_show (0); 1613 scrollBar.show (0);
1591 } 1614 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1615 }
1602 break; 1616 break;
1603 1617
1604 case MotionNotify: 1618 case MotionNotify:
1605#ifdef POINTER_BLANK 1619#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1620 if (hidden_pointer)
1607 pointer_unblank (); 1621 pointer_unblank ();
1608#endif 1622#endif
1609#if MENUBAR 1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1610 if (isMenuBarWindow (ev.xany.window)) 1624 || priv_modes & PrivMode_MouseAnyEvent)
1611 {
1612 menubar_control (ev.xbutton); 1625 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1627 break;
1618 1628
1619 if (ev.xany.window == vt) 1629 if (ev.xany.window == vt)
1620 { 1630 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1631 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1632 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1633 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1634 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1635 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1636 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1637 ;
1628 1638
1629 XQueryPointer (disp, vt, 1639 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1642 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1643 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
… …
1649 1659
1650#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1651 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1652 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1653 { 1663 {
1664 page_dirn scroll_selection_dir;
1654 int dist; 1665 int dist;
1655 1666
1656 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1657 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1658 */ 1669 */
1659 if (!sel_scroll_ev.active) 1670 if (!sel_scroll_ev.is_active ())
1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1671 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1661 1672
1662 /* save the event params so we can highlight 1673 /* save the event params so we can highlight
1663 * the selection in the pending-scroll loop 1674 * the selection in the pending-scroll loop
1664 */ 1675 */
1665 selection_save_x = ev.xbutton.x; 1676 selection_save_x = ev.xbutton.x;
… …
1673 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1674 } 1685 }
1675 else 1686 else
1676 { 1687 {
1677 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1678 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1679 } 1690 }
1680 1691
1681 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1682 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1; 1694 + 1;
1684 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1685 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1686 } 1698 }
1687 else 1699 else
1688 { 1700 {
1689 /* we are within the text window, so we 1701 /* we are within the text window, so we
1690 * shouldn't be scrolling 1702 * shouldn't be scrolling
1691 */ 1703 */
1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop(); 1704 sel_scroll_ev.stop();
1694 } 1705 }
1695#endif 1706#endif
1696#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1697 } 1708 }
1698#endif 1709#endif
1699 } 1710 }
1700 } 1711 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1702 { 1713 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1705 ; 1716 ;
1706 1717
1707 XQueryPointer (disp, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1722 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1724 scrollBar.size ());
1714 want_refresh = 1; 1725 want_refresh = 1;
1715 refresh_limit = 0;
1716 scrollbar_show (1); 1726 scrollBar.show (1);
1717 } 1727 }
1718 break; 1728 break;
1719 } 1729 }
1720 1730
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1725 { 1733 cursor_blink_reset ();
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif 1734#endif
1735 1735
1736#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1738 {
1739 if (ev.type == MotionNotify 1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1742 if (hidden_pointer)
… …
1744 1744
1745 if (ev.type == KeyPress && hidden_pointer == 0) 1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank (); 1746 pointer_blank ();
1747 } 1747 }
1748#endif 1748#endif
1749}
1750 1749
1751void 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
1752rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1753{ 1772{
1754 if (!focus) 1773 if (!focus)
1755 { 1774 {
1756 focus = 1; 1775 focus = 1;
1757 want_refresh = 1; 1776 want_refresh = 1;
1758 1777
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM 1778#if USE_XIM
1762 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1763 { 1780 {
1764 IMSetStatusPosition (); 1781 im_set_position ();
1765 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1766 } 1783 }
1767#endif 1784#endif
1768#if CURSOR_BLINK 1785#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1787 cursor_blink_ev.again ();
1771#endif 1788#endif
1772#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1774 { 1791 {
1775 pix_colors = pix_colors_focused; 1792 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1793 scr_recolour ();
1777 } 1794 }
1778#endif 1795#endif
1779 } 1796#if ENABLE_FRILLS
1780} 1797 if (option (Opt_urgentOnBell))
1798 set_urgency (0);
1799#endif
1781 1800
1782void 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 }
1803}
1804
1805void ecb_cold
1783rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1784{ 1807{
1785 if (focus) 1808 if (focus)
1786 { 1809 {
1787 focus = 0; 1810 focus = 0;
1788 want_refresh = 1; 1811 want_refresh = 1;
1789 1812
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1813#if ENABLE_FRILLS
1791 1814 if (option (Opt_urgentOnBell))
1815 set_urgency (0);
1816#endif
1792#if ENABLE_FRILLS || ISO_14755 1817#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1818 if (iso14755buf)
1794 { 1819 {
1795 iso14755buf = 0; 1820 iso14755buf = 0;
1796# if ENABLE_OVERLAY 1821# if ISO_14755
1797 scr_overlay_off (); 1822 scr_overlay_off ();
1798# endif 1823# endif
1799 } 1824 }
1800#endif 1825#endif
1801#if USE_XIM 1826#if USE_XIM
1802 if (Input_Context != NULL) 1827 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1828 XUnsetICFocus (Input_Context);
1804#endif 1829#endif
1805#if CURSOR_BLINK 1830#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1831 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1832 cursor_blink_ev.stop ();
1833
1808 hidden_cursor = 0; 1834 hidden_cursor = 0;
1809#endif 1835#endif
1810#if OFF_FOCUS_FADING 1836#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1837 if (rs[Rs_fade])
1812 { 1838 {
1813 pix_colors = pix_colors_unfocused; 1839 pix_colors = pix_colors_unfocused;
1814 scr_recolour (); 1840 scr_recolour ();
1815 } 1841 }
1816#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])
1817 } 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
1818} 1859}
1819 1860
1820#if TRANSPARENT 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1821void 1862void ecb_hot
1822rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1864{
1824 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;
1825 1870
1826 switch (ev.type) 1871 switch (ev.type)
1827 { 1872 {
1828 case PropertyNotify: 1873 case PropertyNotify:
1829 /* 1874 /*
1830 * 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,
1831 * 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.
1832 */ 1877 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 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 }
1836 1890
1837 /* FALLTHROUGH */
1838 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1891 break;
1842 } 1892 }
1893
1894 refresh_check ();
1843} 1895}
1844#endif 1896#endif
1845 1897
1846void 1898void
1847rxvt_term::button_press (XButtonEvent &ev) 1899rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1908 /*
1857 * VT window processing of button press 1909 * VT window processing of button press
1858 */ 1910 */
1859 if (ev.window == vt) 1911 if (ev.window == vt)
1860 { 1912 {
1913 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 return;
1915
1861#if ISO_14755 1916#if ISO_14755
1862 // 5.4 1917 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1918 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1919 {
1865 iso14755_54 (ev.x, ev.y); 1920 iso14755_54 (ev.x, ev.y);
… …
1875 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1876 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1877#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1878 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1879 { 1934 {
1880 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1881 MEvent.clicks++; 1936 MEvent.clicks++;
1882 1937
1883 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1884 { 1939 {
1885 /* only report double clicks */ 1940 /* only report double clicks */
… …
1899 mouse_report (ev); 1954 mouse_report (ev);
1900 } 1955 }
1901#else 1956#else
1902 MEvent.button = ev.button; 1957 MEvent.button = ev.button;
1903 mouse_report (ev); 1958 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1959#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1960
1906 } 1961 }
1907 else 1962 else
1908 { 1963 {
1909 if (ev.button != MEvent.button) 1964 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1965 MEvent.clicks = 0;
1911 1966
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1967 switch (ev.button)
1914 { 1968 {
1915 case Button1: 1969 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1970 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1971 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1972#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1973 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1974#else
1921 selection.rect = false; 1975 selection.rect = false;
1922#endif 1976#endif
1923 1977
1924 /* allow shift+left click to extend selection */ 1978 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1979 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1980 {
1927 if (MEvent.button == Button1 && clickintime) 1981 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1982 selection_rotate (ev.x, ev.y);
1929 else 1983 else
1930 selection_extend (ev.x, ev.y, 1); 1984 selection_extend (ev.x, ev.y, 1);
1931 } 1985 }
1932 else 1986 else
1933 { 1987 {
1934 if (MEvent.button == Button1 && clickintime) 1988 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1989 MEvent.clicks++;
1936 else 1990 else
1937 MEvent.clicks = 1; 1991 MEvent.clicks = 1;
1938 1992
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1993 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1994 }
1941 1995
1942 MEvent.button = Button1; 1996 MEvent.button = Button1;
1943 break; 1997 break;
1944 1998
1945 case Button3: 1999 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 2000 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 2001 selection_rotate (ev.x, ev.y);
1948 else 2002 else
1949 selection_extend (ev.x, ev.y, 1); 2003 selection_extend (ev.x, ev.y, 1);
1950 2004
1951 MEvent.button = Button3; 2005 MEvent.button = Button3;
1952 break; 2006 break;
1953 } 2007 }
1954 } 2008 }
1955 2009
1956 MEvent.time = ev.time; 2010 MEvent.time = ev.time;
1957 return; 2011 return;
1958 } 2012 }
1959 2013
1960 /* 2014 /*
1961 * Scrollbar window processing of button press 2015 * Scrollbar window processing of button press
1962 */ 2016 */
1963 if (isScrollbarWindow (ev.window)) 2017 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 2018 {
1965 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;
1966 /* 2027 /*
1967 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 2029 * move up if mouse is above slider
1969 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1970 * 2031 *
… …
1979 /* 2040 /*
1980 * Mouse report disabled scrollbar: 2041 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 2042 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 2043 * click on scrollbar - send pageup/down
1983 */ 2044 */
1984 if ((scrollBar.style == R_SB_NEXT 2045 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 2046 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 2047 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 2048 tt_printf ("\033[B");
1994 else 2049 else
1995 switch (ev.button) 2050 switch (ev.button)
1996 { 2051 {
1997 case Button2: 2052 case Button2:
… …
2004 tt_printf ("\033[5~"); 2059 tt_printf ("\033[5~");
2005 break; 2060 break;
2006 } 2061 }
2007 } 2062 }
2008 else 2063 else
2009#endif /* NO_SCROLLBAR_REPORT */ 2064#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 2065 {
2016 if (scrollbarnext_upButton (ev.y)) 2066 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 2067 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2071#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2072 if (scr_page (direction, 1))
2034 { 2073 {
2035 if (upordown < 0) 2074 if (direction == UP)
2036 scrollBar.setUp (); 2075 scrollBar.state = SB_STATE_UP;
2037 else 2076 else
2038 scrollBar.setDn (); 2077 scrollBar.state = SB_STATE_DOWN;
2039 } 2078 }
2040 } 2079 }
2041 else 2080 else
2042 switch (ev.button) 2081 switch (ev.button)
2043 { 2082 {
2044 case Button2: 2083 case Button2:
2045 switch (scrollbar_align) 2084 switch (scrollBar.align)
2046 { 2085 {
2047 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2048 csrO = 0; 2087 csrO = 0;
2049 break; 2088 break;
2050 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2091 break;
2053 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2094 break;
2056 } 2095 }
2057 2096
2058 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2101
2063 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2064 break; 2103 break;
2065 2104
2066 case Button1: 2105 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2070 2109
2071 case Button3: 2110 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2112 {
2074 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2077# else 2116# else
2078 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2079# endif 2118# endif
2080 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2083# else 2122# else
2084 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2085# endif 2124# endif
2086 else 2125 else
2087 scrollBar.setMotion (); 2126 scrollBar.state = SB_STATE_MOTION;
2088 } 2127 }
2089 else 2128 else
2090 { 2129 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2131 (nrow
2093 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2094 / scrollbar_size ())); 2133 / scrollBar.size ()));
2095 } 2134 }
2096 2135
2097 break; 2136 break;
2098 } 2137 }
2099 } 2138 }
2100 2139
2101 return; 2140 return;
2102 } 2141 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2142}
2112 2143
2113void 2144void
2114rxvt_term::button_release (XButtonEvent &ev) 2145rxvt_term::button_release (XButtonEvent &ev)
2115{ 2146{
… …
2117 2148
2118 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2150 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2152
2122 if (scrollbar_isUpDn ()) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2123 { 2154 {
2124 scrollBar.setIdle (); 2155 scrollBar.state = SB_STATE_IDLE;
2125 scrollbar_show (0); 2156 scrollBar.show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2157 }
2130 2158
2131#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
2134#endif 2161#endif
2135 2162
2136 if (ev.window == vt) 2163 if (ev.window == vt)
2137 { 2164 {
2165 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2166 return;
2167
2138#if ISO_14755 2168#if ISO_14755
2139 // 5.4 2169 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2170 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2171 return;
2142#endif 2172#endif
2173
2143 if (reportmode) 2174 if (reportmode)
2144 { 2175 {
2145 /* mouse report from vt window */ 2176 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2177 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2178 if (ev.button >= 4)
… …
2158 mouse_report (ev); 2189 mouse_report (ev);
2159 } 2190 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2191#else /* MOUSE_REPORT_DOUBLECLICK */
2161 MEvent.button = AnyButton; 2192 MEvent.button = AnyButton;
2162 mouse_report (ev); 2193 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2194#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2195 return;
2165 } 2196 }
2166 2197
2167 /* 2198 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2199 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2202 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2203 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2204 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2205 selection_extend (ev.x, ev.y, 0);
2175 2206
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2207 switch (ev.button)
2180 { 2208 {
2181 case Button1: 2209 case Button1:
2182 case Button3: 2210 case Button3:
2183 selection_make (ev.time); 2211 selection_make (ev.time);
2184 break; 2212 break;
2213
2185 case Button2: 2214 case Button2:
2186 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);
2187 break; 2217 break;
2218
2188#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2189 case Button4: 2220 case Button4:
2190 case Button5: 2221 case Button5:
2191 { 2222 {
2192 int i; 2223 int lines;
2193 page_dirn v; 2224 page_dirn dirn;
2194 2225
2195 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2196 2227
2197 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2198 i = 1; 2229 lines = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2231 lines = nrow - 1;
2201 else 2232 else
2202 i = 5; 2233 lines = 5;
2203 2234
2204# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2205 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2206 { 2237 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2240
2211 if (slip_wheel_ev.at < NOW) 2241 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2243 }
2216 else 2244 else
2245# endif
2217 { 2246 {
2218# endif
2219 scr_page (v, i); 2247 scr_page (dirn, lines);
2220 scrollbar_show (1); 2248 scrollBar.show (1);
2221# ifdef MOUSE_SLIP_WHEELING
2222 } 2249 }
2223# endif
2224 } 2250 }
2225 break; 2251 break;
2226#endif 2252#endif
2227 } 2253 }
2228 } 2254 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2255}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2256
2716/*}}} */ 2257/*}}} */
2717 2258
2718bool 2259void ecb_hot
2719rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2720{ 2261{
2721 bool flag = false;
2722 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2724 2264
2725 for (;;) 2265 for (;;)
2726 { 2266 {
2727 if (ch == NOCHAR) 2267 if (ecb_unlikely (ch == NOCHAR))
2728 { 2268 {
2729 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2730 ch = next_char (); 2270 ch = next_char ();
2731 2271
2732 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2733 break; 2273 break;
2734 } 2274 }
2735 2275
2736 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))
2737 { 2277 {
2738 if (!seen_input) 2278 if (ecb_unlikely (!seen_input))
2739 { 2279 {
2740 seen_input = 1; 2280 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2756 wchar_t *str = buf; 2296 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2298
2759 for (;;) 2299 for (;;)
2760 { 2300 {
2761 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)))
2762 break; 2302 break;
2763 2303
2764 *str++ = ch; 2304 *str++ = ch;
2765 2305
2766 if (ch == C0_LF || str >= eol) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2767 { 2307 {
2768 if (ch == C0_LF) 2308 if (ch == C0_LF)
2769 nlines++; 2309 nlines++;
2770 2310
2771 refresh_count++; 2311 refresh_count++;
2772 2312
2773 if (!OPTION (Opt_jumpScroll) 2313 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2314 {
2776 refreshnow = true;
2777 refresh_count = 0; 2315 refresh_count = 0;
2316
2317 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2318 {
2319 refreshnow = true;
2778 ch = NOCHAR; 2320 ch = NOCHAR;
2779 break; 2321 break;
2322 }
2780 } 2323 }
2781 2324
2782 // scr_add_lines only works for nlines <= nrow - 1. 2325 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2326 if (nlines >= nrow - 1)
2784 { 2327 {
2328 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 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))))
2786 scr_add_lines (buf, str - buf, nlines); 2330 scr_add_lines (buf, str - buf, nlines);
2787 2331
2788 nlines = 0; 2332 nlines = 0;
2789 str = buf; 2333 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2334 eol = str + min (ncol, UBUFSIZ);
… …
2805 2349
2806 seq_begin = cmdbuf_ptr; 2350 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2351 ch = next_char ();
2808 } 2352 }
2809 2353
2354 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 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))))
2811 scr_add_lines (buf, str - buf, nlines); 2356 scr_add_lines (buf, str - buf, nlines);
2812 2357
2813 /* 2358 /*
2814 * 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
2815 * 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.
2816 * the number of pages between refreshes is refresh_limit, which 2361 * if skipScroll is enabled.
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2362 */
2819 if (refreshnow) 2363 if (refreshnow)
2820 { 2364 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true;
2826 scr_refresh (refresh_type); 2365 scr_refresh ();
2827 want_refresh = 1; 2366 want_refresh = 1;
2828 }
2829 } 2367 }
2830
2831 } 2368 }
2832 else 2369 else
2833 { 2370 {
2834 try 2371 try
2835 { 2372 {
… …
2843 } 2380 }
2844 2381
2845 ch = NOCHAR; 2382 ch = NOCHAR;
2846 } 2383 }
2847 } 2384 }
2848
2849 return flag;
2850} 2385}
2851 2386
2852// read the next character 2387// read the next character
2853wchar_t 2388wchar_t ecb_hot
2854rxvt_term::next_char () 2389rxvt_term::next_char () NOTHROW
2855{ 2390{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2392 {
2858 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2860 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2861 2396
2862 wchar_t wc; 2397 wchar_t wc;
2863 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);
2864 2399
… …
2868 cmdbuf_ptr = cmdbuf_endp; 2403 cmdbuf_ptr = cmdbuf_endp;
2869 break; 2404 break;
2870 } 2405 }
2871 2406
2872 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.
2873 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 }
2874 2414
2875 // assume wchar == unicode 2415 // assume wchar == unicode
2876 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
2877 return wc & UNICODE_MASK; 2417 return wc & UNICODE_MASK;
2878 } 2418 }
2879 2419
2880 return NOCHAR; 2420 return NOCHAR;
2881} 2421}
2882 2422
2883// read the next octet 2423// read the next octet
2884uint32_t 2424uint32_t ecb_hot
2885rxvt_term::next_octet () 2425rxvt_term::next_octet () NOTHROW
2886{ 2426{
2887 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2429 : NOCHAR;
2890} 2430}
2891 2431
2892/* rxvt_cmd_getc () - Return next input character */ 2432static class out_of_input out_of_input;
2893/* 2433
2894 * Return the next input character after first passing any keyboard input 2434wchar_t ecb_hot
2895 * to the command. 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2896 */
2897wchar_t
2898rxvt_term::cmd_getc ()
2899{ 2436{
2900 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2901 2438
2902 if (c == NOCHAR) 2439 if (c == NOCHAR)
2903 throw out_of_input; 2440 throw out_of_input;
2904 2441
2905 return c; 2442 return c;
2906} 2443}
2907 2444
2908uint32_t 2445uint32_t ecb_hot
2909rxvt_term::cmd_get8 () 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2447{
2911 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2912 2449
2913 if (c == NOCHAR) 2450 if (c == NOCHAR)
2914 throw out_of_input; 2451 throw out_of_input;
… …
2917} 2454}
2918 2455
2919/*{{{ print pipe */ 2456/*{{{ print pipe */
2920/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2921#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2922FILE * 2459FILE * ecb_cold
2923rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2924{ 2461{
2925 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2926 2463
2927 if (stream == NULL) 2464 if (stream == NULL)
2928 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2929 2466
2930 return stream; 2467 return stream;
2931} 2468}
2932 2469
2933int 2470int ecb_cold
2934rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2935{ 2472{
2936 fflush (stream); 2473 fflush (stream);
2937 return pclose (stream); 2474 return pclose (stream);
2938} 2475}
2939 2476
2940/* 2477/*
2941 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2942 */ 2479 */
2943void 2480void ecb_cold
2944rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2945{ 2482{
2946 int done; 2483 FILE *fd = popen_printer ();
2947 FILE *fd;
2948 2484
2949 if ((fd = popen_printer ()) == NULL) 2485 if (!fd)
2950 return; 2486 return;
2951 2487
2952 /* 2488 /*
2953 * 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
2954 * is received. 2490 * is received.
2955 */ 2491 */
2956 for (done = 0; !done;) 2492 for (int done = 0; !done; )
2957 { 2493 {
2958 unsigned char buf[8]; 2494 unsigned char buf[8];
2959 unicode_t ch; 2495 unicode_t ch;
2960 unsigned int i, len; 2496 unsigned int i, len;
2961 2497
… …
2980 { 2516 {
2981 if ((buf[len++] = cmd_getc ()) == 'i') 2517 if ((buf[len++] = cmd_getc ()) == 'i')
2982 break; /* done = 1 */ 2518 break; /* done = 1 */
2983 } 2519 }
2984 } 2520 }
2985 2521
2986 for (i = 0; i < len; i++) 2522 for (i = 0; i < len; i++)
2987 if (putc (buf[i], fd) == EOF) 2523 if (putc (buf[i], fd) == EOF)
2988 { 2524 {
2989 done = 1; 2525 done = 1;
2990 break; 2526 break;
… …
2992 } 2528 }
2993 } 2529 }
2994 2530
2995 pclose_printer (fd); 2531 pclose_printer (fd);
2996} 2532}
2997#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2998/*}}} */ 2534/*}}} */
2999 2535
3000/* *INDENT-OFF* */
3001enum { 2536enum {
3002 C1_40 = 0x40, 2537 C1_40 = 0x40,
3003 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,
3004 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,
3005 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,
3006 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,
3007}; 2542};
3008/* *INDENT-ON* */
3009 2543
3010/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
3011void 2545void ecb_hot
3012rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
3013{ 2547{
3014 switch (ch) 2548 switch (ch)
3015 { 2549 {
3016 case C0_ESC: 2550 case C0_ESC:
… …
3052 process_dcs_seq (); 2586 process_dcs_seq ();
3053 break; 2587 break;
3054 case 0x9b: /* CSI */ 2588 case 0x9b: /* CSI */
3055 process_csi_seq (); 2589 process_csi_seq ();
3056 break; 2590 break;
3057 case 0x9d: /* CSI */ 2591 case 0x9d: /* OSC */
3058 process_osc_seq (); 2592 process_osc_seq ();
3059 break; 2593 break;
3060#endif 2594#endif
3061 } 2595 }
3062} 2596}
3063/*}}} */ 2597/*}}} */
3064 2598
3065 2599
3066/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
3067void 2601void ecb_cold
3068rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
3069{ 2603{
3070 int row, col; 2604 int row, col;
3071 2605
3072 switch (ch) 2606 switch (ch)
… …
3106 break; 2640 break;
3107 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
3108 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3109 break; 2643 break;
3110 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
3111 PrivMode (0, PrivMode_vt52); 2645 priv_modes &= ~PrivMode_vt52;
3112 break; 2646 break;
3113 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
3114 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
3115 /* unimplemented */ 2649 /* unimplemented */
3116 break; 2650 break;
… …
3122} 2656}
3123/*}}} */ 2657/*}}} */
3124 2658
3125 2659
3126/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
3127void 2661void ecb_hot
3128rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
3129{ 2663{
3130 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
3131 2665
3132 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
3135 return; 2669 return;
3136 } 2670 }
3137 2671
3138 switch (ch) 2672 switch (ch)
3139 { 2673 {
3140 /* case 1: do_tek_mode (); break; */
3141 case '#': 2674 case '#':
3142 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
3143 scr_E (); 2676 scr_E ();
3144 break; 2677 break;
3145 case '(': 2678 case '(':
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 2685 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 2686 break;
3154 case '+': 2687 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 2688 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 2689 break;
3157#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3158 case '6': 2691 case '6':
3159 scr_backindex (); 2692 scr_backindex ();
3160 break; 2693 break;
3161#endif 2694#endif
3162 case '7': 2695 case '7':
3163 scr_cursor (SAVE); 2696 scr_cursor (SAVE);
3164 break; 2697 break;
3165 case '8': 2698 case '8':
3166 scr_cursor (RESTORE); 2699 scr_cursor (RESTORE);
3167 break; 2700 break;
3168#if ENABLE_FRILLS 2701#if !ENABLE_MINIMAL
3169 case '9': 2702 case '9':
3170 scr_forwardindex (); 2703 scr_forwardindex ();
3171 break; 2704 break;
3172#endif 2705#endif
2706 // DECPAM/DECPNM
3173 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
3174 case '>': 2710 case '>':
3175 PrivMode ((ch == '='), PrivMode_aplKP); 2711 priv_modes &= ~PrivMode_aplKP;
3176 break; 2712 break;
3177 2713
3178 case C1_40: 2714 case C1_40:
3179 cmd_getc (); 2715 cmd_getc ();
3180 break; 2716 break;
… …
3184 2720
3185 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
3187 { 2723 {
3188 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3190 } 2726 }
3191 break; 2727 break;
3192 2728
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
3195 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 */
3196 break; 2734 break;
3197 2735
3198 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
3199 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
3200 scr_set_tab (1); 2738 scr_set_tab (1);
… …
3204 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
3205 scr_index (DN); 2743 scr_index (DN);
3206 break; 2744 break;
3207 2745
3208 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
3209 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
3210 2748
3211 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
3212 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
3213 2751
3214 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
3215 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
3216 process_dcs_seq (); 2754 process_dcs_seq ();
3217 break; 2755 break;
… …
3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3220 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3222 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
3223 2761
3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3225 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
3226 process_csi_seq (); 2764 process_csi_seq ();
3227 break; 2765 break;
3228 2766
3229 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3230 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
3231 process_osc_seq (); 2769 process_osc_seq ();
3232 break; 2770 break;
3233 2771
3234 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3235 case 'c': 2773 case 'c':
3236 mbstate.reset (); 2774 mbstate.reset ();
3237 scr_poweron (); 2775 scr_poweron ();
3238 scrollbar_show (1); 2776 scrollBar.show (1);
3239 break; 2777 break;
3240 2778
3241 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2779 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3242 case 'n': 2780 case 'n':
3243 scr_charset_choose (2); 2781 scr_charset_choose (2);
… …
3250 } 2788 }
3251} 2789}
3252/*}}} */ 2790/*}}} */
3253 2791
3254/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3255/* *INDENT-OFF* */
3256enum { 2793enum {
3257 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
3258 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,
3259 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 ,
3260 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,
… …
3263 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,
3264 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 ,
3265 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
3266}; 2803};
3267 2804
3268#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3269 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3270 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3271#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
3272 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3273 2810
3274const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
3275 { 2812 {
3276 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, */
3277 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, */
3278 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, */
3279 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, [, \, ], ^, _, */
3280 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, */
3281 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, */
3282 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, */
3283 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, {, |, }, ~, */
3284 }; 2821 };
3285/* *INDENT-ON* */
3286 2822
3287void 2823void ecb_hot
3288rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
3289{ 2825{
3290 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
3291 unsigned int nargs, p; 2827 unsigned int nargs, p;
3292 int n, ndef; 2828 int n, ndef;
3293 int arg[ESC_ARGS]; 2829 int arg[ESC_ARGS] = { };
3294 2830
3295 for (nargs = ESC_ARGS; nargs > 0;) 2831 nargs = 0;
3296 arg[--nargs] = 0;
3297 2832
3298 priv = 0; 2833 priv = 0;
3299 ch = cmd_getc (); 2834 ch = cmd_getc ();
3300 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2836 {
3301 { /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
3302 priv = ch; 2838 priv = ch;
3303 ch = cmd_getc (); 2839 ch = cmd_getc ();
3304 } 2840 }
3305 2841
2842 prev_ch = 0;
3306 /* read any numerical arguments */ 2843 /* read any numerical arguments */
3307 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
3308 { 2845 {
3309 if (isdigit (ch)) 2846 if (isdigit (ch))
3310 { 2847 {
… …
3320 n = -1; 2857 n = -1;
3321 } 2858 }
3322 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
3323 process_nonprinting (ch); 2860 process_nonprinting (ch);
3324 2861
2862 prev_ch = ch;
3325 ch = cmd_getc (); 2863 ch = cmd_getc ();
3326 } 2864 }
3327 2865
3328 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
3329 return; 2867 return;
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 2873 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 2874 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 2875 if (arg[p] == -1)
3338 arg[p] = ndef; 2876 arg[p] = ndef;
3339 2877
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 2878 /*
3348 * private mode handling 2879 * private mode handling
3349 */ 2880 */
3350 if (priv) 2881 if (priv)
3351 { 2882 {
3352 switch (priv) 2883 switch (priv)
3353 { 2884 {
3354 case '>': 2885 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 2886 if (ch == CSI_DA) /* secondary device attributes */
3356 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 }
3357 break; 2897 break;
2898
3358 case '?': 2899 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
3361 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);
3362 } 2915 }
2916 break;
2917 }
2918
3363 return; 2919 return;
3364 } 2920 }
3365 2921
3366 switch (ch) 2922 switch (ch)
3367 { 2923 {
… …
3381 } 2937 }
3382 break; 2938 break;
3383#endif 2939#endif
3384 2940
3385 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3386 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3387 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
3388 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
3389 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3390 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3391 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
3392 break; 2948 break;
3393 2949
3394 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3395 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3487 break; 3043 break;
3488 case 6: /* CPR requested */ 3044 case 6: /* CPR requested */
3489 scr_report_position (); 3045 scr_report_position ();
3490 break; 3046 break;
3491 case 7: /* unofficial extension */ 3047 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 3048 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3049 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 3050 break;
3495 case 8: /* unofficial extension */ 3051 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 3053 break;
… …
3545 scr_insert_mode (1); 3101 scr_insert_mode (1);
3546 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3547 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3548 break; 3104 break;
3549 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3550 /* 3111 /*
3551 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3552 */ 3113 */
3553 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3554 if (nargs == 1) 3115 if (nargs == 1)
… …
3564 break; 3125 break;
3565 case CSI_75: 3126 case CSI_75:
3566 scr_cursor (RESTORE); 3127 scr_cursor (RESTORE);
3567 break; 3128 break;
3568 3129
3569#if ENABLE_FRILLS 3130#if !ENABLE_MINIMAL
3570 case CSI_74: 3131 case CSI_74:
3571 process_window_ops (arg, nargs); 3132 process_window_ops (arg, nargs);
3572 break; 3133 break;
3573#endif 3134#endif
3574 3135
… …
3581 break; 3142 break;
3582 } 3143 }
3583} 3144}
3584/*}}} */ 3145/*}}} */
3585 3146
3586#if ENABLE_FRILLS 3147#if !ENABLE_MINIMAL
3587/* ARGSUSED */
3588void 3148void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3150{
3591 int x, y; 3151 int x, y;
3592 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
3593 Window wdummy; 3153 Window wdummy;
3594 dDisp; 3154
3155 dLocal (Display *, dpy);
3595 3156
3596 if (nargs == 0) 3157 if (nargs == 0)
3597 return; 3158 return;
3598 3159
3599 switch (args[0]) 3160 switch (args[0])
3600 { 3161 {
3601 /* 3162 /*
3602 * commands 3163 * commands
3603 */ 3164 */
3604 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3166 XMapWindow (dpy, parent);
3606 break; 3167 break;
3607 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3609 break; 3170 break;
3610 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3612 break; 3173 break;
3613 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3176 break;
3616 case 5: /* raise window */ 3177 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3178 XRaiseWindow (dpy, parent);
3618 break; 3179 break;
3619 case 6: /* lower window */ 3180 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3181 XLowerWindow (dpy, parent);
3621 break; 3182 break;
3622 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3623 scr_touch (true); 3184 scr_touch (true);
3624 break; 3185 break;
3625 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3628 break; 3189 break;
3629 3190
3630 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3631 default: 3192 default:
3632 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3634 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3635 break; 3196 break;
3636
3637 3197
3638 /* 3198 /*
3639 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3640 */ 3200 */
3641 case 11: /* report window state */ 3201 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3204 break;
3645 case 13: /* report window position */ 3205 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3211 break;
3652 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3215 break;
3656 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3218 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3221 break;
3662 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3663 { 3223 {
3664 char *s; 3224 char *s;
3665 XGetIconName (disp, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3666 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 */
3667 XFree (s); 3227 XFree (s);
3668 } 3228 }
3669 break; 3229 break;
3670 case 21: /* report window title */ 3230 case 21: /* report window title */
3671 { 3231 {
3672 char *s; 3232 char *s;
3673 XFetchName (disp, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3674 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 */
3675 XFree (s); 3235 XFree (s);
3676 } 3236 }
3677 break; 3237 break;
3678 } 3238 }
3679} 3239}
… …
3688rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3689{ 3249{
3690 unicode_t ch; 3250 unicode_t ch;
3691 bool seen_esc = false; 3251 bool seen_esc = false;
3692 unsigned int n = 0; 3252 unsigned int n = 0;
3693 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3694 3254
3695 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3696 { 3256 {
3697 if (seen_esc) 3257 if (seen_esc)
3698 { 3258 {
… …
3706 seen_esc = true; 3266 seen_esc = true;
3707 continue; 3267 continue;
3708 } 3268 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3269 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3270 break;
3271 else if (ch == C0_SYN)
3272 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3273 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3713 3275
3714 seen_esc = false; 3276 seen_esc = false;
3715 3277
3716 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3717 // stop at some sane length 3279 // stop at some sane length
3718 return NULL; 3280 return NULL;
3719 3281
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3282 string[n++] = ch;
3724 } 3283 }
3725 3284
3726 string[n++] = '\0'; 3285 string[n++] = '\0';
3727 3286
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3287 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3735 * 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)'
3736 */ 3295 */
3737void 3296void
3738rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3739{ 3298{
3740 char *s;
3741 unicode_t eh;
3742
3743 /* 3299 /*
3744 * Not handled yet 3300 * Not handled yet
3745 */ 3301 */
3302
3303 unicode_t eh;
3746 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3747 if (s) 3305 if (s)
3748 free (s); 3306 free (s);
3749 3307
3750 return; 3308 return;
3751} 3309}
… …
3755 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3756 */ 3314 */
3757void 3315void
3758rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3759{ 3317{
3760 unicode_t ch, eh;
3761 int arg; 3318 int arg;
3762 3319
3763 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3764 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3765 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3766 3323
3767 if (ch == ';') 3324 if (ch == ';')
3768 { 3325 {
3326 unicode_t eh;
3769 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3770 3328
3771 if (s) 3329 if (s)
3772 { 3330 {
3773 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3779void 3337void
3780rxvt_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)
3781{ 3339{
3782 if (str[0] == '?' && !str[1]) 3340 if (str[0] == '?' && !str[1])
3783 { 3341 {
3784 unsigned short r, g, b; 3342 rgba c;
3785 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
3786 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);
3787 } 3351 }
3788 else 3352 else
3789 set_window_color (color, str); 3353 set_window_color (color, str);
3790} 3354}
3791 3355
3792/* 3356/*
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3358 */
3795void 3359void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3797{ 3361{
3798 int changed = 0;
3799 int color; 3362 int color;
3800 char *buf, *name; 3363 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3365 int saveop = op;
3803 dDisp; 3366
3367 dLocal (Display *, dpy);
3804 3368
3805 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
3806 switch (op) 3374 switch (op)
3807 { 3375 {
3808 case XTerm_name: 3376 case XTerm_name:
3809 set_title (str); 3377 set_title (str);
3810 /* FALLTHROUGH */ 3378 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3392 unsigned long bytes_after;
3825 unsigned char *value = 0; 3393 unsigned char *value = 0;
3826 const char *str = ""; 3394 const char *str = "";
3827 3395
3828 if (prop 3396 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3401 && actual_type != None
3834 && actual_format == 8) 3402 && actual_format == 8)
3835 str = (const char *)(value); 3403 str = (const char *)(value);
3836 3404
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3838 3406
3839 XFree (value); 3407 XFree (value);
3840 } 3408 }
3841 else 3409 else
3842 { 3410 {
3843 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3844 3412
3845 if (eq) 3413 if (eq)
3846 { 3414 {
3847 *eq = 0; 3415 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3849 } 3417 }
3850 else 3418 else
3851 XDeleteProperty (disp, parent[0], 3419 XDeleteProperty (dpy, parent,
3852 display->atom (str)); 3420 display->atom (str));
3853 } 3421 }
3854 break; 3422 break;
3855 3423
3856 case XTerm_Color: 3424 case XTerm_Color:
… …
3866 break; 3434 break;
3867 3435
3868 if ((buf = strchr (name, ';')) != NULL) 3436 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3437 *buf++ = '\0';
3870 3438
3871 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 != ';')
3872 { 3520 {
3873 unsigned short r, g, b; 3521 try
3874 pix_colors_focused[color].get (display, r, g, b); 3522 {
3875 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 }
3876 } 3529 }
3877 else 3530 else
3878 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 }
3879 } 3548 }
3880 break; 3549 break;
3881 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break;
3884 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886 break;
3887#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890 break;
3891#endif 3550#endif
3892 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3894 break;
3895 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_RV:
3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3909 break;
3910 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break;
3913#endif
3914#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3917 check_our_parents ();
3918 if (am_transparent)
3919 want_full_refresh = want_refresh = 1;
3920 break;
3921#endif
3922
3923 case Rxvt_Pixmap:
3924 if (*str != ';')
3925 {
3926#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */
3929 scr_touch (true);
3930#endif
3931 }
3932
3933 while ((str = strchr (str, ';')) != NULL)
3934 {
3935 str++;
3936#if XPM_BACKGROUND
3937 changed += scale_pixmap (str);
3938#endif
3939 }
3940
3941 if (changed)
3942 {
3943#ifdef XPM_BACKGROUND
3944 resize_pixmap ();
3945 scr_touch (true);
3946#endif
3947 }
3948 break;
3949
3950 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str);
3952 break;
3953 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str);
3955 break;
3956 3551
3957 case XTerm_logfile: 3552 case XTerm_logfile:
3958 // TODO, when secure mode? 3553 // TODO, when secure mode?
3959 break; 3554 break;
3960 3555
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3556#if 0
3968 case Rxvt_dumpscreen: /* no error notices */ 3557 case Rxvt_dumpscreen: /* no error notices */
3969 { 3558 {
3970 int fd; 3559 int fd;
3971 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)
… …
3984 case URxvt_italicFont: 3573 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 3574 case URxvt_boldItalicFont:
3986#endif 3575#endif
3987 if (query) 3576 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 3577 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3578 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 3579 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 3580 resp);
3992 else 3581 else
3993 { 3582 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3583 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 3586 allocated.push_back ((void *)res);
3998 set_fonts (); 3587 set_fonts ();
3999 } 3588 }
4000 break; 3589 break;
4001 3590
4002#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
4003 case URxvt_locale: 3600 case URxvt_locale:
4004 if (query) 3601 if (query)
4005 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);
4006 else 3603 else
4007 { 3604 {
4008 set_locale (str); 3605 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3606 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3607 init_xlocale ();
4011 } 3608 }
4012 break; 3609 break;
4013 3610
4014 case URxvt_view_up: 3611 case URxvt_view_up:
… …
4025 break; 3622 break;
4026#endif 3623#endif
4027 3624
4028#if ENABLE_PERL 3625#if ENABLE_PERL
4029 case URxvt_perl: 3626 case URxvt_perl:
4030 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));
4031 ; // no responses yet
4032 break; 3628 break;
4033#endif 3629#endif
4034 } 3630 }
4035} 3631}
4036/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
… …
4043 * 's' = save 3639 * 's' = save
4044 * 'r' = restore 3640 * 'r' = restore
4045 * 't' = toggle 3641 * 't' = toggle
4046 * so no need for fancy checking 3642 * so no need for fancy checking
4047 */ 3643 */
4048int 3644int ecb_cold
4049rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
4050{ 3646{
4051 int state; 3647 int state;
4052 3648
4053 if (mode == 's') 3649 if (mode == 's')
4054 { 3650 {
4055 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
4056 return -1; 3655 return -1;
4057 } 3656 }
4058 else 3657 else
4059 { 3658 {
4060 if (mode == 'r') 3659 if (mode == 'r')
4061 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4062 else 3661 else
4063 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4064 PrivMode (state, bit); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
4065 } 3668 }
4066 3669
4067 return state; 3670 return state;
4068} 3671}
4069 3672
4070/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
4071void 3674void
4072rxvt_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)
4073{ 3676{
4074 unsigned int i, j; 3677 unsigned int i, j;
4075 int state; 3678 int state;
4076 3679
4077 static const struct 3680 static const struct
4078 { 3681 {
4079 const int argval; 3682 const int argval;
4080 const unsigned long bit; 3683 const unsigned long bit;
4081 }
4082
4083 argtopriv[] = { 3684 } argtopriv[] = {
4084 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
4085 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
4086 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
4087 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
4088 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
4089 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
4090 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
4091 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
4092 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc 3694 // 18 end FF to printer after print screen
4094 { menuBar_esc, PrivMode_menuBar }, 3695 // 19 Print screen prints full screen/scroll region
4095#endif
4096 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4098#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 3699#endif
4101 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
4102 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
4103 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
4104 // 45 margin bell NYI 3704 // 45 margin bell NYI
4105 // 46 start logging 3705 // 46 start logging
4106 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
4107 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
4108#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
4109 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
4110#endif 3710#endif
4111 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
4112 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3712 { 1002, PrivMode_MouseBtnEvent },
4113 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3713 { 1003, PrivMode_MouseAnyEvent },
4114 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
4115 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4116 { 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
4117 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
4118 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
4119 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
4120 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
4121 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
4122 { 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 */
4123 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3729 { 2004, PrivMode_BracketPaste },
4124 }; 3730 };
4125 3731
4126 if (nargs == 0) 3732 if (nargs == 0)
4127 return; 3733 return;
4128 3734
… …
4135 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
4136 { 3742 {
4137 state = -1; 3743 state = -1;
4138 3744
4139 /* basic handling */ 3745 /* basic handling */
4140 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
4141 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
4142 { 3748 {
4143 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
4144 break; 3750 break;
4145 } 3751 }
… …
4153 3759
4154 scr_touch (true); 3760 scr_touch (true);
4155 break; 3761 break;
4156#endif 3762#endif
4157 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
4158 case 1049:
4159 if (OPTION (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4160 if (mode == 0) 3765 if (mode == 0)
4161 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
4162 else if (mode == 1) 3767 else if (mode == 1)
4163 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
4164 break; 3769 break;
… …
4172 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
4173 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
4174 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
4175 * within VT52 mode 3780 * within VT52 mode
4176 */ 3781 */
4177 PrivMode (1, PrivMode_vt52); 3782 priv_modes |= PrivMode_vt52;
4178 break; 3783 break;
4179 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4182 break; 3787 break;
4183 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
4184 set_option (Opt_jumpScroll, !state); 3789 set_option (Opt_jumpScroll, !state);
4185 break; 3790 break;
4186 case 5: /* reverse video */ 3791 case 5: /* reverse video */
… …
4193 scr_autowrap (state); 3798 scr_autowrap (state);
4194 break; 3799 break;
4195 /* 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 */
4196 case 9: /* X10 mouse reporting */ 3801 case 9: /* X10 mouse reporting */
4197 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX11; 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3804 break;
4200#ifdef menuBar_esc
4201 case menuBar_esc:
4202#ifdef MENUBAR
4203 map_menuBar (state);
4204#endif
4205 break;
4206#endif
4207#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
4208 case scrollBar_esc: 3806 case scrollBar_esc:
4209 if (scrollbar_mapping (state)) 3807 scrollBar.map (state);
4210 {
4211 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
4212 scr_touch (true); 3809 scr_touch (true);
4213 }
4214 break; 3810 break;
4215#endif 3811#endif
4216 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
4217 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
4218 break; 3814 break;
… …
4223 break; 3819 break;
4224 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
4225 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
4226 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
4227 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
4228 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4229 break; 3825 break;
4230#if 0
4231 case 1001: 3826 case 1002:
4232 break; /* X11 mouse highlighting */ 3827 case 1003:
4233#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;
4234 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
4235 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
4236 break; 3842 break;
4237 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
4238 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
4239 break; 3845 break;
4240 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
4241 if (OPTION (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
4242 if (current_screen != PRIMARY) 3848 if (!state)
4243 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
4244 scr_change_screen (state); 3851 scr_change_screen (state);
4245 break; 3852 break;
4246 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
4247 scr_change_screen (state); 3858 scr_change_screen (state);
3859
4248 if (OPTION (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
4249 if (current_screen != PRIMARY) 3861 if (state)
4250 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
4251 break; 3865 break;
4252 default: 3866 default:
4253 break; 3867 break;
4254 } 3868 }
4255 } 3869 }
4256} 3870}
4257/*}}} */ 3871/*}}} */
4258 3872
4259/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
4260void 3874void ecb_hot
4261rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4262{ 3876{
4263 unsigned int i; 3877 unsigned int i;
4264 short rendset; 3878 short rendset;
4265 int rendstyle; 3879 int rendstyle;
… …
4381 scr_color (Color_bg, Color_bg); 3995 scr_color (Color_bg, Color_bg);
4382 break; 3996 break;
4383 3997
4384 //case 50: // not variable spacing 3998 //case 50: // not variable spacing
4385 3999
4386#if ENABLE_FRILLS 4000#if !ENABLE_MINIMAL
4387 case 90: 4001 case 90:
4388 case 91: /* set bright fg color */ 4002 case 91: /* set bright fg color */
4389 case 92: 4003 case 92:
4390 case 93: 4004 case 93:
4391 case 94: 4005 case 94:
… …
4406 break; 4020 break;
4407#endif 4021#endif
4408 } 4022 }
4409 } 4023 }
4410} 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}
4411/*}}} */ 4041/*}}} */
4412 4042
4413/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4414void
4415rxvt_term::process_graphics ()
4416{
4417 unicode_t ch, cmd = cmd_getc ();
4418
4419 if (cmd == 'Q')
4420 { /* query graphics */
4421 tt_printf ("\033G0\012"); /* no graphics */
4422 return;
4423 }
4424 /* swallow other graphics sequences until terminating ':' */
4425 do
4426 ch = cmd_getc ();
4427 while (ch != ':');
4428}
4429/*}}} */
4430
4431/* ------------------------------------------------------------------------- */ 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 */
4432 4047
4433/* 4048/*
4434 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
4435 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
4436 */ 4051 */
… …
4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4445 va_end (arg_ptr); 4060 va_end (arg_ptr);
4446 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
4447} 4062}
4448 4063
4449/* ---------------------------------------------------------------------- */
4450/* 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. */
4451 * or generated by us in response to a query ESC sequence. 4065void
4452 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4453const 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}
4454 4080
4455void 4081void
4456rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
4457{ 4083{
4458 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)))
4459 return; 4085 return;
4460 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{
4461 if (pty.pty < 0) 4095 if (pty->pty < 0)
4462 return; 4096 return;
4463 4097
4464 if (v_buflen == 0) 4098 if (v_buflen == 0)
4465 { 4099 {
4466 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));
4467 4101
4102 max_it (written, 0);
4103
4468 if ((unsigned int)written == len) 4104 if (written == len)
4469 return; 4105 return;
4470 4106
4471 data += written; 4107 data += written;
4472 len -= written; 4108 len -= written;
4473 } 4109 }
4474 4110
4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4476 4112
4477 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
4478 v_buflen += len; 4114 v_buflen += len;
4479 4115
4480 pty_ev.set (EVENT_READ | EVENT_WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);
4481} 4117}
4482 4118
4483void rxvt_term::pty_write () 4119void rxvt_term::pty_write ()
4484{ 4120{
4485 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));
4486 4122
4487 if (written > 0) 4123 if (written > 0)
4488 { 4124 {
4489 v_buflen -= written; 4125 v_buflen -= written;
4490 4126
4491 if (v_buflen == 0) 4127 if (v_buflen == 0)
4492 { 4128 {
4493 free (v_buffer); 4129 free (v_buffer);
4494 v_buffer = 0; 4130 v_buffer = 0;
4495 v_buflen = 0;
4496 4131
4497 pty_ev.set (EVENT_READ); 4132 pty_ev.set (ev::READ);
4498 return; 4133 return;
4499 } 4134 }
4500 4135
4501 memmove (v_buffer, v_buffer + written, v_buflen); 4136 memmove (v_buffer, v_buffer + written, v_buflen);
4502 } 4137 }
4503 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4138 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4504 pty_ev.set (EVENT_READ); 4139 pty_ev.set (ev::READ);
4505} 4140}
4506 4141
4507/*----------------------- end-of-file (C source) -----------------------*/ 4142/*----------------------- end-of-file (C source) -----------------------*/
4508 4143

Diff Legend

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