ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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