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.497 by sf-exg, Thu Sep 1 08:11:26 2011 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
53#include <wchar.h> 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h"
57#endif
58
59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
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
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
63void 136void
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
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
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
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
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
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
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 }
777
778 if (newlen)
779 len = strlen (kbuf);
540 780
541 /* 781 /*
542 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
543 */ 783 */
544#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
550 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
551 { 791 {
552 len = 1; 792 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
555 else 800 else
556 { 801 {
557#ifdef META8_OPTION 802#ifdef META8_OPTION
558 /* set 8-bit on */ 803 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
560 { 805 {
561 unsigned char *ch; 806 char *ch;
562 807
563 for (ch = kbuf; ch < kbuf + len; ch++) 808 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 809 *ch |= 0x80;
565 810
566 meta = 0; 811 meta = 0;
… …
568#endif 813#endif
569 /* nil */ ; 814 /* nil */ ;
570 } 815 }
571 } 816 }
572 817
818 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819 return;
820
573 if (len <= 0) 821 if (len <= 0)
574 return; /* not mapped */ 822 return; /* not mapped */
575 823
576 if (Options & Opt_scrollTtyKeypress) 824 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 825 if (view_start)
578 { 826 {
579 TermWin.view_start = 0; 827 view_start = 0;
580 want_refresh = 1; 828 want_refresh = 1;
581 } 829 }
582 830
583 /* 831 /*
584 * these modifications only affect the static keybuffer 832 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 847#ifdef META8_OPTION
600 && meta_char == C0_ESC 848 && meta_char == C0_ESC
601#endif 849#endif
602 ) 850 )
603 { 851 {
604 const unsigned char ch = C0_ESC; 852 const char ch = C0_ESC;
605 tt_write (&ch, 1); 853 tt_write (&ch, 1);
606 } 854 }
607 855
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); 856 tt_write (kbuf, (unsigned int)len);
619} 857}
620/*}}} */
621 858
622#if (MENUBAR_MAX) 859void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 860rxvt_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{ 861{
628 unsigned int n, s; 862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym;
629 864
630 n = cmdbuf_ptr - cmdbuf_base; 865 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 866#endif
632 867
633 if (n > 0 && s < count) 868#if ENABLE_FRILLS || ISO_14755
869 // ISO 14755 support
870 if (iso14755buf)
871 if (iso14755buf & ISO_14755_52)
634 { 872 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 873# if ISO_14755
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 874 scr_overlay_off ();
637 cmdbuf_ptr = cmdbuf_base; 875# endif
638 cmdbuf_endp -= n; 876# if ISO_14755
639 s += n; 877 // iso14755 part 5.2 handling: release time
878 // first: controls
879 if ((ev.state & ControlMask)
880 && ((keysym >= 0x40 && keysym <= 0x5f)
881 || (keysym >= 0x61 && keysym <= 0x7f)))
882 {
883 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
884 commit_iso14755 ();
885
886 return;
887 }
888
889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym)
891 {
892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 ();
894
895 return;
896 }
897
898 scr_bell ();
899# endif
900 iso14755buf = 0;
901
902 return;
640 } 903 }
641 904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
642 if (count > s)
643 { 905 {
644 rxvt_warn ("data loss: cmd_write too large, continuing.\n"); 906# if ISO_14755
645 count = s; 907 scr_overlay_off ();
908# endif
909 if (iso14755buf & ISO_14755_51)
910 commit_iso14755 ();
911#if ISO_14755
912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
913 {
914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
915
916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
918 }
919# endif
920 else
921 iso14755buf = 0;
646 } 922 }
923#endif
647 924
648 for (; count--;) 925 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; 926 return;
927
928#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
929 if (!(ev.state & ControlMask))
930 slip_wheel_ev.stop ();
931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0;
933#endif
654} 934}
655#endif /* MENUBAR_MAX */
656 935
657void 936void
658rxvt_term::flush () 937rxvt_term::flush ()
659{ 938{
660#ifdef TRANSPARENT 939 flush_ev.stop ();
661 if (want_full_refresh) 940
941#ifdef HAVE_BG_PIXMAP
942 if (bg_flags & BG_NEEDS_REFRESH)
662 { 943 {
663 want_full_refresh = 0; 944 bg_flags &= ~BG_NEEDS_REFRESH;
664 scr_clear ();
665 scr_touch (false); 945 scr_touch (false);
666 want_refresh = 1;
667 } 946 }
668#endif 947#endif
669 948
670 if (want_refresh) 949 if (want_refresh)
671 { 950 {
951 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
952 {
953 int row = view_start;
954 int end_row = row + nrow;
955
956 while (row > top_row && ROW (row - 1).is_longer ())
957 --row;
958
959 do
960 {
961 int start_row = row;
962 line_t *l;
963
964 do
965 {
966 l = &ROW (row++);
967
968 if (!(l->f & LINE_FILTERED))
969 {
970 // line not filtered, mark it as filtered
971 l->f |= LINE_FILTERED;
972 while (l->is_longer ())
973 {
974 l = &ROW (row++);
975 l->f |= LINE_FILTERED;
976 }
977
978 // and filter it
979 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
980
981 break;
982 }
983 }
984 while (l->is_longer () && row < end_row);
985 }
986 while (row < end_row);
987 }
988
672 scr_refresh (refresh_type); 989 scr_refresh ();
673 scrollbar_show (1); 990 scrollBar.show (1);
674#ifdef USE_XIM 991#ifdef USE_XIM
675 IMSendSpot (); 992 im_send_spot ();
676#endif 993#endif
677 } 994 }
678 995
679 display->flush (); 996 display->flush ();
680} 997}
681 998
999/* checks whether a refresh is requested and starts the refresh timer */
682void 1000void
683rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
684{ 1002{
685 SET_R (this); 1003 if (want_refresh && !flush_ev.is_active ())
686 SET_LOCALE (locale); 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
687 1005
1006 display->flush ();
1007}
1008
1009void
1010rxvt_term::flush_cb (ev::timer &w, int revents)
1011{
1012 make_current ();
1013
1014 refresh_count = 0;
688 flush (); 1015 flush ();
689} 1016}
690 1017
691#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
692void 1019void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1021{
695 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1023 want_refresh = 1;
697 1024 refresh_check ();
698 w.start (w.at + BLINK_INTERVAL);
699} 1025}
700#endif 1026#endif
701 1027
702#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
703void 1029void
704rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1031{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1033 {
708 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
709 want_refresh = 1; 1035 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
711 } 1037 }
1038 else
1039 w.stop ();
712} 1040}
713#endif 1041#endif
714 1042
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void 1044void
717rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
718{ 1046{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
721 { 1049 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1050 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
725 } 1052 }
1053 else
1054 w.stop ();
726} 1055}
727#endif 1056#endif
728 1057
729#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
730void 1059void
731rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
732{ 1061{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1063 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1065 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
739 } 1067 }
1068 else
1069 w.stop ();
740} 1070}
741#endif 1071#endif
742 1072
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void 1074void
745rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
746{ 1076{
747 if (mouse_slip_wheel_speed == 0 1077 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 { 1078 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1079 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
754 } 1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1087 }
1088}
1089#endif
1090
1091#if LINUX_YIELD_HACK
1092static struct event_handler
1093{
1094 ev::prepare yield_ev;
1095
1096 void yield_cb (ev::prepare &w, int revents)
1097 {
1098 // this should really be sched_yield(), but the linux guys thought
1099 // that giving a process calling sched_yield () less cpu time than
1100 // ones with high nice levels is a useful thing to do. It surely is is
1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1105
1106 struct timespec ts = { 0, 1000 };
1107 nanosleep (&ts, 0);
1108
1109 w.stop ();
1110 }
1111
1112 event_handler ()
1113 : yield_ev (this, &event_handler::yield_cb)
1114 {
1115 }
1116} event_handler;
1117#endif
1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
755} 1149}
756#endif 1150#endif
757 1151
758bool 1152bool
759rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
760{ 1154{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
762 1156
763 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
764 { 1158
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
766 n = 0;
767 } 1160 {
768 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
772 1166
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
774 1168
775 if (n > 0) 1169 if (r > 0)
776 { 1170 {
777 cmdbuf_endp += n; 1171 cmdbuf_endp += r;
778 return true; 1172 return true;
779 } 1173 }
780 else if (n < 0 && errno != EAGAIN) 1174 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1175 {
1176#if LINUX_YIELD_HACK
1177 if (display->is_local)
1178 event_handler.yield_ev.start ();
1179#endif
1180 }
1181 else
1182 {
1183 pty_ev.stop ();
1184
1185 if (!option (Opt_hold))
781 destroy (); 1186 destroy ();
782 1187 }
1188
783 return false; 1189 return false;
784} 1190}
785 1191
786void 1192void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
788{ 1194{
789 SET_R (this); 1195 make_current ();
790 SET_LOCALE (locale);
791 1196
792 if (revents & EVENT_WRITE) 1197 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 1198 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
797 if (cmd_parse ()) 1200 cmd_parse ();
798 break; 1201
1202 if (revents & ev::WRITE)
1203 pty_write ();
1204
1205 refresh_check ();
799} 1206}
800 1207
801void 1208void
802rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
803{ 1210{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
805 recolour_cursor (); 1212 recolour_cursor ();
806 1213
807#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1215 hidden_pointer = 0;
809 1216
810 if (Options & Opt_pointerBlank) 1217 if (option (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
812#endif 1219#endif
813} 1220}
814 1221
815#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
816void 1223void
817rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
818{ 1225{
819 if (! (Options & Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
820 return; 1227 return;
821 1228
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
823 XFlush (display->display); 1230 XFlush (dpy);
824 1231
825 hidden_pointer = 1; 1232 hidden_pointer = 1;
826} 1233}
827 1234
828void 1235void
829rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
830{ 1237{
831 SET_R (this); 1238 make_current ();
832 SET_LOCALE (locale);
833 1239
834 pointer_blank (); 1240 pointer_blank ();
835} 1241}
836#endif 1242#endif
837 1243
838void 1244void
839rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
840{ 1246{
841 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
842 int x, y; 1248 int x, y;
1249 int code = 32;
843 1250
844 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
845 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
846 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
847 1263
848 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1265 button_number = 3;
851 }
852 else 1266 else
853 { 1267 {
854 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1270 if (button_number >= 3)
857 button_number += (64 - 3); 1271 button_number += 64 - 3;
858 } 1272 }
859 1273
860 if (PrivateModes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
861 { 1275 {
862 /* 1276 /*
863 * do not report ButtonRelease 1277 * do not report ButtonRelease
864 * no state info allowed 1278 * no state info allowed
865 */ 1279 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1294 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1295 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1296#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1297 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1298#endif
885
886 } 1299 }
887 1300
888#ifdef DEBUG_MOUSEREPORT 1301#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1302 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1303 if (key_state & 16)
891 fputc ('C', stderr); 1304 fputc ('C', stderr);
892 if (key_state & 4) 1305 if (key_state & 4)
893 fputc ('S', stderr); 1306 fputc ('S', stderr);
… …
895 fputc ('A', stderr); 1308 fputc ('A', stderr);
896 if (key_state & 32) 1309 if (key_state & 32)
897 fputc ('2', stderr); 1310 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1312 button_number,
900 x + 1, 1313 x,
901 y + 1); 1314 y);
902#else 1315#endif
1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
903 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1331 code + button_number + key_state,
905 (32 + x + 1), 1332 32 + x,
906 (32 + y + 1)); 1333 32 + y);
907#endif
908} 1334}
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 1335
920/*{{{ process an X event */ 1336/*{{{ process an X event */
921void 1337void
922rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
923{ 1339{
924 SET_R (this); 1340 make_current ();
925 SET_LOCALE (locale);
926 1341
927#if defined(CURSOR_BLINK) 1342 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 1343
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1344 if (ev.xany.window == vt
937 } 1345 && SHOULD_INVOKE (HOOK_X_EVENT)
938#endif 1346 && 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; 1347 return;
957#endif
958 1348
1349 // for XQueryPointer
959 Window unused_root, unused_child; 1350 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1351 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1352 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 1353
1012 switch (ev.type) 1354 switch (ev.type)
1013 { 1355 {
1014 case KeyPress: 1356 case KeyPress:
1015 lookup_key (ev.xkey); 1357 key_press (ev.xkey);
1016 break; 1358 break;
1017 1359
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease: 1360 case KeyRelease:
1020 { 1361 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; 1362 break;
1032 }
1033#endif
1034 1363
1035 case ButtonPress: 1364 case ButtonPress:
1036 button_press (ev.xbutton); 1365 button_press (ev.xbutton);
1037 break; 1366 break;
1038 1367
… …
1040 button_release (ev.xbutton); 1369 button_release (ev.xbutton);
1041 break; 1370 break;
1042 1371
1043 case ClientMessage: 1372 case ClientMessage:
1044 if (ev.xclient.format == 32 1373 if (ev.xclient.format == 32
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1374 && !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 { 1375 {
1054 /* Get Dnd data */ 1376 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1055 Atom ActualType; 1377 {
1056 int ActualFormat; 1378 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1057 unsigned char *data; 1379 {
1058 unsigned long Size, RemainingBytes; 1380 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1059 1381 {
1060 XGetWindowProperty (display->display, display->root, 1382 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1061 xa[XA_DNDSELECTION], 1383 destroy ();
1062 0L, 1000000L, 1384 }
1063 False, AnyPropertyType, 1385#if ENABLE_EWMH
1064 &ActualType, &ActualFormat, 1386 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1065 &Size, &RemainingBytes, 1387 XSendEvent (dpy, ev.xclient.window = display->root,
1388 False, SubstructureRedirectMask | SubstructureNotifyMask,
1066 &data); 1389 &ev);
1067 XChangeProperty (display->display, display->root, 1390#endif
1068 XA_CUT_BUFFER0, XA_STRING, 1391 }
1069 8, PropModeReplace, 1392 }
1070 data, STRLEN (data)); 1393#if ENABLE_XEMBED
1071 XFree (data); 1394 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1395 {
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1396 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1397 focus_in ();
1398 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1399 focus_out ();
1400 }
1401#endif
1074 } 1402 }
1075#endif /* OFFIX_DND */
1076 break;
1077
1078 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping));
1080 break; 1403 break;
1081 1404
1082 /* 1405 /*
1083 * XXX: this is not the _current_ arrangement 1406 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1407 * Here's my conclusion:
… …
1103 break; 1426 break;
1104 } 1427 }
1105 break; 1428 break;
1106 1429
1107 case FocusIn: 1430 case FocusIn:
1108 if (!TermWin.focus) 1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1434 focus_in ();
1435 break;
1436
1437 case FocusOut:
1438 if (ev.xfocus.detail != NotifyInferior
1439 && ev.xfocus.detail != NotifyPointer
1440 && ev.xfocus.mode != NotifyGrab)
1441 focus_out ();
1442 break;
1443
1444 case ConfigureNotify:
1445 if (ev.xconfigure.window == parent)
1109 { 1446 {
1110 TermWin.focus = 1; 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1448 ;
1112#ifdef USE_XIM 1449
1113 if (Input_Context != NULL) 1450#ifdef HAVE_BG_PIXMAP
1114 XSetICFocus (Input_Context); 1451 bool moved = false;
1115#endif 1452 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 { 1453 {
1123 PixColors = PixColorsFocused; 1454 int x, y;
1124 set_colorfgbg (); 1455 if (ev.xconfigure.send_event)
1125 scr_clear (); 1456 {
1126 scr_touch (true); 1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1127 } 1466 }
1128#endif 1467#endif
1129 1468
1130 } 1469 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 { 1470 {
1150 PixColors = PixColorsUnFocused; 1471 seen_resize = 1;
1151 set_colorfgbg (); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1152 scr_clear ();
1153 scr_touch (true);
1154 } 1473 }
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 1474 else
1180 { 1475 {
1181 D_SIZE ((stderr, "Size: Not resizing")); 1476#ifdef HAVE_BG_PIXMAP
1477 if (moved)
1478 update_background ();
1479#endif
1182 } 1480 }
1183#endif 1481
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1482 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 } 1483 }
1193 break; 1484 break;
1194 1485
1486 case PropertyNotify:
1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break;
1489
1195 case SelectionClear: 1490 case SelectionClear:
1196 selection_clear (); 1491 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; 1492 break;
1204 1493
1205 case SelectionRequest: 1494 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1207 break; 1496 break;
1208 1497
1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start ();
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break;
1521
1209 case UnmapNotify: 1522 case UnmapNotify:
1210 TermWin.mapped = 0; 1523 mapped = 0;
1211#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1213#endif 1526#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1214 break; 1528 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 1529
1229 case GraphicsExpose: 1530 case GraphicsExpose:
1230 case Expose: 1531 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1532 if (ev.xany.window == vt)
1232 { 1533 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1534 do
1535 {
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1236#else 1538 }
1237 // I don't understand this, so I changed it :) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1240 //scr_expose (ev.xexpose.x, 0, 1547 }
1241 // ev.xexpose.width, TermWin.height, False); 1548
1242#endif
1243 want_refresh = 1; 1549 want_refresh = 1;
1244 } 1550 }
1245 else 1551 else
1246 { 1552 {
1247 XEvent unused_event; 1553 XEvent unused_event;
1248 1554
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1250 ; 1556 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1558 ;
1253 1559
1254 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1255 { 1561 {
1256 scrollBar.setIdle (); 1562 scrollBar.state = SB_STATE_IDLE;
1257 scrollbar_show (0); 1563 scrollBar.show (0);
1258 } 1564 }
1259#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose ();
1262#endif
1263 } 1565 }
1264 break; 1566 break;
1265 1567
1266 case MotionNotify: 1568 case MotionNotify:
1267#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1268 if (hidden_pointer) 1570 if (hidden_pointer)
1269 pointer_unblank (); 1571 pointer_unblank ();
1270#endif 1572#endif
1271#if MENUBAR 1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1272 if (isMenuBarWindow (ev.xany.window)) 1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break;
1578
1579 if (ev.xany.window == vt)
1273 { 1580 {
1274 menubar_control (ev.xbutton); 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1275 break; 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1276 } 1583 ; // 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))) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1585 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1286 ; 1587 ;
1287 1588
1288 XQueryPointer (display->display, TermWin.vt, 1589 XQueryPointer (dpy, vt,
1289 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1592 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1593 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1595 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1596 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1597 {
1297#endif 1598#endif
1599#if ISO_14755
1600 // 5.4
1601 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1602 {
1603 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1604 break;
1605 }
1606#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1607 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1608 ev.xbutton.state & Button3Mask ? 2 : 0);
1609
1300#ifdef SELECTION_SCROLLING 1610#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1611 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1612 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1613 {
1304 int dist; 1614 int dist;
1305 1615
1306 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1308 */ 1618 */
1309 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1311 1621
1312 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1314 */ 1624 */
1315 selection_save_x=ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1626 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1627 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1628
1320 /* calc number of lines to scroll */ 1629 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1630 if (ev.xbutton.y < int_bwidth)
1322 { 1631 {
1323 scroll_selection_dir = UP; 1632 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1633 dist = int_bwidth - ev.xbutton.y;
1325 } 1634 }
1326 else 1635 else
1327 { 1636 {
1328 scroll_selection_dir = DN; 1637 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1638 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1639 }
1640
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1641 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1642 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1;
1334 MIN_IT (scroll_selection_lines, 1644 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1645 SELECTION_SCROLL_MAX_LINES);
1336 } 1646 }
1337 else 1647 else
1338 { 1648 {
1339 /* we are within the text window, so we 1649 /* we are within the text window, so we
1340 * shouldn't be scrolling 1650 * shouldn't be scrolling
1341 */ 1651 */
1342 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1344 } 1653 }
1345#endif 1654#endif
1346#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1347
1348 } 1656 }
1349#endif 1657#endif
1350
1351 } 1658 }
1352 } 1659 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1354 { 1661 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1356 MotionNotify, &ev)) ; 1663 MotionNotify, &ev))
1664 ;
1665
1357 XQueryPointer (display->display, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1358 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1669 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1670 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1672 scrollBar.size ());
1364 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1673 want_refresh = 1;
1366 scrollbar_show (1); 1674 scrollBar.show (1);
1367 } 1675 }
1368 break; 1676 break;
1369 } 1677 }
1370}
1371 1678
1679#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again ();
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1705
1706 refresh_check ();
1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1724
1725void
1726rxvt_term::focus_in ()
1727{
1728 if (!focus)
1729 {
1730 focus = 1;
1731 want_refresh = 1;
1732
1733#if USE_XIM
1734 if (Input_Context != NULL)
1735 {
1736 im_set_position ();
1737 XSetICFocus (Input_Context);
1738 }
1739#endif
1740#if CURSOR_BLINK
1741 if (option (Opt_cursorBlink))
1742 cursor_blink_ev.again ();
1743#endif
1744#if OFF_FOCUS_FADING
1745 if (rs[Rs_fade])
1746 {
1747 pix_colors = pix_colors_focused;
1748 scr_recolour ();
1749 }
1750#endif
1751#if ENABLE_FRILLS
1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 }
1758}
1759
1760void
1761rxvt_term::focus_out ()
1762{
1763 if (focus)
1764 {
1765 focus = 0;
1766 want_refresh = 1;
1767
1768#if ENABLE_FRILLS
1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1772#if ENABLE_FRILLS || ISO_14755
1773 if (iso14755buf)
1774 {
1775 iso14755buf = 0;
1776# if ISO_14755
1777 scr_overlay_off ();
1778# endif
1779 }
1780#endif
1781#if USE_XIM
1782 if (Input_Context != NULL)
1783 XUnsetICFocus (Input_Context);
1784#endif
1785#if CURSOR_BLINK
1786 if (option (Opt_cursorBlink))
1787 cursor_blink_ev.stop ();
1788
1789 hidden_cursor = 0;
1790#endif
1791#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade])
1793 {
1794 pix_colors = pix_colors_unfocused;
1795 scr_recolour ();
1796 }
1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 }
1801}
1802
1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1372void 1817void
1373rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1819{
1375 SET_R (this); 1820 make_current ();
1376 SET_LOCALE (locale);
1377 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1378 switch (ev.type) 1827 switch (ev.type)
1379 { 1828 {
1380 case PropertyNotify: 1829 case PropertyNotify:
1830 /*
1831 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on.
1833 */
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1382 { 1836 {
1383 if (ev.xproperty.state == PropertyNewValue) 1837 bg_set_root_pixmap ();
1384 selection_property (ev.xproperty.window, ev.xproperty.atom); 1838 update_background ();
1385 break;
1386 } 1839 }
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 1840
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; 1841 break;
1842 }
1406#endif 1843# endif
1407 } 1844
1845 refresh_check ();
1408} 1846}
1847#endif
1409 1848
1410void 1849void
1411rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
1412{ 1851{
1413 int reportmode = 0, clickintime; 1852 int reportmode = 0, clickintime;
1414 1853
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1854 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1855
1416 if (!bypass_keystate) 1856 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1857 reportmode = !! (priv_modes & PrivMode_mouse_report);
1858
1418 /* 1859 /*
1419 * VT window processing of button press 1860 * VT window processing of button press
1420 */ 1861 */
1421 if (ev.window == TermWin.vt) 1862 if (ev.window == vt)
1422 { 1863 {
1864 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1865 return;
1866
1867#if ISO_14755
1868 // 5.4
1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1870 {
1871 iso14755_54 (ev.x, ev.y);
1872 return;
1873 }
1874#endif
1875
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1876 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1877
1424 if (reportmode) 1878 if (reportmode)
1425 { 1879 {
1426 /* mouse report from vt window */ 1880 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1429#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1430 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1431 { 1885 {
1432 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1433 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1434 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1435 { 1890 {
1436 /* only report double clicks */ 1891 /* only report double clicks */
1437 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1438 mouse_report (ev); 1893 mouse_report (ev);
… …
1450 mouse_report (ev); 1905 mouse_report (ev);
1451 } 1906 }
1452#else 1907#else
1453 MEvent.button = ev.button; 1908 MEvent.button = ev.button;
1454 mouse_report (ev); 1909 mouse_report (ev);
1455#endif /* MOUSE_REPORT_DOUBLECLICK */ 1910#endif /* MOUSE_REPORT_DOUBLECLICK */
1456 1911
1457 } 1912 }
1458 else 1913 else
1459 { 1914 {
1460 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1917
1462 switch (ev.button) 1918 switch (ev.button)
1463 { 1919 {
1464 case Button1: 1920 case Button1:
1921 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */
1923#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask);
1925#else
1926 selection.rect = false;
1927#endif
1928
1465 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1467 { 1931 {
1468 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1470 else 1934 else
1471 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1950 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1489 else 1953 else
1490 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1955
1491 MEvent.button = Button3; 1956 MEvent.button = Button3;
1492 break; 1957 break;
1493 } 1958 }
1494 } 1959 }
1960
1495 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1496 return; 1962 return;
1497 } 1963 }
1498 1964
1499 /* 1965 /*
1500 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1501 */ 1967 */
1502 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1503 { 1969 {
1504 scrollBar.setIdle (); 1970 page_dirn direction = NO_DIR;
1971
1972 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */
1976
1977 scrollBar.state = SB_STATE_IDLE;
1505 /* 1978 /*
1506 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1507 * move up if mouse is above slider 1980 * move up if mouse is above slider
1508 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1509 * 1982 *
… …
1518 /* 1991 /*
1519 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1520 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1521 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1522 */ 1995 */
1523 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1524 && scrollbarnext_upButton (ev.y))
1525 || (scrollBar.style == R_SB_RXVT
1526 && scrollbarrxvt_upButton (ev.y)))
1527 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1528 else if ((scrollBar.style == R_SB_NEXT 1998 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"); 1999 tt_printf ("\033[B");
1533 else 2000 else
1534 switch (ev.button) 2001 switch (ev.button)
1535 { 2002 {
1536 case Button2: 2003 case Button2:
… …
1543 tt_printf ("\033[5~"); 2010 tt_printf ("\033[5~");
1544 break; 2011 break;
1545 } 2012 }
1546 } 2013 }
1547 else 2014 else
1548#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
1549
1550 {
1551 char upordown = 0;
1552
1553 if (scrollBar.style == R_SB_NEXT)
1554 { 2016 {
1555 if (scrollbarnext_upButton (ev.y)) 2017 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 { 2018 {
1569#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2020 if (!cont_scroll_ev.is_active ())
1570 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1571#endif 2022#endif
1572 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
1573 { 2024 {
1574 if (upordown < 0) 2025 if (direction == UP)
1575 scrollBar.setUp (); 2026 scrollBar.state = SB_STATE_UP;
1576 else 2027 else
1577 scrollBar.setDn (); 2028 scrollBar.state = SB_STATE_DOWN;
1578 } 2029 }
1579 } 2030 }
1580 else 2031 else
1581 switch (ev.button) 2032 switch (ev.button)
1582 { 2033 {
1583 case Button2: 2034 case Button2:
1584 switch (scrollbar_align) 2035 switch (scrollBar.align)
1585 { 2036 {
1586 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
1587 csrO = 0; 2038 csrO = 0;
1588 break; 2039 break;
1589 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
1590 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
1591 break; 2042 break;
1592 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
1594 break; 2045 break;
1595 } 2046 }
2047
1596 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == SB_STYLE_XTERM
1597 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1600 scrollbar_size ()); 2052
1601 scrollBar.setMotion (); 2053 scrollBar.state = SB_STATE_MOTION;
1602 break; 2054 break;
1603 2055
1604 case Button1: 2056 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
1606 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
1607 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
1608 2060
1609 case Button3: 2061 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_XTERM)
1611 { 2063 {
1612 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 2066 scr_page (UP, nrow - 1);
1615# else 2067# else
1616 scr_page (UP, TermWin.nrow / 4); 2068 scr_page (UP, nrow / 4);
1617# endif 2069# endif
1618 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 2072 scr_page (DN, nrow - 1);
1621# else 2073# else
1622 scr_page (DN, TermWin.nrow / 4); 2074 scr_page (DN, nrow / 4);
1623# endif 2075# endif
1624 else 2076 else
1625 scrollBar.setMotion (); 2077 scrollBar.state = SB_STATE_MOTION;
1626 } 2078 }
1627 else 2079 else
1628 { 2080 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2082 (nrow
1631 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
1632 / scrollbar_size ())); 2084 / scrollBar.size ()));
1633 } 2085 }
2086
1634 break; 2087 break;
1635 } 2088 }
1636 } 2089 }
2090
1637 return; 2091 return;
1638 } 2092 }
1639#if MENUBAR
1640 /*
1641 * Menubar window processing of button press
1642 */
1643 if (isMenuBarWindow (ev.window))
1644 menubar_control (ev);
1645#endif
1646} 2093}
1647 2094
1648void 2095void
1649rxvt_term::button_release (XButtonEvent &ev) 2096rxvt_term::button_release (XButtonEvent &ev)
1650{ 2097{
1651 int reportmode = 0; 2098 int reportmode = 0;
1652 2099
1653 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2101 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2103
1657 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1658 { 2105 {
1659 scrollBar.setIdle (); 2106 scrollBar.state = SB_STATE_IDLE;
1660 scrollbar_show (0); 2107 scrollBar.show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH;
1663#endif
1664
1665 } 2108 }
2109
1666#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
1669#endif 2112#endif
2113
1670 if (ev.window == TermWin.vt) 2114 if (ev.window == vt)
1671 { 2115 {
2116 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2117 return;
2118
2119#if ISO_14755
2120 // 5.4
2121 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2122 return;
2123#endif
2124
1672 if (reportmode) 2125 if (reportmode)
1673 { 2126 {
1674 /* mouse report from vt window */ 2127 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2128 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2129 if (ev.button >= 4)
… …
1687 mouse_report (ev); 2140 mouse_report (ev);
1688 } 2141 }
1689#else /* MOUSE_REPORT_DOUBLECLICK */ 2142#else /* MOUSE_REPORT_DOUBLECLICK */
1690 MEvent.button = AnyButton; 2143 MEvent.button = AnyButton;
1691 mouse_report (ev); 2144 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2145#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2146 return;
1694 } 2147 }
2148
1695 /* 2149 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2150 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2151 * when overriding mouse reporting
1698 */ 2152 */
1699 if (PrivateModes & PrivMode_mouse_report 2153 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2154 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2155 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2156 selection_extend (ev.x, ev.y, 0);
1703 2157
1704 switch (ev.button) 2158 switch (ev.button)
1705 { 2159 {
1706 case Button1: 2160 case Button1:
1707 case Button3: 2161 case Button3:
1708 selection_make (ev.time); 2162 selection_make (ev.time);
1709 break; 2163 break;
2164
1710 case Button2: 2165 case Button2:
1711 selection_request (ev.time, ev.x, ev.y); 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1712 break; 2168 break;
2169
1713#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
1714 case Button4: 2171 case Button4:
1715 case Button5: 2172 case Button5:
1716 { 2173 {
1717 int i; 2174 int i;
… …
1719 2176
1720 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
1721 2178
1722 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
1723 i = 1; 2180 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2181 else if (option (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2182 i = nrow - 1;
1726 else 2183 else
1727 i = 5; 2184 i = 5;
1728 2185
1729# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
1731 { 2188 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2190 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; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2192
1736 if (slip_wheel_ev.at < NOW) 2193 if (!slip_wheel_ev.is_active ())
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1738
1739 slip_wheel_ev.start ();
1740 } 2195 }
1741 else 2196 else
2197# endif
1742 { 2198 {
1743# endif
1744# ifdef JUMP_MOUSE_WHEEL
1745 scr_page (v, i); 2199 scr_page (v, i);
1746 scr_refresh (SMOOTH_REFRESH);
1747 scrollbar_show (1); 2200 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 } 2201 }
1758#endif
1759 } 2202 }
1760 break; 2203 break;
1761#endif 2204#endif
1762 } 2205 }
1763 } 2206 }
1764#ifdef MENUBAR
1765 else if (isMenuBarWindow (ev.window))
1766 menubar_control (ev);
1767#endif
1768} 2207}
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 2208
2243/*}}} */ 2209/*}}} */
2244 2210
2245bool 2211void
2246rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2247{ 2213{
2248 bool flag = false;
2249 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2250 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2251 2216
2252 for (;;) 2217 for (;;)
2253 { 2218 {
2254 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2255 { 2220 {
2256 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2257 ch = next_char (); 2222 ch = next_char ();
2258 }
2259 2223
2260 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2261 break; 2225 break;
2226 }
2262 2227
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 {
2230 if (ecb_unlikely (!seen_input))
2264 { 2231 {
2232 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs
2236 // then sometimes get the size wrong.
2237 // unfortunately other programs are even more buggy and dislike
2238 // being sent SIGWINCH, so only do it when we were in fact being
2239 // resized.
2240 if (seen_resize && cmd_pid)
2241 kill (-cmd_pid, SIGWINCH);
2242 }
2243
2265 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2246 bool refreshnow = false;
2268 int nlines = 0; 2247 int nlines = 0;
2269 unicode_t *str = buf; 2248 wchar_t *str = buf;
2270 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2250
2273 for (;;) 2251 for (;;)
2274 { 2252 {
2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break;
2255
2256 *str++ = ch;
2257
2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2259 {
2260 if (ch == C0_LF)
2261 nlines++;
2262
2263 refresh_count++;
2264
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2272 ch = NOCHAR;
2273 break;
2274 }
2275 }
2276
2277 // scr_add_lines only works for nlines <= nrow - 1.
2278 if (nlines >= nrow - 1)
2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2282 scr_add_lines (buf, str - buf, nlines);
2283
2284 nlines = 0;
2285 str = buf;
2286 eol = str + min (ncol, UBUFSIZ);
2287 }
2288
2289 if (str >= eol)
2290 {
2291 if (eol >= buf + UBUFSIZ)
2292 {
2293 ch = NOCHAR;
2294 break;
2295 }
2296 else
2297 eol = min (eol + ncol, buf + UBUFSIZ);
2298 }
2299
2300 }
2301
2275 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2276 ch = next_char (); 2303 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 } 2304 }
2312 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2313 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2314 2309
2315 /* 2310 /*
2316 * If there have been a lot of new lines, then update the screen 2311 * 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. 2312 * 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 2313 * 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 */ 2314 */
2324 if (refreshnow) 2315 if (refreshnow)
2325 { 2316 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++;
2328 else
2329 scr_refresh (refresh_type); 2317 scr_refresh ();
2318 want_refresh = 1;
2330 } 2319 }
2331
2332 } 2320 }
2333 else 2321 else
2334 { 2322 {
2335 try 2323 try
2336 { 2324 {
… …
2344 } 2332 }
2345 2333
2346 ch = NOCHAR; 2334 ch = NOCHAR;
2347 } 2335 }
2348 } 2336 }
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} 2337}
2361 2338
2362// read the next character 2339// read the next character
2363unicode_t 2340wchar_t
2364rxvt_term::next_char () 2341rxvt_term::next_char () NOTHROW
2365{ 2342{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2344 {
2368 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2369 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2370 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2371 2348
2372 wchar_t wc; 2349 wchar_t wc;
2373 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2374 2351
2375 if (len == (size_t)-2) 2352 if (len == (size_t)-2)
2376 { 2353 {
2377 // the mbstate stores incomplete sequences. didn't know this :/ 2354 // the mbstate stores incomplete sequences. didn't know this :/
2378 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2356 break;
2380 } 2357 }
2381 2358
2382 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2384 2364
2385 // assume wchar == unicode 2365 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2387 return wc; 2367 return wc & UNICODE_MASK;
2388 } 2368 }
2389 2369
2390 return NOCHAR; 2370 return NOCHAR;
2391} 2371}
2392 2372
2393/* rxvt_cmd_getc () - Return next input character */ 2373// read the next octet
2394/* 2374uint32_t
2395 * Return the next input character after first passing any keyboard input 2375rxvt_term::next_octet () NOTHROW
2396 * to the command.
2397 */
2398unicode_t
2399rxvt_term::cmd_getc ()
2400{ 2376{
2377 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR;
2380}
2381
2382static class out_of_input out_of_input;
2383
2384wchar_t
2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{
2401 unicode_t c = next_char (); 2387 wchar_t c = next_char ();
2402 2388
2403 if (c == NOCHAR) 2389 if (c == NOCHAR)
2404 throw out_of_input; 2390 throw out_of_input;
2405 2391
2406 return c; 2392 return c;
2407} 2393}
2408 2394
2409unicode_t 2395uint32_t
2410rxvt_term::cmd_get8 () 2396rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2397{
2412 unicode_t c = next_octet (); 2398 uint32_t c = next_octet ();
2413 2399
2414 if (c == NOCHAR) 2400 if (c == NOCHAR)
2415 throw out_of_input; 2401 throw out_of_input;
2416 2402
2417 return c; 2403 return c;
… …
2421/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2422#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2423FILE * 2409FILE *
2424rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2425{ 2411{
2426 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427 2413
2428 if (stream == NULL) 2414 if (stream == NULL)
2429 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2430 2416
2431 return stream; 2417 return stream;
… …
2442 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2443 */ 2429 */
2444void 2430void
2445rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2446{ 2432{
2447 int done; 2433 FILE *fd = popen_printer ();
2448 FILE *fd;
2449 2434
2450 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2451 return; 2436 return;
2452 2437
2453 /* 2438 /*
2454 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2455 * is received. 2440 * is received.
2456 */ 2441 */
2457 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2458 { 2443 {
2459 unsigned char buf[8]; 2444 unsigned char buf[8];
2460 unicode_t ch; 2445 unicode_t ch;
2461 unsigned int i, len; 2446 unsigned int i, len;
2462 2447
… …
2481 { 2466 {
2482 if ((buf[len++] = cmd_getc ()) == 'i') 2467 if ((buf[len++] = cmd_getc ()) == 'i')
2483 break; /* done = 1 */ 2468 break; /* done = 1 */
2484 } 2469 }
2485 } 2470 }
2486 2471
2487 for (i = 0; i < len; i++) 2472 for (i = 0; i < len; i++)
2488 if (putc (buf[i], fd) == EOF) 2473 if (putc (buf[i], fd) == EOF)
2489 { 2474 {
2490 done = 1; 2475 done = 1;
2491 break; 2476 break;
… …
2493 } 2478 }
2494 } 2479 }
2495 2480
2496 pclose_printer (fd); 2481 pclose_printer (fd);
2497} 2482}
2498#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2499/*}}} */ 2484/*}}} */
2500 2485
2501/* *INDENT-OFF* */
2502enum { 2486enum {
2503 C1_40 = 0x40, 2487 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 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, 2489 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, 2490 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, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2492};
2509/* *INDENT-ON* */
2510 2493
2511/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2512void 2495void
2513rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2497{
… …
2517 case C0_ESC: 2500 case C0_ESC:
2518 process_escape_seq (); 2501 process_escape_seq ();
2519 break; 2502 break;
2520 case C0_ENQ: /* terminal Status */ 2503 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2504 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2505 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2524 else 2506 else
2525 tt_write ((unsigned char *)VT100_ANS, 2507 tt_write (VT100_ANS, strlen (VT100_ANS));
2526 (unsigned int)STRLEN (VT100_ANS));
2527 break; 2508 break;
2528 case C0_BEL: /* bell */ 2509 case C0_BEL: /* bell */
2529 scr_bell (); 2510 scr_bell ();
2530 break; 2511 break;
2531 case C0_BS: /* backspace */ 2512 case C0_BS: /* backspace */
… …
2555 process_dcs_seq (); 2536 process_dcs_seq ();
2556 break; 2537 break;
2557 case 0x9b: /* CSI */ 2538 case 0x9b: /* CSI */
2558 process_csi_seq (); 2539 process_csi_seq ();
2559 break; 2540 break;
2560 case 0x9d: /* CSI */ 2541 case 0x9d: /* OSC */
2561 process_osc_seq (); 2542 process_osc_seq ();
2562 break; 2543 break;
2563#endif 2544#endif
2564 } 2545 }
2565} 2546}
… …
2609 break; 2590 break;
2610 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2611 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2612 break; 2593 break;
2613 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2614 PrivMode (0, PrivMode_vt52); 2595 priv_modes &= ~PrivMode_vt52;
2615 break; 2596 break;
2616 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2617 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2618 /* unimplemented */ 2599 /* unimplemented */
2619 break; 2600 break;
… …
2630void 2611void
2631rxvt_term::process_escape_seq () 2612rxvt_term::process_escape_seq ()
2632{ 2613{
2633 unicode_t ch = cmd_getc (); 2614 unicode_t ch = cmd_getc ();
2634 2615
2635 if (PrivateModes & PrivMode_vt52) 2616 if (priv_modes & PrivMode_vt52)
2636 { 2617 {
2637 process_escape_vt52 (ch); 2618 process_escape_vt52 (ch);
2638 return; 2619 return;
2639 } 2620 }
2640 2621
2641 switch (ch) 2622 switch (ch)
2642 { 2623 {
2643 /* case 1: do_tek_mode (); break; */
2644 case '#': 2624 case '#':
2645 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2646 scr_E (); 2626 scr_E ();
2647 break; 2627 break;
2648 case '(': 2628 case '(':
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2635 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2636 break;
2657 case '+': 2637 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2638 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2639 break;
2660#ifndef NO_FRILLS 2640#if !ENABLE_MINIMAL
2661 case '6': 2641 case '6':
2662 scr_backindex (); 2642 scr_backindex ();
2663 break; 2643 break;
2664#endif 2644#endif
2665 case '7': 2645 case '7':
2666 scr_cursor (SAVE); 2646 scr_cursor (SAVE);
2667 break; 2647 break;
2668 case '8': 2648 case '8':
2669 scr_cursor (RESTORE); 2649 scr_cursor (RESTORE);
2670 break; 2650 break;
2671#ifndef NO_FRILLS 2651#if !ENABLE_MINIMAL
2672 case '9': 2652 case '9':
2673 scr_forwardindex (); 2653 scr_forwardindex ();
2674 break; 2654 break;
2675#endif 2655#endif
2656 // DECPAM/DECPNM
2676 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2677 case '>': 2660 case '>':
2678 PrivMode ((ch == '='), PrivMode_aplKP); 2661 priv_modes &= ~PrivMode_aplKP;
2679 break; 2662 break;
2680 2663
2681 case C1_40: 2664 case C1_40:
2682 cmd_getc (); 2665 cmd_getc ();
2683 break; 2666 break;
… …
2686 break; 2669 break;
2687 2670
2688 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2689 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2690 { 2673 {
2691 unicode_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2692 scr_add_lines (nlcr, 1, 2); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2693 } 2676 }
2694 break; 2677 break;
2695 2678
2696 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2697 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2698 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2699 break; 2684 break;
2700 2685
2701 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2702 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2703 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2707 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2708 scr_index (DN); 2693 scr_index (DN);
2709 break; 2694 break;
2710 2695
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2713 2698
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2716 2701
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2704 process_dcs_seq ();
2720 break; 2705 break;
2721 2706
2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2723 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
2724 tt_write ((const unsigned char *)ESCZ_ANSWER, 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2725 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2726 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
2727 2711
2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2729 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
2730 process_csi_seq (); 2714 process_csi_seq ();
2731 break; 2715 break;
2732 2716
2733 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2734 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
2735 process_osc_seq (); 2719 process_osc_seq ();
2736 break; 2720 break;
2737 2721
2738 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2739 case 'c': 2723 case 'c':
2740 mbstate.reset (); 2724 mbstate.reset ();
2741 scr_poweron (); 2725 scr_poweron ();
2742 scrollbar_show (1); 2726 scrollBar.show (1);
2743 break; 2727 break;
2744 2728
2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2729 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2746 case 'n': 2730 case 'n':
2747 scr_charset_choose (2); 2731 scr_charset_choose (2);
… …
2754 } 2738 }
2755} 2739}
2756/*}}} */ 2740/*}}} */
2757 2741
2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2759/* *INDENT-OFF* */
2760enum { 2743enum {
2761 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2762 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 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 , 2746 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, 2747 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, 2750 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 , 2751 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 2752 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2770}; 2753};
2771 2754
2772#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2773 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2774 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2775#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
2776 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2777 2760
2778const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
2779 { 2762 {
2780 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2763 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, */ 2764 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, */ 2765 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, [, \, ], ^, _, */ 2766 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, */ 2767 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, */ 2768 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, */ 2769 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, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2788 }; 2771 };
2789/* *INDENT-ON* */
2790 2772
2791void 2773void
2792rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2793{ 2775{
2794 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
2795 unsigned int nargs, p; 2777 unsigned int nargs, p;
2796 int n, ndef; 2778 int n, ndef;
2797 int arg[ESC_ARGS]; 2779 int arg[ESC_ARGS] = { };
2798 2780
2799 for (nargs = ESC_ARGS; nargs > 0;) 2781 nargs = 0;
2800 arg[--nargs] = 0;
2801 2782
2802 priv = 0; 2783 priv = 0;
2803 ch = cmd_getc (); 2784 ch = cmd_getc ();
2804 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2786 {
2805 { /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
2806 priv = ch; 2788 priv = ch;
2807 ch = cmd_getc (); 2789 ch = cmd_getc ();
2808 } 2790 }
2809 2791
2810 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
2839 ndef = get_byte_array_bit (csi_defaults, i); 2821 ndef = get_byte_array_bit (csi_defaults, i);
2840 for (p = 0; p < nargs; p++) 2822 for (p = 0; p < nargs; p++)
2841 if (arg[p] == -1) 2823 if (arg[p] == -1)
2842 arg[p] = ndef; 2824 arg[p] = ndef;
2843 2825
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 /* 2826 /*
2852 * private mode handling 2827 * private mode handling
2853 */ 2828 */
2854 if (priv) 2829 if (priv)
2855 { 2830 {
2856 switch (priv) 2831 switch (priv)
2857 { 2832 {
2858 case '>': 2833 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 2834 if (ch == CSI_DA) /* secondary device attributes */
2835 {
2836 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2837 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2838 //
2839 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2840 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2841 // versions.
2842 //
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2843 tt_printf ("\033[>%d;95;0c", 'U');
2844 }
2861 break; 2845 break;
2846
2862 case '?': 2847 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 2850 break;
2851
2852 case '!':
2853 if (ch == CSI_70)
2854 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset ();
2857
2858 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2860
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2866 } 2863 }
2864 break;
2865 }
2866
2867 return; 2867 return;
2868 } 2868 }
2869 2869
2870 switch (ch) 2870 switch (ch)
2871 { 2871 {
… …
2970 2970
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 2972 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 2973 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 2976 break;
2977 2977
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 2979 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2980 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 2980 break;
2982 2981
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2982 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 2983 process_sgr_mode (nargs, arg);
2985 break; 2984 break;
… …
2992 break; 2991 break;
2993 case 6: /* CPR requested */ 2992 case 6: /* CPR requested */
2994 scr_report_position (); 2993 scr_report_position ();
2995 break; 2994 break;
2996 case 7: /* unofficial extension */ 2995 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 2996 if (option (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2997 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 2998 break;
3000 case 8: /* unofficial extension */ 2999 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3000 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3001 break;
3003 } 3002 }
… …
3039 break; 3038 break;
3040 3039
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3040 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3041 if (arg[0] == 4)
3043 scr_insert_mode (0); 3042 scr_insert_mode (0);
3043 else if (arg[0] == 20)
3044 priv_modes &= ~PrivMode_LFNL;
3044 break; 3045 break;
3045 3046
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3047 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3048 if (arg[0] == 4)
3048 scr_insert_mode (1); 3049 scr_insert_mode (1);
3050 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL;
3049 break; 3052 break;
3050 3053
3051 /* 3054 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3055 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3056 */
… …
3065 break; 3068 break;
3066 case CSI_75: 3069 case CSI_75:
3067 scr_cursor (RESTORE); 3070 scr_cursor (RESTORE);
3068 break; 3071 break;
3069 3072
3070#ifndef NO_FRILLS 3073#if !ENABLE_MINIMAL
3071 case CSI_74: 3074 case CSI_74:
3072 process_window_ops (arg, nargs); 3075 process_window_ops (arg, nargs);
3073 break; 3076 break;
3074#endif 3077#endif
3075 3078
… …
3082 break; 3085 break;
3083 } 3086 }
3084} 3087}
3085/*}}} */ 3088/*}}} */
3086 3089
3087#ifndef NO_FRILLS 3090#if !ENABLE_MINIMAL
3088/* ARGSUSED */
3089void 3091void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3093{
3092 int x, y; 3094 int x, y;
3093 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
3094 Window wdummy; 3096 Window wdummy;
3097
3098 dLocal (Display *, dpy);
3095 3099
3096 if (nargs == 0) 3100 if (nargs == 0)
3097 return; 3101 return;
3098 3102
3099 switch (args[0]) 3103 switch (args[0])
3100 { 3104 {
3101 /* 3105 /*
3102 * commands 3106 * commands
3103 */ 3107 */
3104 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3109 XMapWindow (dpy, parent);
3106 break; 3110 break;
3107 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3112 XIconifyWindow (dpy, parent, display->screen);
3109 DefaultScreen (display->display));
3110 break; 3113 break;
3111 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3113 break; 3116 break;
3114 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3119 break;
3117 case 5: /* raise window */ 3120 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3121 XRaiseWindow (dpy, parent);
3119 break; 3122 break;
3120 case 6: /* lower window */ 3123 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3124 XLowerWindow (dpy, parent);
3122 break; 3125 break;
3123 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3124 scr_touch (true); 3127 scr_touch (true);
3125 break; 3128 break;
3126 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3130 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3131 (unsigned int) (args[1] * fheight));
3129 break; 3132 break;
3130 3133
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3134 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3135 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3136 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3137 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3138 (unsigned int) (args[1] * fheight));
3136 break; 3139 break;
3137
3138 3140
3139 /* 3141 /*
3140 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3141 */ 3143 */
3142 case 11: /* report window state */ 3144 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3147 break;
3146 case 13: /* report window position */ 3148 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3154 break;
3153 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3158 break;
3157 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3161 break;
3160 case 19: /* report window size (chars) */ 3162 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3164 break;
3163 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3166 {
3166 char *s; 3167 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3170 XFree (s);
3169 } 3171 }
3170 break; 3172 break;
3171 case 21: /* report window title */ 3173 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3174 {
3174 char *s; 3175 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3178 XFree (s);
3177 } 3179 }
3178 break; 3180 break;
3179 } 3181 }
3180} 3182}
3181#endif 3183#endif
3182 3184
3183/*----------------------------------------------------------------------*/ 3185/*----------------------------------------------------------------------*/
3184/* 3186/*
3185 * get input up until STRING TERMINATOR (or BEL) 3187 * get input up until STRING TERMINATOR (or BEL)
3186 * ends_how is terminator used. returned input must be free()'d 3188 * ends_how is terminator used. returned input must be free()'d
3187 */ 3189 */
3188unsigned char * 3190char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3191rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3192{
3191 unicode_t prev = 0, ch; 3193 unicode_t ch;
3194 bool seen_esc = false;
3192 unsigned int n = 0; 3195 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3196 wchar_t string[STRING_MAX];
3195 3197
3196 while ((ch = cmd_getc ()) != NOCHAR) 3198 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3199 {
3198 if (prev == C0_ESC) 3200 if (seen_esc)
3199 { 3201 {
3200 if (ch == 0x5c) /* 7bit ST */ 3202 if (ch == 0x5c) /* 7bit ST */
3201 break; 3203 break;
3202 else 3204 else
3203 return NULL; 3205 return NULL;
3204 } 3206 }
3207 else if (ch == C0_ESC)
3208 {
3209 seen_esc = true;
3210 continue;
3211 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3212 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3213 break;
3214 else if (ch == C0_SYN)
3215 ch = cmd_get8 ();
3207 else if (ch < 0x20) 3216 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3217 return NULL; /* other control character - exit */
3209 3218
3210 if (n >= sizeof (string) - 1) 3219 seen_esc = false;
3220
3221 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3222 // stop at some sane length
3212 return NULL; 3223 return NULL;
3213 3224
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
3220 string[n++] = prev = ch; 3225 string[n++] = ch;
3221 } 3226 }
3222 3227
3223 string[n++] = '\0'; 3228 string[n++] = '\0';
3224 3229
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3230 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3231
3230 return s; 3232 return rxvt_wcstombs (string);
3231} 3233}
3232 3234
3233/*----------------------------------------------------------------------*/ 3235/*----------------------------------------------------------------------*/
3234/* 3236/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3237 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3236 */ 3238 */
3237void 3239void
3238rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3239{ 3241{
3240 unsigned char *s;
3241 unicode_t eh;
3242
3243 /* 3242 /*
3244 * Not handled yet 3243 * Not handled yet
3245 */ 3244 */
3245
3246 unicode_t eh;
3246 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3247 if (s) 3248 if (s)
3248 free (s); 3249 free (s);
3249 3250
3250 return; 3251 return;
3251} 3252}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3257 */
3257void 3258void
3258rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3259{ 3260{
3260 unicode_t ch, eh;
3261 int arg; 3261 int arg;
3262 3262
3263 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3266 3266
3267 if (ch == ';') 3267 if (ch == ';')
3268 { 3268 {
3269 unicode_t eh;
3269 unsigned char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3270 3271
3271 if (s) 3272 if (s)
3272 { 3273 {
3273 process_xterm_seq (arg, (char *)s, eh); 3274 process_xterm_seq (arg, s, eh);
3274 free (s); 3275 free (s);
3275 } 3276 }
3276 } 3277 }
3277} 3278}
3278 3279
3279void 3280void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3281{ 3282{
3282 if (str[0] == '?' && !str[1]) 3283 if (str[0] == '?' && !str[1])
3283 { 3284 {
3284 if (Options & Opt_insecure) 3285 rgba c;
3285 { 3286 pix_colors_focused[color].get (c);
3286 unsigned short r, g, b; 3287
3287 PixColorsFocused[color].get (display, r, g, b); 3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3289 }
3290 } 3294 }
3291 else 3295 else
3292 set_window_color (color, str); 3296 set_window_color (color, str);
3293} 3297}
3294 3298
3295/* 3299/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * 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 */ 3301 */
3320void 3302void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3304{
3323 int changed = 0;
3324 int color; 3305 int color;
3325 char *buf, *name; 3306 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3308 int saveop = op;
3309
3310 dLocal (Display *, dpy);
3327 3311
3328 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3329 switch (op) 3317 switch (op)
3330 { 3318 {
3331 case XTerm_name: 3319 case XTerm_name:
3332 set_title (str); 3320 set_title (str);
3333 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
… …
3338 set_title (str); 3326 set_title (str);
3339 break; 3327 break;
3340 case XTerm_property: 3328 case XTerm_property:
3341 if (str[0] == '?') 3329 if (str[0] == '?')
3342 { 3330 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3331 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3332 Atom actual_type;
3345 int actual_format; 3333 int actual_format;
3346 unsigned long nitems; 3334 unsigned long nitems;
3347 unsigned long bytes_after; 3335 unsigned long bytes_after;
3348 unsigned char *value = 0; 3336 unsigned char *value = 0;
3349 const char *str = ""; 3337 const char *str = "";
3350 3338
3351 if (prop 3339 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3340 && XGetWindowProperty (dpy, parent,
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3344 && actual_type != None
3357 && actual_format == 8) 3345 && actual_format == 8)
3358 str = (const char *)(value); 3346 str = (const char *)(value);
3359 3347
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3361 3349
3362 XFree (value); 3350 XFree (value);
3363 } 3351 }
3364 else 3352 else
3365 { 3353 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3367 3355
3368 if (eq) 3356 if (eq)
3369 { 3357 {
3370 *eq = 0; 3358 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3359 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 } 3360 }
3376 else 3361 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3362 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3363 display->atom (str));
3379 } 3364 }
3380 break; 3365 break;
3381 3366
3382 case XTerm_Color: 3367 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3368 for (buf = (char *)str; buf && *buf;)
3384 { 3369 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3370 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3371 break;
3387 3372
3388 *name++ = '\0'; 3373 *name++ = '\0';
3389 color = atoi (buf); 3374 color = atoi (buf) + minCOLOR;
3390 3375
3391 if (color < 0 || color >= TOTAL_COLORS) 3376 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3392 break; 3377 break;
3393 3378
3394 if ((buf = STRCHR (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3380 *buf++ = '\0';
3396 3381
3397 if (name[0] == '?' && !name[1]) 3382 process_color_seq (op, color, name, resp);
3398 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 }
3406 else
3407 set_window_color (color + minCOLOR, name);
3408 } 3383 }
3409 break; 3384 break;
3385 case Rxvt_restoreFG:
3410 case XTerm_Color00: 3386 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3387 process_color_seq (op, Color_fg, str, resp);
3412 break; 3388 break;
3389 case Rxvt_restoreBG:
3413 case XTerm_Color01: 3390 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3391 process_color_seq (op, Color_bg, str, resp);
3415 break; 3392 break;
3416#ifndef NO_CURSORCOLOR 3393#ifndef NO_CURSORCOLOR
3417 case XTerm_Color_cursor: 3394 case XTerm_Color_cursor:
3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3395 process_color_seq (op, Color_cursor, str, resp);
3419 break; 3396 break;
3420#endif 3397#endif
3421 case XTerm_Color_pointer_fg: 3398 case XTerm_Color_pointer_fg:
3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3399 process_color_seq (op, Color_pointer_fg, str, resp);
3423 break; 3400 break;
3424 case XTerm_Color_pointer_bg: 3401 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3402 process_color_seq (op, Color_pointer_bg, str, resp);
3426 break; 3403 break;
3404#ifdef OPTION_HC
3405 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp);
3407 break;
3408 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp);
3410 break;
3411#endif
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3413 case URxvt_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3430 break; 3415 break;
3431 case XTerm_Color_UL: 3416 case URxvt_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3433 break; 3418 break;
3434 case XTerm_Color_RV: 3419 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp);
3421 break;
3422#endif
3423 case URxvt_Color_border:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3424 process_color_seq (op, Color_border, str, resp);
3436 break; 3425 break;
3437#endif 3426#if ENABLE_TRANSPARENCY
3427 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp);
3429 {
3430 bool changed = false;
3438 3431
3432 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3434
3435 if (changed)
3436 update_background ();
3437 }
3438
3439 break;
3440#endif
3441
3442#if BG_IMAGE_FROM_FILE
3439 case XTerm_Pixmap: 3443 case Rxvt_Pixmap:
3440 if (*str != ';') 3444 if (!strcmp (str, "?"))
3441 { 3445 {
3442#if XPM_BACKGROUND 3446 char str[256];
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 3447
3455 } 3448 sprintf (str, "[%dx%d+%d+%d]",
3456 if (changed) 3449 min (h_scale, 32767), min (v_scale, 32767),
3457 { 3450 min (h_align, 32767), min (v_align, 32767));
3458#ifdef XPM_BACKGROUND 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
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
3472 case XTerm_logfile:
3473 // TODO, when secure mode?
3474 break;
3475
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 } 3452 }
3497 else 3453 else
3498 { 3454 {
3499 set_locale (str); 3455 bool changed = false;
3500# ifdef USE_XIM 3456
3501 im_cb (); 3457 if (*str != ';')
3502# endif 3458 {
3459 if (bg_set_file (str)) /* change pixmap */
3460 changed = true;
3461 }
3462 else
3463 {
3464 str++;
3465 if (bg_set_geometry (str, true))
3466 changed = true;
3467 }
3468
3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3477 update_background ();
3478 }
3503 } 3479 }
3504 break; 3480 break;
3481#endif
3505 3482
3506 case XTerm_findfont: 3483 case XTerm_logfile:
3507 if (Options & Opt_insecure) 3484 // TODO, when secure mode?
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; 3485 break;
3521#endif 3486
3522#if 0 3487#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3488 case Rxvt_dumpscreen: /* no error notices */
3524 { 3489 {
3525 int fd; 3490 int fd;
3526 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3491 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3527 { 3492 {
3528 scr_dump (fd); 3493 scr_dump (fd);
3529 close (fd); 3494 close (fd);
3530 } 3495 }
3531 } 3496 }
3497 break;
3498#endif
3499 case XTerm_font:
3500 op = URxvt_font;
3501 case URxvt_font:
3502#if ENABLE_STYLES
3503 case URxvt_boldFont:
3504 case URxvt_italicFont:
3505 case URxvt_boldItalicFont:
3506#endif
3507 if (query)
3508 tt_printf ("\33]%d;%-.250s%c", saveop,
3509 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3510 ? fontset[op - URxvt_font]->fontdesc : "",
3511 resp);
3512 else
3513 {
3514 const char *&res = rs[Rs_font + (op - URxvt_font)];
3515
3516 res = strdup (str);
3517 allocated.push_back ((void *)res);
3518 set_fonts ();
3519 }
3520 break;
3521
3522 case URxvt_version:
3523 if (query)
3524 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3525 op,
3526 rs[Rs_name], VERSION[0], VERSION[2],
3527 resp);
3528 break;
3529
3530#if !ENABLE_MINIMAL
3531 case URxvt_locale:
3532 if (query)
3533 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3534 else
3535 {
3536 set_locale (str);
3537 pty->set_utf8_mode (enc_utf8);
3538 init_xlocale ();
3539 }
3540 break;
3541
3542 case URxvt_view_up:
3543 case URxvt_view_down:
3544 {
3545 int lines = atoi (str);
3546
3547 if (lines)
3548 scr_page (op == URxvt_view_up ? UP : DN, lines);
3549 else
3550 scr_erase_savelines ();
3551 }
3552
3553 break;
3554#endif
3555
3556#if ENABLE_PERL
3557 case URxvt_perl:
3558 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 break; 3559 break;
3533#endif 3560#endif
3534 } 3561 }
3535} 3562}
3536/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
… …
3550{ 3577{
3551 int state; 3578 int state;
3552 3579
3553 if (mode == 's') 3580 if (mode == 's')
3554 { 3581 {
3555 SavedModes |= (PrivateModes & bit); 3582 SavedModes |= (priv_modes & bit);
3556 return -1; 3583 return -1;
3557 } 3584 }
3558 else 3585 else
3559 { 3586 {
3560 if (mode == 'r') 3587 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3589 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3565 } 3596 }
3566 3597
3567 return state; 3598 return state;
3568} 3599}
3569 3600
3570/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3571void 3602void
3572rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3573{ 3604{
3574 unsigned int i, j; 3605 unsigned int i, j;
3575 int state; 3606 int state;
3576 3607
3577 static const struct 3608 static const struct
3578 { 3609 {
3579 const int argval; 3610 const int argval;
3580 const unsigned long bit; 3611 const unsigned long bit;
3581 }
3582
3583 argtopriv[] = { 3612 } argtopriv[] = {
3584 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
3585 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3586 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
3587 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3588 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
3589 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
3590 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
3620 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3622 // 18 end FF to printer after print screen
3593 { menuBar_esc, PrivMode_menuBar }, 3623 // 19 Print screen prints full screen/scroll region
3594#endif 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3595#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3627#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
3602 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3632 // 45 margin bell NYI
3605 // 46 start logging 3633 // 46 start logging
3606 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3607 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
3608#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3609 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
3610#endif 3638#endif
3611 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3612 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3640 { 1002, PrivMode_MouseBtnEvent },
3613 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3641 { 1003, PrivMode_MouseAnyEvent },
3614 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
3615 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3616 { 1011, PrivMode_Keypress }, // rxvt extension 3646 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3649#endif
3617 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
3618 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
3619 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
3620 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3621 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
3622 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3623 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3657 { 2004, PrivMode_BracketPaste },
3624 }; 3658 };
3625 3659
3626 if (nargs == 0) 3660 if (nargs == 0)
3627 return; 3661 return;
3628 3662
… …
3635 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3636 { 3670 {
3637 state = -1; 3671 state = -1;
3638 3672
3639 /* basic handling */ 3673 /* basic handling */
3640 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3641 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3642 { 3676 {
3643 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3644 break; 3678 break;
3645 } 3679 }
3646 3680
3647 /* extra handling for values with state unkept */ 3681 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3682 switch (arg[i])
3649 { 3683 {
3684#if ENABLE_STYLES
3685 case 1021:
3686 set_option (Opt_intensityStyles, mode);
3687
3688 scr_touch (true);
3689 break;
3690#endif
3650 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3651 if (Options & Opt_secondaryScreen) 3692 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3693 if (mode == 0)
3653 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3654 else if (mode == 1) 3695 else if (mode == 1)
3655 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
3656 break; 3697 break;
… …
3664 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3708 * within VT52 mode
3668 */ 3709 */
3669 PrivMode (1, PrivMode_vt52); 3710 priv_modes |= PrivMode_vt52;
3670 break; 3711 break;
3671 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 break; 3715 break;
3675 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3676 if (state) 3717 set_option (Opt_jumpScroll, !state);
3677 Options &= ~Opt_jumpScroll;
3678 else
3679 Options |= Opt_jumpScroll;
3680 break; 3718 break;
3681 case 5: /* reverse video */ 3719 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 3720 scr_rvideo_mode (state);
3683 break; 3721 break;
3684 case 6: /* relative/absolute origins */ 3722 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 3726 scr_autowrap (state);
3689 break; 3727 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 3728 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 3729 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3732 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 3733#ifdef scrollBar_esc
3703 case scrollBar_esc: 3734 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3735 scrollBar.map (state);
3705 {
3706 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3737 scr_touch (true);
3708 }
3709 break; 3738 break;
3710#endif 3739#endif
3711 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3712 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3713 break; 3742 break;
… …
3718 break; 3747 break;
3719 /* case 66: - application key pad */ 3748 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 3749 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 3750 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 3751 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 3752 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3753 break;
3725#if 0
3726 case 1001: 3754 case 1002:
3727 break; /* X11 mouse highlighting */ 3755 case 1003:
3728#endif 3756 if (state)
3757 {
3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3759 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3760 mouse_row = mouse_col = 0;
3761 vt_emask_mouse = PointerMotionMask;
3762 }
3763 else
3764 vt_emask_mouse = NoEventMask;
3765
3766 vt_select_input ();
3767 break;
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state)
3731 Options &= ~Opt_scrollTtyOutput;
3732 else
3733 Options |= Opt_scrollTtyOutput; 3769 set_option (Opt_scrollTtyOutput, !state);
3734 break; 3770 break;
3735 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
3736 if (state)
3737 Options |= Opt_scrollTtyKeypress; 3772 set_option (Opt_scrollTtyKeypress, state);
3738 else
3739 Options &= ~Opt_scrollTtyKeypress;
3740 break; 3773 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 3775 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3776 if (!state)
3744 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
3745 scr_change_screen (state); 3779 scr_change_screen (state);
3746 break; 3780 break;
3747 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3782 if (option (Opt_secondaryScreen))
3783 if (state)
3784 scr_cursor (SAVE);
3785
3748 scr_change_screen (state); 3786 scr_change_screen (state);
3787
3749 if (Options & Opt_secondaryScreen) 3788 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3789 if (state)
3751 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
3752 break; 3793 break;
3753 default: 3794 default:
3754 break; 3795 break;
3755 } 3796 }
3756 } 3797 }
… …
3780 rendset = 0, rendstyle = ~RS_None; 3821 rendset = 0, rendstyle = ~RS_None;
3781 break; 3822 break;
3782 case 1: 3823 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 3824 rendset = 1, rendstyle = RS_Bold;
3784 break; 3825 break;
3785 //case 2: // faint or second colour 3826 //case 2: // low intensity
3827 case 3:
3828 rendset = 1, rendstyle = RS_Italic;
3829 break;
3786 case 4: 3830 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 3831 rendset = 1, rendstyle = RS_Uline;
3788 break; 3832 break;
3789 case 5: // slowly blinking 3833 case 5: // slowly blinking
3790 case 6: // rapidly blinking 3834 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 3846 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 3847 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 3848 //...
3805 //case 19: // ninth alt font 3849 //case 19: // ninth alt font
3806 //case 20: // gothic 3850 //case 20: // gothic
3807 case 21: // disable bold, faint 3851 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 3852 rendset = 0, rendstyle = RS_Bold;
3809 break; 3853 break;
3810 case 22: 3854 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 3855 rendset = 0, rendstyle = RS_Bold;
3812 break; 3856 break;
3813 //case 23: disable italic 3857 case 23: // disable italic
3858 rendset = 0, rendstyle = RS_Italic;
3859 break;
3814 case 24: 3860 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 3861 rendset = 0, rendstyle = RS_Uline;
3816 break; 3862 break;
3817 case 25: 3863 case 25:
3864 rendset = 0, rendstyle = RS_Blink;
3865 break;
3866 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 3867 rendset = 0, rendstyle = RS_Blink;
3819 break; 3868 break;
3820 case 27: 3869 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 3870 rendset = 0, rendstyle = RS_RVid;
3822 break; 3871 break;
… …
3840 case 35: 3889 case 35:
3841 case 36: 3890 case 36:
3842 case 37: 3891 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3892 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 3893 break;
3845#ifdef TTY_256COLOR 3894 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 3895 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 3896 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3897 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 3898 i += 2;
3851 } 3899 }
3852 break; 3900 break;
3853#endif
3854 case 39: /* default fg */ 3901 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 3902 scr_color (Color_fg, Color_fg);
3856 break; 3903 break;
3857 3904
3858 case 40: 3905 case 40:
… …
3863 case 45: 3910 case 45:
3864 case 46: 3911 case 46:
3865 case 47: 3912 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3913 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 3914 break;
3868#ifdef TTY_256COLOR 3915 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 3916 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 3917 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3918 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 3919 i += 2;
3874 } 3920 }
3875 break; 3921 break;
3876#endif
3877 case 49: /* default bg */ 3922 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 3923 scr_color (Color_bg, Color_bg);
3879 break; 3924 break;
3880 3925
3881#ifndef NO_BRIGHTCOLOR 3926 //case 50: // not variable spacing
3927
3928#if !ENABLE_MINIMAL
3882 case 90: 3929 case 90:
3883 case 91: /* set bright fg color */ 3930 case 91: /* set bright fg color */
3884 case 92: 3931 case 92:
3885 case 93: 3932 case 93:
3886 case 94: 3933 case 94:
3887 case 95: 3934 case 95:
3888 case 96: 3935 case 96:
3889 case 97: 3936 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3937 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 3938 break;
3893 case 100: 3939 case 100:
3894 case 101: /* set bright bg color */ 3940 case 101: /* set bright bg color */
3895 case 102: 3941 case 102:
3896 case 103: 3942 case 103:
3897 case 104: 3943 case 104:
3898 case 105: 3944 case 105:
3899 case 106: 3945 case 106:
3900 case 107: 3946 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3947 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 3948 break;
3904#endif 3949#endif
3905
3906 } 3950 }
3907 } 3951 }
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} 3952}
3927/*}}} */ 3953/*}}} */
3928 3954
3929/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3930 3956
… …
3934 */ 3960 */
3935void 3961void
3936rxvt_term::tt_printf (const char *fmt,...) 3962rxvt_term::tt_printf (const char *fmt,...)
3937{ 3963{
3938 va_list arg_ptr; 3964 va_list arg_ptr;
3939 unsigned char buf[256]; 3965 char buf[256];
3940 3966
3941 va_start (arg_ptr, fmt); 3967 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 3969 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 3970 tt_write (buf, strlen (buf));
3945} 3971}
3946 3972
3947/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 3974/* 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. 3975 * or generated by us in response to a query ESC sequence.
3950 */ 3976 */
3951void 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3955 3978
3956 if (len) 3979void
3980rxvt_term::tt_write (const char *data, unsigned int len)
3981{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return;
3984
3985 if (pty->pty < 0)
3986 return;
3987
3988 if (v_buflen == 0)
3989 {
3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3991
3992 max_it (written, 0);
3993
3994 if (written == len)
3995 return;
3996
3997 data += written;
3998 len -= written;
3957 { 3999 }
4000
4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4002
4003 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len;
4005
4006 pty_ev.set (ev::READ | ev::WRITE);
4007}
4008
4009void rxvt_term::pty_write ()
4010{
4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4012
4013 if (written > 0)
4014 {
4015 v_buflen -= written;
4016
3958 if (v_buflen == 0) 4017 if (v_buflen == 0)
3959 { 4018 {
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); 4019 free (v_buffer);
3987 v_buffer = 0; 4020 v_buffer = 0;
3988 v_buflen = 0;
3989 4021
3990 pty_ev.set (EVENT_READ); 4022 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; 4023 return;
4003 } 4024 }
4025
4026 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4027 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (ev::READ);
4005} 4030}
4006 4031
4007/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
4008 4033

Diff Legend

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