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

Diff Legend

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