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

Diff Legend

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