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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC

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

Diff Legend

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