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.116 by root, Wed Aug 4 03:29:28 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 want_refresh = 1;
667 } 949 }
668#endif 950#endif
669 951
670 if (want_refresh) 952 if (want_refresh)
671 { 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
672 scr_refresh (refresh_type); 992 scr_refresh ();
673 scrollbar_show (1); 993 scrollBar.show (1);
674#ifdef USE_XIM 994#ifdef USE_XIM
675 IMSendSpot (); 995 IMSendSpot ();
676#endif 996#endif
677 } 997 }
678 998
679 display->flush (); 999 display->flush ();
680
681 flush_ev.stop ();
682} 1000}
683 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
684void 1003void
685rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
686{ 1005{
687 SET_R (this); 1006 if (want_refresh && !flush_ev.is_active ())
688 SET_LOCALE (locale); 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
689 1008
690 display->flush (); 1009 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694} 1010}
695 1011
696void 1012void
697rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
698{ 1014{
699 SET_R (this); 1015 make_current ();
700 SET_LOCALE (locale);
701 1016
702 refresh_limit = 1;
703 refresh_count = 0; 1017 refresh_count = 0;
704 flush (); 1018 flush ();
705} 1019}
706 1020
707#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
708void 1022void
709rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
710{ 1024{
711 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
712 want_refresh = 1; 1026 want_refresh = 1;
713 1027 refresh_check ();
714 w.start (w.at + BLINK_INTERVAL);
715} 1028}
716#endif 1029#endif
717 1030
718#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
719void 1032void
720rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
721{ 1034{
722 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
723 { 1036 {
724 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
725 want_refresh = 1; 1038 want_refresh = 1;
726 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
727 } 1040 }
1041 else
1042 w.stop ();
728} 1043}
729#endif 1044#endif
730 1045
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
732void 1047void
733rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
734{ 1049{
735 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
736 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
737 { 1052 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1; 1053 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
741 } 1055 }
1056 else
1057 w.stop ();
742} 1058}
743#endif 1059#endif
744 1060
745#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
746void 1062void
747rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
748{ 1064{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 { 1066 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1; 1068 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
755 } 1070 }
1071 else
1072 w.stop ();
756} 1073}
757#endif 1074#endif
758 1075
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void 1077void
761rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
762{ 1079{
763 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1081 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1082 want_refresh = 1;
769 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)
770 } 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 ();
771} 1152}
772#endif 1153#endif
773 1154
774bool 1155bool
775rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
776{ 1157{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
778 1159
779 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
780 { 1161
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
782 n = 0;
783 } 1163 {
784 1164 // normally this indicates a "too long" command sequence - just drop the data we have
785 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
788 1169
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
790 1171
791 if (n > 0) 1172 if (r > 0)
792 { 1173 {
793 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
794 return true; 1175 return true;
795 } 1176 }
796 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))
797 destroy (); 1189 destroy ();
798 1190 }
1191
799 return false; 1192 return false;
800} 1193}
801 1194
802void 1195void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
804{ 1197{
805 SET_R (this); 1198 make_current ();
806 SET_LOCALE (locale);
807 1199
808 if (revents & EVENT_WRITE) 1200 if (revents & ev::READ)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
813 if (cmd_parse ()) 1203 cmd_parse ();
814 break; 1204
1205 if (revents & ev::WRITE)
1206 pty_write ();
1207
1208 refresh_check ();
815} 1209}
816 1210
817void 1211void
818rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
819{ 1213{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
821 recolour_cursor (); 1215 recolour_cursor ();
822 1216
823#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1218 hidden_pointer = 0;
825 1219
826 if (Options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
828#endif 1222#endif
829} 1223}
830 1224
831#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
832void 1226void
833rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
834{ 1228{
835 if (! (Options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
836 return; 1230 return;
837 1231
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
839 XFlush (display->display); 1233 XFlush (dpy);
840 1234
841 hidden_pointer = 1; 1235 hidden_pointer = 1;
842} 1236}
843 1237
844void 1238void
845rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
846{ 1240{
847 SET_R (this); 1241 make_current ();
848 SET_LOCALE (locale);
849 1242
850 pointer_blank (); 1243 pointer_blank ();
851} 1244}
852#endif 1245#endif
853 1246
854void 1247void
855rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
856{ 1249{
857 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
858 int x, y; 1251 int x, y;
1252 int code = 32;
859 1253
860 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
861 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
862 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 }
863 1266
864 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1268 button_number = 3;
867 }
868 else 1269 else
869 { 1270 {
870 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1273 if (button_number >= 3)
873 button_number += (64 - 3); 1274 button_number += 64 - 3;
874 } 1275 }
875 1276
876 if (PrivateModes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
877 { 1278 {
878 /* 1279 /*
879 * do not report ButtonRelease 1280 * do not report ButtonRelease
880 * no state info allowed 1281 * no state info allowed
881 */ 1282 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1297 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1298 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1299#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1300 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1301#endif
901
902 } 1302 }
903 1303
904#ifdef DEBUG_MOUSEREPORT 1304#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1305 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1306 if (key_state & 16)
907 fputc ('C', stderr); 1307 fputc ('C', stderr);
908 if (key_state & 4) 1308 if (key_state & 4)
909 fputc ('S', stderr); 1309 fputc ('S', stderr);
… …
911 fputc ('A', stderr); 1311 fputc ('A', stderr);
912 if (key_state & 32) 1312 if (key_state & 32)
913 fputc ('2', stderr); 1313 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1315 button_number,
916 x + 1, 1316 x,
917 y + 1); 1317 y);
918#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
919 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1334 code + button_number + key_state,
921 (32 + x + 1), 1335 32 + x,
922 (32 + y + 1)); 1336 32 + y);
923#endif
924} 1337}
925
926#ifdef USING_W11LIB
927void
928rxvt_W11_process_x_event (XEvent *ev)
929{
930 rxvt_t *r = rxvt_get_r ();
931
932 x_cb (*ev);
933}
934#endif
935 1338
936/*{{{ process an X event */ 1339/*{{{ process an X event */
937void 1340void
938rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
939{ 1342{
940 SET_R (this); 1343 make_current ();
941 SET_LOCALE (locale);
942 1344
943#if defined(CURSOR_BLINK) 1345 dLocal (Display *, dpy);
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951 1346
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1347 if (ev.xany.window == vt
953 } 1348 && SHOULD_INVOKE (HOOK_X_EVENT)
954#endif 1349 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return; 1350 return;
973#endif
974 1351
1352 // for XQueryPointer
975 Window unused_root, unused_child; 1353 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1354 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1355 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1356
1028 switch (ev.type) 1357 switch (ev.type)
1029 { 1358 {
1030 case KeyPress: 1359 case KeyPress:
1031 lookup_key (ev.xkey); 1360 key_press (ev.xkey);
1032 break; 1361 break;
1033 1362
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease: 1363 case KeyRelease:
1036 { 1364 key_release (ev.xkey);
1037 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0;
1046 }
1047 break; 1365 break;
1048 }
1049#endif
1050 1366
1051 case ButtonPress: 1367 case ButtonPress:
1052 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
1053 break; 1369 break;
1054 1370
… …
1056 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1057 break; 1373 break;
1058 1374
1059 case ClientMessage: 1375 case ClientMessage:
1060 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1377 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1062 destroy ();
1063#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink))
1069 { 1378 {
1070 /* Get Dnd data */ 1379 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1071 Atom ActualType; 1380 {
1072 int ActualFormat; 1381 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1073 unsigned char *data; 1382 {
1074 unsigned long Size, RemainingBytes; 1383 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1075 1384 {
1076 XGetWindowProperty (display->display, display->root, 1385 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1077 xa[XA_DNDSELECTION], 1386 destroy ();
1078 0L, 1000000L, 1387 }
1079 False, AnyPropertyType, 1388#if ENABLE_EWMH
1080 &ActualType, &ActualFormat, 1389 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1081 &Size, &RemainingBytes, 1390 XSendEvent (dpy, ev.xclient.window = display->root,
1391 False, SubstructureRedirectMask | SubstructureNotifyMask,
1082 &data); 1392 &ev);
1083 XChangeProperty (display->display, display->root, 1393#endif
1084 XA_CUT_BUFFER0, XA_STRING, 1394 }
1085 8, PropModeReplace, 1395 }
1086 data, STRLEN (data)); 1396#if ENABLE_XEMBED
1087 XFree (data); 1397 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1398 {
1089 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
1090 } 1405 }
1091#endif /* OFFIX_DND */
1092 break;
1093
1094 case MappingNotify:
1095 XRefreshKeyboardMapping (&ev.xmapping);
1096 break; 1406 break;
1097 1407
1098 /* 1408 /*
1099 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1100 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1119 break; 1429 break;
1120 } 1430 }
1121 break; 1431 break;
1122 1432
1123 case FocusIn: 1433 case FocusIn:
1124 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)
1125 { 1449 {
1126 TermWin.focus = 1; 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1451 ;
1128#ifdef USE_XIM 1452
1129 if (Input_Context != NULL) 1453#ifdef HAVE_BG_PIXMAP
1130 XSetICFocus (Input_Context); 1454 bool moved = false;
1131#endif 1455 if (bg_window_position_sensitive ())
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1456 {
1139 PixColors = PixColorsFocused; 1457 int x, y;
1140 set_colorfgbg (); 1458 if (ev.xconfigure.send_event)
1141 scr_clear (); 1459 {
1142 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;
1143 } 1469 }
1144#endif 1470#endif
1145 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));
1146 } 1491 }
1147 break; 1492 break;
1148 1493
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1494 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1178 {
1179 int height, width;
1180
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1496 break;
1202 1497
1203 case SelectionClear: 1498 case SelectionClear:
1204 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1205 break;
1206
1207 case SelectionNotify:
1208 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor,
1210 ev.xselection.property, True);
1211 break; 1500 break;
1212 1501
1213 case SelectionRequest: 1502 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1215 break; 1504 break;
1216 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
1217 case UnmapNotify: 1530 case UnmapNotify:
1218 TermWin.mapped = 0; 1531 mapped = 0;
1219#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1221#endif 1534#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1222 break; 1536 break;
1223
1224 case MapNotify:
1225 TermWin.mapped = 1;
1226#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif
1229 break;
1230
1231#ifdef TRANSPARENT
1232 case ReparentNotify:
1233 rootwin_cb (ev);
1234 break;
1235#endif /* TRANSPARENT */
1236 1537
1237 case GraphicsExpose: 1538 case GraphicsExpose:
1238 case Expose: 1539 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1240 { 1541 {
1241 do 1542 do
1543 {
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1245 1548
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1550
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1251 1556
1252 scr_refresh (refresh_type); 1557 want_refresh = 1;
1253 } 1558 }
1254 else 1559 else
1255 { 1560 {
1256 XEvent unused_event; 1561 XEvent unused_event;
1257 1562
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1259 ; 1564 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1566 ;
1262 1567
1263 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1264 { 1569 {
1265 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1266 scrollbar_show (0); 1571 scrollBar.show (0);
1267 } 1572 }
1268#ifdef MENUBAR
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose ();
1271#endif
1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1276#endif
1277 } 1573 }
1278 break; 1574 break;
1279 1575
1280 case MotionNotify: 1576 case MotionNotify:
1281#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1282 if (hidden_pointer) 1578 if (hidden_pointer)
1283 pointer_unblank (); 1579 pointer_unblank ();
1284#endif 1580#endif
1285#if MENUBAR 1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1286 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)
1287 { 1588 {
1288 menubar_control (ev.xbutton); 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1289 break; 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1290 } 1591 ; // nop
1291#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1293 break;
1294
1295 if (ev.xany.window == TermWin.vt)
1296 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1593 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1300 ; 1595 ;
1301 1596
1302 XQueryPointer (display->display, TermWin.vt, 1597 XQueryPointer (dpy, vt,
1303 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1600 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1601 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1603 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1604 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1605 {
1311#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
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1615 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1616 ev.xbutton.state & Button3Mask ? 2 : 0);
1617
1314#ifdef SELECTION_SCROLLING 1618#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1619 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1620 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1621 {
1318 int dist; 1622 int dist;
1319 1623
1320 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1322 */ 1626 */
1323 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1325 1629
1326 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1328 */ 1632 */
1329 selection_save_x=ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1634 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1635 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1636
1334 /* calc number of lines to scroll */ 1637 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1638 if (ev.xbutton.y < int_bwidth)
1336 { 1639 {
1337 scroll_selection_dir = UP; 1640 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1641 dist = int_bwidth - ev.xbutton.y;
1339 } 1642 }
1340 else 1643 else
1341 { 1644 {
1342 scroll_selection_dir = DN; 1645 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1646 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1647 }
1648
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1649 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1650 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1;
1348 MIN_IT (scroll_selection_lines, 1652 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1653 SELECTION_SCROLL_MAX_LINES);
1350 } 1654 }
1351 else 1655 else
1352 { 1656 {
1353 /* we are within the text window, so we 1657 /* we are within the text window, so we
1354 * shouldn't be scrolling 1658 * shouldn't be scrolling
1355 */ 1659 */
1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1358 } 1661 }
1359#endif 1662#endif
1360#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1361
1362 } 1664 }
1363#endif 1665#endif
1364
1365 } 1666 }
1366 } 1667 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1368 { 1669 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1370 MotionNotify, &ev)) ; 1671 MotionNotify, &ev))
1672 ;
1673
1371 XQueryPointer (display->display, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1372 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1677 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1678 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1680 scrollBar.size ());
1378 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1681 want_refresh = 1;
1380 scrollbar_show (1); 1682 scrollBar.show (1);
1381 } 1683 }
1382 break; 1684 break;
1383 } 1685 }
1384}
1385 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
1386void 1825void
1387rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1827{
1389 SET_R (this); 1828 make_current ();
1390 SET_LOCALE (locale);
1391 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
1392 switch (ev.type) 1835 switch (ev.type)
1393 { 1836 {
1394 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 */
1395 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])
1396 { 1844 {
1397 if (ev.xproperty.state == PropertyNewValue) 1845 bg_set_root_pixmap ();
1398 selection_property (ev.xproperty.window, ev.xproperty.atom); 1846 update_background ();
1399 break;
1400 } 1847 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /*
1405 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on.
1407 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410 1848
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return;
1413 }
1414
1415 /* FALLTHROUGH */
1416 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1;
1419 break; 1849 break;
1850 }
1420#endif 1851# endif
1421 } 1852
1853 refresh_check ();
1422} 1854}
1855#endif
1423 1856
1424void 1857void
1425rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1426{ 1859{
1427 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1428 1861
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1430 if (!bypass_keystate) 1864 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1866
1432 /* 1867 /*
1433 * VT window processing of button press 1868 * VT window processing of button press
1434 */ 1869 */
1435 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1436 { 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
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1885
1438 if (reportmode) 1886 if (reportmode)
1439 { 1887 {
1440 /* mouse report from vt window */ 1888 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1445 { 1893 {
1446 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1447 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1448 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1449 { 1898 {
1450 /* only report double clicks */ 1899 /* only report double clicks */
1451 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1452 mouse_report (ev); 1901 mouse_report (ev);
… …
1464 mouse_report (ev); 1913 mouse_report (ev);
1465 } 1914 }
1466#else 1915#else
1467 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1468 mouse_report (ev); 1917 mouse_report (ev);
1469#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1470 1919
1471 } 1920 }
1472 else 1921 else
1473 { 1922 {
1474 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1925
1476 switch (ev.button) 1926 switch (ev.button)
1477 { 1927 {
1478 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
1479 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1481 { 1939 {
1482 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1484 else 1942 else
1485 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1958 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1503 else 1961 else
1504 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1963
1505 MEvent.button = Button3; 1964 MEvent.button = Button3;
1506 break; 1965 break;
1507 } 1966 }
1508 } 1967 }
1968
1509 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1510 return; 1970 return;
1511 } 1971 }
1512 1972
1513 /* 1973 /*
1514 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1515 */ 1975 */
1516 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1517 { 1977 {
1518 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;
1519 /* 1986 /*
1520 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1521 * move up if mouse is above slider 1988 * move up if mouse is above slider
1522 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1523 * 1990 *
… …
1532 /* 1999 /*
1533 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1534 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1535 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1536 */ 2003 */
1537 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1538 && scrollbarnext_upButton (ev.y))
1539 || (scrollBar.style == R_SB_RXVT
1540 && scrollbarrxvt_upButton (ev.y)))
1541 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1542 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1543 && scrollbarnext_dnButton (ev.y))
1544 || (scrollBar.style == R_SB_RXVT
1545 && scrollbarrxvt_dnButton (ev.y)))
1546 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1547 else 2008 else
1548 switch (ev.button) 2009 switch (ev.button)
1549 { 2010 {
1550 case Button2: 2011 case Button2:
… …
1557 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1558 break; 2019 break;
1559 } 2020 }
1560 } 2021 }
1561 else 2022 else
1562#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1563
1564 {
1565 char upordown = 0;
1566
1567 if (scrollBar.style == R_SB_NEXT)
1568 { 2024 {
1569 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
1570 upordown = -1; /* up */
1571 else if (scrollbarnext_dnButton (ev.y))
1572 upordown = 1; /* down */
1573 }
1574 else if (scrollBar.style == R_SB_RXVT)
1575 {
1576 if (scrollbarrxvt_upButton (ev.y))
1577 upordown = -1; /* up */
1578 else if (scrollbarrxvt_dnButton (ev.y))
1579 upordown = 1; /* down */
1580 }
1581 if (upordown)
1582 { 2026 {
1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1585#endif 2030#endif
1586 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
1587 { 2032 {
1588 if (upordown < 0) 2033 if (direction == UP)
1589 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
1590 else 2035 else
1591 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
1592 } 2037 }
1593 } 2038 }
1594 else 2039 else
1595 switch (ev.button) 2040 switch (ev.button)
1596 { 2041 {
1597 case Button2: 2042 case Button2:
1598 switch (scrollbar_align) 2043 switch (scrollBar.align)
1599 { 2044 {
1600 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
1601 csrO = 0; 2046 csrO = 0;
1602 break; 2047 break;
1603 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
1605 break; 2050 break;
1606 case R_SB_ALIGN_BOTTOM: 2051 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2052 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2053 break;
1609 } 2054 }
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, 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1614 scrollbar_size ()); 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 }
2094
1648 break; 2095 break;
1649 } 2096 }
1650 } 2097 }
2098
1651 return; 2099 return;
1652 } 2100 }
1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660} 2101}
1661 2102
1662void 2103void
1663rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
1664{ 2105{
1665 int reportmode = 0; 2106 int reportmode = 0;
1666 2107
1667 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2109 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2111
1671 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1672 { 2113 {
1673 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
1674 scrollbar_show (0); 2115 scrollBar.show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH;
1677#endif
1678
1679 } 2116 }
2117
1680#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
1683#endif 2120#endif
2121
1684 if (ev.window == TermWin.vt) 2122 if (ev.window == vt)
1685 { 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
1686 if (reportmode) 2133 if (reportmode)
1687 { 2134 {
1688 /* mouse report from vt window */ 2135 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2136 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2137 if (ev.button >= 4)
… …
1701 mouse_report (ev); 2148 mouse_report (ev);
1702 } 2149 }
1703#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
1704 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
1705 mouse_report (ev); 2152 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2154 return;
1708 } 2155 }
2156
1709 /* 2157 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2159 * when overriding mouse reporting
1712 */ 2160 */
1713 if (PrivateModes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2162 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2164 selection_extend (ev.x, ev.y, 0);
1717 2165
1718 switch (ev.button) 2166 switch (ev.button)
1719 { 2167 {
1720 case Button1: 2168 case Button1:
1721 case Button3: 2169 case Button3:
1722 selection_make (ev.time); 2170 selection_make (ev.time);
1723 break; 2171 break;
2172
1724 case Button2: 2173 case Button2:
1725 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);
1726 break; 2176 break;
2177
1727#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
1728 case Button4: 2179 case Button4:
1729 case Button5: 2180 case Button5:
1730 { 2181 {
1731 int i; 2182 int i;
… …
1733 2184
1734 v = ev.button == Button4 ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
1735 2186
1736 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
1737 i = 1; 2188 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2189 else if (option (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2190 i = nrow - 1;
1740 else 2191 else
1741 i = 5; 2192 i = 5;
1742 2193
1743# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2195 if (ev.state & ControlMask)
1745 { 2196 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
1747 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;
1748 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;
1749 2200
1750 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1752
1753 slip_wheel_ev.start ();
1754 } 2203 }
1755 else 2204 else
2205# endif
1756 { 2206 {
1757# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2207 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2208 scrollBar.show (1);
1762# else
1763 while (i--)
1764 {
1765 scr_page (v, 1);
1766 scr_refresh (SMOOTH_REFRESH);
1767 scrollbar_show (1);
1768 }
1769# endif
1770# ifdef MOUSE_SLIP_WHEELING
1771 } 2209 }
1772#endif
1773 } 2210 }
1774 break; 2211 break;
1775#endif 2212#endif
1776 } 2213 }
1777 } 2214 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782} 2215}
1783
1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1948 }
1949 break;
1950 }
1951 case 16:
1952 {
1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
2011
2012 free (lookup);
2013}
2014#endif
2015
2016/*
2017 * Check our parents are still who we think they are.
2018 * Do transparency updates if required
2019 */
2020int
2021rxvt_term::check_our_parents ()
2022{
2023 int i, pchanged, aformat, have_pixmap, rootdepth;
2024 unsigned long nitems, bytes_after;
2025 Atom atype;
2026 unsigned char *prop = NULL;
2027 Window root, oldp, *list;
2028 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr;
2030
2031 pchanged = 0;
2032
2033 if (!(Options & Opt_transparent))
2034 return pchanged; /* Don't try any more */
2035
2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth;
2038
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
2041 if (rootdepth != wattr.depth)
2042 {
2043 if (am_transparent)
2044 {
2045 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0;
2048 }
2049
2050 return pchanged; /* Don't try any more */
2051 }
2052
2053 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False);
2055
2056 /*
2057 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that.
2060 */
2061 i = (xa[XA_XROOTPMAPID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success);
2065
2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
2077 have_pixmap = 0;
2078 else
2079 {
2080 have_pixmap = 1;
2081 rootpixmap = *(Pixmap *)prop;
2082 XFree (prop);
2083 }
2084
2085 if (have_pixmap)
2086 {
2087 /*
2088 * Copy display->root pixmap transparency
2089 */
2090 int sx, sy, nx, ny;
2091 unsigned int nw, nh;
2092 Window cr;
2093 XImage *image;
2094 GC gc;
2095 XGCValues gcvalue;
2096
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2098 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height;
2101 nx = ny = 0;
2102
2103 if (sx < 0)
2104 {
2105 nw += sx;
2106 nx = -sx;
2107 sx = 0;
2108 }
2109
2110 if (sy < 0)
2111 {
2112 nh += sy;
2113 ny = -sy;
2114 sy = 0;
2115 }
2116
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2119 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */
2124 allowedxerror = 0;
2125
2126 if (image == NULL)
2127 {
2128 if (am_transparent && am_pixmap_trans)
2129 {
2130 pchanged = 1;
2131 if (TermWin.pixmap != None)
2132 {
2133 XFreePixmap (display->display, TermWin.pixmap);
2134 TermWin.pixmap = None;
2135 }
2136 }
2137
2138 am_pixmap_trans = 0;
2139 }
2140 else
2141 {
2142 if (TermWin.pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2158 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc);
2163 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2167 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1;
2169
2170 am_transparent = am_pixmap_trans = 1;
2171 }
2172 }
2173
2174 if (!am_pixmap_trans)
2175 {
2176 unsigned int n;
2177 /*
2178 * InheritPixmap transparency
2179 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 {
2183 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2189 if (TermWin.parent[i] == display->root)
2190 {
2191 if (oldp != None)
2192 pchanged = 1;
2193
2194 break;
2195 }
2196
2197 if (oldp != TermWin.parent[i])
2198 pchanged = 1;
2199 }
2200
2201 n = 0;
2202
2203 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++)
2206 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break;
2213 }
2214 }
2215 }
2216
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2222 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */
2224 }
2225 else
2226 {
2227#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1);
2231#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2240 am_transparent = 1;
2241 }
2242
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None;
2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
2256 return pchanged;
2257}
2258#endif
2259 2216
2260/*}}} */ 2217/*}}} */
2261 2218
2262bool 2219void
2263rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2264{ 2221{
2265 bool flag = false;
2266 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2268 2224
2269 for (;;) 2225 for (;;)
2270 { 2226 {
2271 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2272 { 2228 {
2273 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2230 ch = next_char ();
2275 }
2276 2231
2277 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2278 break; 2233 break;
2234 }
2279 2235
2280 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))
2281 { 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
2282 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2254 bool refreshnow = false;
2285 int nlines = 0; 2255 int nlines = 0;
2286 unicode_t *str = buf; 2256 wchar_t *str = buf;
2287 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2258
2290 for (;;) 2259 for (;;)
2291 { 2260 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break;
2263
2264 *str++ = ch;
2265
2266 if (expect_false (ch == C0_LF || str >= eol))
2267 {
2268 if (ch == C0_LF)
2269 nlines++;
2270
2271 refresh_count++;
2272
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 {
2279 refreshnow = true;
2280 ch = NOCHAR;
2281 break;
2282 }
2283 }
2284
2285 // scr_add_lines only works for nlines <= nrow - 1.
2286 if (nlines >= nrow - 1)
2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2290 scr_add_lines (buf, str - buf, nlines);
2291
2292 nlines = 0;
2293 str = buf;
2294 eol = str + min (ncol, UBUFSIZ);
2295 }
2296
2297 if (str >= eol)
2298 {
2299 if (eol >= buf + UBUFSIZ)
2300 {
2301 ch = NOCHAR;
2302 break;
2303 }
2304 else
2305 eol = min (eol + ncol, buf + UBUFSIZ);
2306 }
2307
2308 }
2309
2292 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2293 ch = next_char (); 2311 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break;
2297
2298 *str++ = ch;
2299
2300 if (ch == C0_LF)
2301 {
2302 nlines++;
2303 refresh_count++;
2304
2305 if (! (Options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 {
2308 refreshnow = true;
2309 ch = NOCHAR;
2310 break;
2311 }
2312
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1)
2315 {
2316 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0;
2318 str = buf;
2319 }
2320 }
2321
2322 if (str >= buf + UBUFSIZ)
2323 {
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2312 }
2328 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2329 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2330 2317
2331 /* 2318 /*
2332 * 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
2333 * 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.
2334 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2335 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2322 */
2337 if (refreshnow) 2323 if (refreshnow)
2338 { 2324 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++;
2341 else
2342 {
2343 flag = true;
2344 scr_refresh (refresh_type); 2325 scr_refresh ();
2345 } 2326 want_refresh = 1;
2346 } 2327 }
2347
2348 } 2328 }
2349 else 2329 else
2350 { 2330 {
2351 try 2331 try
2352 { 2332 {
… …
2360 } 2340 }
2361 2341
2362 ch = NOCHAR; 2342 ch = NOCHAR;
2363 } 2343 }
2364 } 2344 }
2365
2366 return flag;
2367}
2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376} 2345}
2377 2346
2378// read the next character 2347// read the next character
2379unicode_t 2348wchar_t
2380rxvt_term::next_char () 2349rxvt_term::next_char () NOTHROW
2381{ 2350{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2352 {
2384 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2387 2356
2388 wchar_t wc; 2357 wchar_t wc;
2389 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);
2390 2359
2391 if (len == (size_t)-2) 2360 if (len == (size_t)-2)
2392 { 2361 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2362 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2364 break;
2396 } 2365 }
2397 2366
2398 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2399 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 }
2400 2372
2401 // assume wchar == unicode 2373 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2403 return wc; 2375 return wc & UNICODE_MASK;
2404 } 2376 }
2405 2377
2406 return NOCHAR; 2378 return NOCHAR;
2407} 2379}
2408 2380
2409/* rxvt_cmd_getc () - Return next input character */ 2381// read the next octet
2410/* 2382uint32_t
2411 * Return the next input character after first passing any keyboard input 2383rxvt_term::next_octet () NOTHROW
2412 * to the command.
2413 */
2414unicode_t
2415rxvt_term::cmd_getc ()
2416{ 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{
2417 unicode_t c = next_char (); 2395 wchar_t c = next_char ();
2418 2396
2419 if (c == NOCHAR) 2397 if (c == NOCHAR)
2420 throw out_of_input; 2398 throw out_of_input;
2421 2399
2422 return c; 2400 return c;
2423} 2401}
2424 2402
2425unicode_t 2403uint32_t
2426rxvt_term::cmd_get8 () 2404rxvt_term::cmd_get8 () THROW ((class out_of_input))
2427{ 2405{
2428 unicode_t c = next_octet (); 2406 uint32_t c = next_octet ();
2429 2407
2430 if (c == NOCHAR) 2408 if (c == NOCHAR)
2431 throw out_of_input; 2409 throw out_of_input;
2432 2410
2433 return c; 2411 return c;
… …
2437/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2438#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2439FILE * 2417FILE *
2440rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2441{ 2419{
2442 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2443 2421
2444 if (stream == NULL) 2422 if (stream == NULL)
2445 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2446 2424
2447 return stream; 2425 return stream;
… …
2458 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2459 */ 2437 */
2460void 2438void
2461rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2462{ 2440{
2463 int done; 2441 FILE *fd = popen_printer ();
2464 FILE *fd;
2465 2442
2466 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2467 return; 2444 return;
2468 2445
2469 /* 2446 /*
2470 * 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
2471 * is received. 2448 * is received.
2472 */ 2449 */
2473 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2474 { 2451 {
2475 unsigned char buf[8]; 2452 unsigned char buf[8];
2476 unicode_t ch; 2453 unicode_t ch;
2477 unsigned int i, len; 2454 unsigned int i, len;
2478 2455
… …
2497 { 2474 {
2498 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
2499 break; /* done = 1 */ 2476 break; /* done = 1 */
2500 } 2477 }
2501 } 2478 }
2502 2479
2503 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
2504 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
2505 { 2482 {
2506 done = 1; 2483 done = 1;
2507 break; 2484 break;
… …
2509 } 2486 }
2510 } 2487 }
2511 2488
2512 pclose_printer (fd); 2489 pclose_printer (fd);
2513} 2490}
2514#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2515/*}}} */ 2492/*}}} */
2516 2493
2517/* *INDENT-OFF* */
2518enum { 2494enum {
2519 C1_40 = 0x40, 2495 C1_40 = 0x40,
2520 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,
2521 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,
2522 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,
2523 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,
2524}; 2500};
2525/* *INDENT-ON* */
2526 2501
2527/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2528void 2503void
2529rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2530{ 2505{
… …
2533 case C0_ESC: 2508 case C0_ESC:
2534 process_escape_seq (); 2509 process_escape_seq ();
2535 break; 2510 break;
2536 case C0_ENQ: /* terminal Status */ 2511 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2512 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2513 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 2514 else
2541 tt_write ((unsigned char *)VT100_ANS, 2515 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 2516 break;
2544 case C0_BEL: /* bell */ 2517 case C0_BEL: /* bell */
2545 scr_bell (); 2518 scr_bell ();
2546 break; 2519 break;
2547 case C0_BS: /* backspace */ 2520 case C0_BS: /* backspace */
… …
2571 process_dcs_seq (); 2544 process_dcs_seq ();
2572 break; 2545 break;
2573 case 0x9b: /* CSI */ 2546 case 0x9b: /* CSI */
2574 process_csi_seq (); 2547 process_csi_seq ();
2575 break; 2548 break;
2576 case 0x9d: /* CSI */ 2549 case 0x9d: /* OSC */
2577 process_osc_seq (); 2550 process_osc_seq ();
2578 break; 2551 break;
2579#endif 2552#endif
2580 } 2553 }
2581} 2554}
… …
2625 break; 2598 break;
2626 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
2627 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2628 break; 2601 break;
2629 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
2630 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
2631 break; 2604 break;
2632 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
2633 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
2634 /* unimplemented */ 2607 /* unimplemented */
2635 break; 2608 break;
… …
2646void 2619void
2647rxvt_term::process_escape_seq () 2620rxvt_term::process_escape_seq ()
2648{ 2621{
2649 unicode_t ch = cmd_getc (); 2622 unicode_t ch = cmd_getc ();
2650 2623
2651 if (PrivateModes & PrivMode_vt52) 2624 if (priv_modes & PrivMode_vt52)
2652 { 2625 {
2653 process_escape_vt52 (ch); 2626 process_escape_vt52 (ch);
2654 return; 2627 return;
2655 } 2628 }
2656 2629
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2644 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2645 break;
2673 case '+': 2646 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2647 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2648 break;
2676#ifndef NO_FRILLS 2649#if !ENABLE_MINIMAL
2677 case '6': 2650 case '6':
2678 scr_backindex (); 2651 scr_backindex ();
2679 break; 2652 break;
2680#endif 2653#endif
2681 case '7': 2654 case '7':
2682 scr_cursor (SAVE); 2655 scr_cursor (SAVE);
2683 break; 2656 break;
2684 case '8': 2657 case '8':
2685 scr_cursor (RESTORE); 2658 scr_cursor (RESTORE);
2686 break; 2659 break;
2687#ifndef NO_FRILLS 2660#if !ENABLE_MINIMAL
2688 case '9': 2661 case '9':
2689 scr_forwardindex (); 2662 scr_forwardindex ();
2690 break; 2663 break;
2691#endif 2664#endif
2692 case '=': 2665 case '=':
2693 case '>': 2666 case '>':
2694 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
2695 break; 2668 break;
2696 2669
2697 case C1_40: 2670 case C1_40:
2698 cmd_getc (); 2671 cmd_getc ();
2699 break; 2672 break;
… …
2702 break; 2675 break;
2703 2676
2704 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2706 { 2679 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2709 } 2682 }
2710 break; 2683 break;
2711 2684
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2714 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 */
2715 break; 2690 break;
2716 2691
2717 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2718 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2719 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2735 process_dcs_seq (); 2710 process_dcs_seq ();
2736 break; 2711 break;
2737 2712
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
2743 2717
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2745 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 2720 process_csi_seq ();
2747 break; 2721 break;
2748 2722
2749 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2750 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
2751 process_osc_seq (); 2725 process_osc_seq ();
2752 break; 2726 break;
2753 2727
2754 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2755 case 'c': 2729 case 'c':
2756 mbstate.reset (); 2730 mbstate.reset ();
2757 scr_poweron (); 2731 scr_poweron ();
2758 scrollbar_show (1); 2732 scrollBar.show (1);
2759 break; 2733 break;
2760 2734
2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2762 case 'n': 2736 case 'n':
2763 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
2770 } 2744 }
2771} 2745}
2772/*}}} */ 2746/*}}} */
2773 2747
2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2775/* *INDENT-OFF* */
2776enum { 2749enum {
2777 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2778 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,
2779 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 ,
2780 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,
… …
2783 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,
2784 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 ,
2785 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
2786}; 2759};
2787 2760
2788#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2789 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2790 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2791#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2792 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2793 2766
2794const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2795 { 2768 {
2796 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, */
2797 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, */
2798 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, */
2799 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, [, \, ], ^, _, */
2800 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, */
2801 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, */
2802 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, */
2803 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, {, |, }, ~, */
2804 }; 2777 };
2805/* *INDENT-ON* */
2806 2778
2807void 2779void
2808rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2809{ 2781{
2810 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
2811 unsigned int nargs, p; 2783 unsigned int nargs, p;
2812 int n, ndef; 2784 int n, ndef;
2813 int arg[ESC_ARGS]; 2785 int arg[ESC_ARGS] = { };
2814 2786
2815 for (nargs = ESC_ARGS; nargs > 0;) 2787 nargs = 0;
2816 arg[--nargs] = 0;
2817 2788
2818 priv = 0; 2789 priv = 0;
2819 ch = cmd_getc (); 2790 ch = cmd_getc ();
2820 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2792 {
2821 { /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
2822 priv = ch; 2794 priv = ch;
2823 ch = cmd_getc (); 2795 ch = cmd_getc ();
2824 } 2796 }
2825 2797
2826 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
2855 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
2856 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
2857 if (arg[p] == -1) 2829 if (arg[p] == -1)
2858 arg[p] = ndef; 2830 arg[p] = ndef;
2859 2831
2860#ifdef DEBUG_CMD
2861 fprintf (stderr, "CSI ");
2862 for (p = 0; p < nargs; p++)
2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2864 fprintf (stderr, "%c\n", ch);
2865#endif
2866
2867 /* 2832 /*
2868 * private mode handling 2833 * private mode handling
2869 */ 2834 */
2870 if (priv) 2835 if (priv)
2871 { 2836 {
2872 switch (priv) 2837 switch (priv)
2873 { 2838 {
2874 case '>': 2839 case '>':
2875 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 //
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2849 tt_printf ("\033[>%d;95;0c", 'U');
2850 }
2877 break; 2851 break;
2852
2878 case '?': 2853 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
2881 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);
2882 } 2869 }
2870 break;
2871 }
2872
2883 return; 2873 return;
2884 } 2874 }
2885 2875
2886 switch (ch) 2876 switch (ch)
2887 { 2877 {
… …
2986 2976
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2977 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 2978 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 2979 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2980 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2981 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 2982 break;
2993 2983
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2984 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 2985 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 2986 break;
2998 2987
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2988 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 2989 process_sgr_mode (nargs, arg);
3001 break; 2990 break;
… …
3008 break; 2997 break;
3009 case 6: /* CPR requested */ 2998 case 6: /* CPR requested */
3010 scr_report_position (); 2999 scr_report_position ();
3011 break; 3000 break;
3012 case 7: /* unofficial extension */ 3001 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3002 if (option (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3003 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3004 break;
3016 case 8: /* unofficial extension */ 3005 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3006 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3007 break;
3019 } 3008 }
… …
3055 break; 3044 break;
3056 3045
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3046 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3047 if (arg[0] == 4)
3059 scr_insert_mode (0); 3048 scr_insert_mode (0);
3049 else if (arg[0] == 20)
3050 priv_modes &= ~PrivMode_LFNL;
3060 break; 3051 break;
3061 3052
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3053 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3054 if (arg[0] == 4)
3064 scr_insert_mode (1); 3055 scr_insert_mode (1);
3056 else if (arg[0] == 20)
3057 priv_modes |= PrivMode_LFNL;
3065 break; 3058 break;
3066 3059
3067 /* 3060 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3061 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3062 */
… …
3081 break; 3074 break;
3082 case CSI_75: 3075 case CSI_75:
3083 scr_cursor (RESTORE); 3076 scr_cursor (RESTORE);
3084 break; 3077 break;
3085 3078
3086#ifndef NO_FRILLS 3079#if !ENABLE_MINIMAL
3087 case CSI_74: 3080 case CSI_74:
3088 process_window_ops (arg, nargs); 3081 process_window_ops (arg, nargs);
3089 break; 3082 break;
3090#endif 3083#endif
3091 3084
… …
3098 break; 3091 break;
3099 } 3092 }
3100} 3093}
3101/*}}} */ 3094/*}}} */
3102 3095
3103#ifndef NO_FRILLS 3096#if !ENABLE_MINIMAL
3104/* ARGSUSED */
3105void 3097void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3099{
3108 int x, y; 3100 int x, y;
3109 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3110 Window wdummy; 3102 Window wdummy;
3103
3104 dLocal (Display *, dpy);
3111 3105
3112 if (nargs == 0) 3106 if (nargs == 0)
3113 return; 3107 return;
3114 3108
3115 switch (args[0]) 3109 switch (args[0])
3116 { 3110 {
3117 /* 3111 /*
3118 * commands 3112 * commands
3119 */ 3113 */
3120 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3115 XMapWindow (dpy, parent);
3122 break; 3116 break;
3123 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3118 XIconifyWindow (dpy, parent, display->screen);
3125 DefaultScreen (display->display));
3126 break; 3119 break;
3127 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3129 break; 3122 break;
3130 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3125 break;
3133 case 5: /* raise window */ 3126 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3127 XRaiseWindow (dpy, parent);
3135 break; 3128 break;
3136 case 6: /* lower window */ 3129 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3130 XLowerWindow (dpy, parent);
3138 break; 3131 break;
3139 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3140 scr_touch (true); 3133 scr_touch (true);
3141 break; 3134 break;
3142 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3136 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
3145 break; 3138 break;
3146 3139
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3140 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3141 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3143 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * fheight));
3152 break; 3145 break;
3153
3154 3146
3155 /* 3147 /*
3156 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3157 */ 3149 */
3158 case 11: /* report window state */ 3150 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3153 break;
3162 case 13: /* report window position */ 3154 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3160 break;
3169 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3164 break;
3173 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3167 break;
3176 case 19: /* report window size (chars) */ 3168 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3170 break;
3179 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3172 {
3182 char *s; 3173 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3184 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);
3185 } 3177 }
3186 break; 3178 break;
3187 case 21: /* report window title */ 3179 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3180 {
3190 char *s; 3181 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3192 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);
3193 } 3185 }
3194 break; 3186 break;
3195 } 3187 }
3196} 3188}
3197#endif 3189#endif
3198 3190
3199/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3200/* 3192/*
3201 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3203 */ 3195 */
3204unsigned char * 3196char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3198{
3207 unicode_t prev = 0, ch; 3199 unicode_t ch;
3200 bool seen_esc = false;
3208 unsigned int n = 0; 3201 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3202 wchar_t string[STRING_MAX];
3211 3203
3212 while ((ch = cmd_getc ()) != NOCHAR) 3204 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3205 {
3214 if (prev == C0_ESC) 3206 if (seen_esc)
3215 { 3207 {
3216 if (ch == 0x5c) /* 7bit ST */ 3208 if (ch == 0x5c) /* 7bit ST */
3217 break; 3209 break;
3218 else 3210 else
3219 return NULL; 3211 return NULL;
3220 } 3212 }
3213 else if (ch == C0_ESC)
3214 {
3215 seen_esc = true;
3216 continue;
3217 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3223 else if (ch < 0x20) 3222 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3225 3224
3226 if (n >= sizeof (string) - 1) 3225 seen_esc = false;
3226
3227 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3228 // stop at some sane length
3228 return NULL; 3229 return NULL;
3229 3230
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
3236 string[n++] = prev = ch; 3231 string[n++] = ch;
3237 } 3232 }
3238 3233
3239 string[n++] = '\0'; 3234 string[n++] = '\0';
3240 3235
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3237
3246 return s; 3238 return rxvt_wcstombs (string);
3247} 3239}
3248 3240
3249/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3250/* 3242/*
3251 * 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)'
3252 */ 3244 */
3253void 3245void
3254rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3255{ 3247{
3256 unsigned char *s;
3257 unicode_t eh;
3258
3259 /* 3248 /*
3260 * Not handled yet 3249 * Not handled yet
3261 */ 3250 */
3251
3252 unicode_t eh;
3262 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3263 if (s) 3254 if (s)
3264 free (s); 3255 free (s);
3265 3256
3266 return; 3257 return;
3267} 3258}
… …
3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3272 */ 3263 */
3273void 3264void
3274rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3275{ 3266{
3276 unicode_t ch, eh;
3277 int arg; 3267 int arg;
3278 3268
3279 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3282 3272
3283 if (ch == ';') 3273 if (ch == ';')
3284 { 3274 {
3275 unicode_t eh;
3285 unsigned char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3286 3277
3287 if (s) 3278 if (s)
3288 { 3279 {
3289 process_xterm_seq (arg, (char *)s, eh); 3280 process_xterm_seq (arg, s, eh);
3290 free (s); 3281 free (s);
3291 } 3282 }
3292 } 3283 }
3293} 3284}
3294 3285
3295void 3286void
3296rxvt_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)
3297{ 3288{
3298 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3299 { 3290 {
3300 if (Options & Opt_insecure) 3291 rgba c;
3301 { 3292 pix_colors_focused[color].get (c);
3302 unsigned short r, g, b; 3293
3303 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
3304 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);
3305 }
3306 } 3300 }
3307 else 3301 else
3308 set_window_color (color, str); 3302 set_window_color (color, str);
3309} 3303}
3310 3304
3311/* 3305/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3307 */
3336void 3308void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3338{ 3310{
3339 int changed = 0;
3340 int color; 3311 int color;
3341 char *buf, *name; 3312 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3314 int saveop = op;
3315
3316 dLocal (Display *, dpy);
3343 3317
3344 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
3345 switch (op) 3323 switch (op)
3346 { 3324 {
3347 case XTerm_name: 3325 case XTerm_name:
3348 set_title (str); 3326 set_title (str);
3349 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3354 set_title (str); 3332 set_title (str);
3355 break; 3333 break;
3356 case XTerm_property: 3334 case XTerm_property:
3357 if (str[0] == '?') 3335 if (str[0] == '?')
3358 { 3336 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3337 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3338 Atom actual_type;
3361 int actual_format; 3339 int actual_format;
3362 unsigned long nitems; 3340 unsigned long nitems;
3363 unsigned long bytes_after; 3341 unsigned long bytes_after;
3364 unsigned char *value = 0; 3342 unsigned char *value = 0;
3365 const char *str = ""; 3343 const char *str = "";
3366 3344
3367 if (prop 3345 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3346 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3350 && actual_type != None
3373 && actual_format == 8) 3351 && actual_format == 8)
3374 str = (const char *)(value); 3352 str = (const char *)(value);
3375 3353
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3377 3355
3378 XFree (value); 3356 XFree (value);
3379 } 3357 }
3380 else 3358 else
3381 { 3359 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3383 3361
3384 if (eq) 3362 if (eq)
3385 { 3363 {
3386 *eq = 0; 3364 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3365 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3366 }
3392 else 3367 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3368 XDeleteProperty (dpy, parent,
3394 display->atom (str)); 3369 display->atom (str));
3395 } 3370 }
3396 break; 3371 break;
3397 3372
3398 case XTerm_Color: 3373 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3374 for (buf = (char *)str; buf && *buf;)
3400 { 3375 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3377 break;
3403 3378
3404 *name++ = '\0'; 3379 *name++ = '\0';
3405 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3406 3381
3407 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3408 break; 3383 break;
3409 3384
3410 if ((buf = STRCHR (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3386 *buf++ = '\0';
3412 3387
3413 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 != ';')
3414 { 3464 {
3415 if (Options & Opt_insecure) 3465 if (bg_set_file (str)) /* change pixmap */
3416 { 3466 {
3417 unsigned short r, g, b; 3467 changed++;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3468 str = strchr (str, ';');
3419 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);
3420 } 3473 }
3421 } 3474 }
3422 else 3475 else
3423 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 }
3424 } 3492 }
3425 break; 3493 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3431 break;
3432#ifndef NO_CURSORCOLOR
3433 case XTerm_Color_cursor:
3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3435 break;
3436#endif 3494#endif
3437 case XTerm_Color_pointer_fg:
3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3442 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break;
3447 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break;
3450 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3452 break;
3453#endif
3454
3455 case XTerm_Pixmap:
3456 if (*str != ';')
3457 {
3458#if XPM_BACKGROUND
3459 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */
3461#endif
3462 scr_touch (true);
3463 }
3464 while ((str = STRCHR (str, ';')) != NULL)
3465 {
3466 str++;
3467#if XPM_BACKGROUND
3468 changed += scale_pixmap (str);
3469#endif
3470
3471 }
3472 if (changed)
3473 {
3474#ifdef XPM_BACKGROUND
3475 resize_pixmap ();
3476#endif
3477 scr_touch (true);
3478 }
3479 break;
3480
3481 case XTerm_restoreFG:
3482 set_window_color (Color_fg, str);
3483 break;
3484 case XTerm_restoreBG:
3485 set_window_color (Color_bg, str);
3486 break;
3487 3495
3488 case XTerm_logfile: 3496 case XTerm_logfile:
3489 // TODO, when secure mode? 3497 // TODO, when secure mode?
3490 break; 3498 break;
3491 3499
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break;
3537#endif
3538#if 0 3500#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3501 case Rxvt_dumpscreen: /* no error notices */
3540 { 3502 {
3541 int fd; 3503 int fd;
3542 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)
3543 { 3505 {
3544 scr_dump (fd); 3506 scr_dump (fd);
3545 close (fd); 3507 close (fd);
3546 } 3508 }
3547 } 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));
3548 break; 3572 break;
3549#endif 3573#endif
3550 } 3574 }
3551} 3575}
3552/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3566{ 3590{
3567 int state; 3591 int state;
3568 3592
3569 if (mode == 's') 3593 if (mode == 's')
3570 { 3594 {
3571 SavedModes |= (PrivateModes & bit); 3595 SavedModes |= (priv_modes & bit);
3572 return -1; 3596 return -1;
3573 } 3597 }
3574 else 3598 else
3575 { 3599 {
3576 if (mode == 'r') 3600 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3602 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3581 } 3606 }
3582 3607
3583 return state; 3608 return state;
3584} 3609}
3585 3610
3586/* we're not using priv _yet_ */ 3611/* we're not using priv _yet_ */
3587void 3612void
3588rxvt_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)
3589{ 3614{
3590 unsigned int i, j; 3615 unsigned int i, j;
3591 int state; 3616 int state;
3592 3617
3593 static const struct 3618 static const struct
3594 { 3619 {
3595 const int argval; 3620 const int argval;
3596 const unsigned long bit; 3621 const unsigned long bit;
3597 }
3598
3599 argtopriv[] = { 3622 } argtopriv[] = {
3600 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3601 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3602 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3603 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3604 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3605 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3606 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3632 // 18 end FF to printer after print screen
3609 { menuBar_esc, PrivMode_menuBar }, 3633 // 19 Print screen prints full screen/scroll region
3610#endif 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3637#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
3618 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3642 // 45 margin bell NYI
3621 // 46 start logging 3643 // 46 start logging
3622 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
3623 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3624#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
3625 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
3626#endif 3648#endif
3627 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3628 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3650 { 1002, PrivMode_MouseBtnEvent },
3629 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3651 { 1003, PrivMode_MouseAnyEvent },
3630 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 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
3633 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3638 { 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 */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
3640 }; 3668 };
3641 3669
3642 if (nargs == 0) 3670 if (nargs == 0)
3643 return; 3671 return;
3644 3672
… …
3651 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3652 { 3680 {
3653 state = -1; 3681 state = -1;
3654 3682
3655 /* basic handling */ 3683 /* basic handling */
3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3657 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3658 { 3686 {
3659 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3660 break; 3688 break;
3661 } 3689 }
3662 3690
3663 /* extra handling for values with state unkept */ 3691 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3692 switch (arg[i])
3665 { 3693 {
3694#if ENABLE_STYLES
3695 case 1021:
3696 set_option (Opt_intensityStyles, mode);
3697
3698 scr_touch (true);
3699 break;
3700#endif
3666 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
3667 if (Options & Opt_secondaryScreen) 3702 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3703 if (mode == 0)
3669 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3670 else if (mode == 1) 3705 else if (mode == 1)
3671 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
3672 break; 3707 break;
… …
3680 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3718 * within VT52 mode
3684 */ 3719 */
3685 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
3686 break; 3721 break;
3687 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3725 break;
3691 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3692 if (state) 3727 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 3728 break;
3697 case 5: /* reverse video */ 3729 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
3699 break; 3731 break;
3700 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 3736 scr_autowrap (state);
3705 break; 3737 break;
3706 /* 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 */
3707 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3742 break;
3711#ifdef menuBar_esc
3712 case menuBar_esc:
3713#ifdef MENUBAR
3714 map_menuBar (state);
3715#endif
3716 break;
3717#endif
3718#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
3719 case scrollBar_esc: 3744 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
3721 { 3746 {
3722 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3748 scr_touch (true);
3724 } 3749 }
3725 break; 3750 break;
… …
3734 break; 3759 break;
3735 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3765 break;
3741#if 0
3742 case 1001: 3766 case 1002:
3743 break; /* X11 mouse highlighting */ 3767 case 1003:
3744#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;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 3781 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3782 break;
3751 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 3784 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 3785 break;
3757 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 3787 if (option (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 3788 if (!state)
3760 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3761 scr_change_screen (state); 3791 scr_change_screen (state);
3762 break; 3792 break;
3763 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
3764 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3765 if (Options & Opt_secondaryScreen) 3800 if (option (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 3801 if (state)
3767 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3768 break; 3805 break;
3769 default: 3806 default:
3770 break; 3807 break;
3771 } 3808 }
3772 } 3809 }
… …
3796 rendset = 0, rendstyle = ~RS_None; 3833 rendset = 0, rendstyle = ~RS_None;
3797 break; 3834 break;
3798 case 1: 3835 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 3836 rendset = 1, rendstyle = RS_Bold;
3800 break; 3837 break;
3801 //case 2: // faint or second colour 3838 //case 2: // low intensity
3839 case 3:
3840 rendset = 1, rendstyle = RS_Italic;
3841 break;
3802 case 4: 3842 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 3843 rendset = 1, rendstyle = RS_Uline;
3804 break; 3844 break;
3805 case 5: // slowly blinking 3845 case 5: // slowly blinking
3806 case 6: // rapidly blinking 3846 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 3858 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 3859 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 3860 //...
3821 //case 19: // ninth alt font 3861 //case 19: // ninth alt font
3822 //case 20: // gothic 3862 //case 20: // gothic
3823 case 21: // disable bold, faint 3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 3864 rendset = 0, rendstyle = RS_Bold;
3825 break; 3865 break;
3826 case 22: 3866 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 3867 rendset = 0, rendstyle = RS_Bold;
3828 break; 3868 break;
3829 //case 23: disable italic 3869 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic;
3871 break;
3830 case 24: 3872 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 3873 rendset = 0, rendstyle = RS_Uline;
3832 break; 3874 break;
3833 case 25: 3875 case 25:
3876 rendset = 0, rendstyle = RS_Blink;
3877 break;
3878 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 3879 rendset = 0, rendstyle = RS_Blink;
3835 break; 3880 break;
3836 case 27: 3881 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 3882 rendset = 0, rendstyle = RS_RVid;
3838 break; 3883 break;
… …
3856 case 35: 3901 case 35:
3857 case 36: 3902 case 36:
3858 case 37: 3903 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3904 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 3905 break;
3861#ifdef TTY_256COLOR 3906 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 3907 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 3908 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3909 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 3910 i += 2;
3867 } 3911 }
3868 break; 3912 break;
3869#endif
3870 case 39: /* default fg */ 3913 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 3914 scr_color (Color_fg, Color_fg);
3872 break; 3915 break;
3873 3916
3874 case 40: 3917 case 40:
… …
3879 case 45: 3922 case 45:
3880 case 46: 3923 case 46:
3881 case 47: 3924 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3925 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 3926 break;
3884#ifdef TTY_256COLOR 3927 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 3928 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 3929 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3930 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 3931 i += 2;
3890 } 3932 }
3891 break; 3933 break;
3892#endif
3893 case 49: /* default bg */ 3934 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
3895 break; 3936 break;
3896 3937
3897#ifndef NO_BRIGHTCOLOR 3938 //case 50: // not variable spacing
3939
3940#if !ENABLE_MINIMAL
3898 case 90: 3941 case 90:
3899 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
3900 case 92: 3943 case 92:
3901 case 93: 3944 case 93:
3902 case 94: 3945 case 94:
3903 case 95: 3946 case 95:
3904 case 96: 3947 case 96:
3905 case 97: 3948 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3949 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 3950 break;
3909 case 100: 3951 case 100:
3910 case 101: /* set bright bg color */ 3952 case 101: /* set bright bg color */
3911 case 102: 3953 case 102:
3912 case 103: 3954 case 103:
3913 case 104: 3955 case 104:
3914 case 105: 3956 case 105:
3915 case 106: 3957 case 106:
3916 case 107: 3958 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3959 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 3960 break;
3920#endif 3961#endif
3921
3922 } 3962 }
3923 } 3963 }
3924}
3925/*}}} */
3926
3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3928void
3929rxvt_term::process_graphics ()
3930{
3931 unicode_t ch, cmd = cmd_getc ();
3932
3933 if (cmd == 'Q')
3934 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */
3936 return;
3937 }
3938 /* swallow other graphics sequences until terminating ':' */
3939 do
3940 ch = cmd_getc ();
3941 while (ch != ':');
3942} 3964}
3943/*}}} */ 3965/*}}} */
3944 3966
3945/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3946 3968
… …
3950 */ 3972 */
3951void 3973void
3952rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
3953{ 3975{
3954 va_list arg_ptr; 3976 va_list arg_ptr;
3955 unsigned char buf[256]; 3977 char buf[256];
3956 3978
3957 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 3981 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 3982 tt_write (buf, strlen (buf));
3961} 3983}
3962 3984
3963/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3964/* 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,
3965 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3966 */ 3988 */
3967void 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3971 3990
3972 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;
3973 { 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
3974 if (v_buflen == 0) 4029 if (v_buflen == 0)
3975 { 4030 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4031 free (v_buffer);
4003 v_buffer = 0; 4032 v_buffer = 0;
4004 v_buflen = 0;
4005 4033
4006 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4035 return;
4019 } 4036 }
4037
4038 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4039 }
4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4041 pty_ev.set (ev::READ);
4021} 4042}
4022 4043
4023/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
4024 4045

Diff Legend

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