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

Diff Legend

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