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

Diff Legend

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