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

Diff Legend

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