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.263 by root, Sun Jan 15 16:48:17 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
… …
758rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
759{ 1025{
760 SET_R (this); 1026 SET_R (this);
761 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
762 1028
1029 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033}
1034
1035void
1036rxvt_term::flush_cb (time_watcher &w)
1037{
1038 SET_R (this);
1039 SET_LOCALE (locale);
1040
1041 refresh_limit = 1;
1042 refresh_count = 0;
763 flush (); 1043 flush ();
764} 1044}
765 1045
766#ifdef CURSOR_BLINK 1046#ifdef CURSOR_BLINK
767void 1047void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 1065 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 1066 }
787} 1067}
788#endif 1068#endif
789 1069
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void
1072rxvt_term::cont_scroll_cb (time_watcher &w)
1073{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 }
1081}
1082#endif
1083
1084#ifdef SELECTION_SCROLLING
1085void
1086rxvt_term::sel_scroll_cb (time_watcher &w)
1087{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 }
1095}
1096#endif
1097
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void
1100rxvt_term::slip_wheel_cb (time_watcher &w)
1101{
1102 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 {
1106 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0;
1108
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1;
1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112 }
1113}
1114#endif
1115
1116#if HAVE_SCHED_YIELD
1117static struct event_handler
1118{
1119 check_watcher cw_yield;
1120
1121 void yield (check_watcher &w)
1122 {
1123 sched_yield ();
1124 w.stop ();
1125 }
1126
1127 event_handler ()
1128 : cw_yield (this, &event_handler::yield)
1129 {
1130 }
1131} event_handler;
1132#endif
1133
790bool 1134bool
791rxvt_term::pty_fill () 1135rxvt_term::pty_fill ()
792{ 1136{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1137 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1138
1139 if (CBUFSIZ == n)
1140 {
1141 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1142 n = 0;
1143 }
794 1144
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1145 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1146 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1147 cmdbuf_endp = cmdbuf_ptr + n;
798 1148
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
800 1150
801 if (n > 0) 1151 if (r > 0)
802 { 1152 {
803 cmdbuf_endp += n; 1153 cmdbuf_endp += r;
804 return true; 1154 return true;
805 } 1155 }
806 else if (n < 0 && errno != EAGAIN) 1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 {
1158#if HAVE_SCHED_YIELD
1159 if (display->is_local)
1160 event_handler.cw_yield.start ();
1161#endif
1162 }
1163 else
1164 {
1165 pty_ev.stop ();
1166
1167 if (!OPTION (Opt_hold))
807 destroy (); 1168 destroy ();
808 1169 }
1170
809 return false; 1171 return false;
810} 1172}
811 1173
812void 1174void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1175rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1176{
815 SET_R (this); 1177 SET_R (this);
816 SET_LOCALE (locale); 1178 SET_LOCALE (locale);
817 1179
1180 if (revents & EVENT_READ)
1181 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ())
1183 if (cmd_parse ())
1184 break;
1185
818 if (revents & EVENT_WRITE) 1186 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1187 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} 1188}
936 1189
937// read the next character, currently handles UTF-8 1190void
938// will probably handle all sorts of other stuff in the future 1191rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1192{
942 while (cmdbuf_ptr < cmdbuf_endp) 1193 XDefineCursor (display->display, vt, TermWin_cursor);
943 { 1194 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1195
947 wchar_t wc; 1196#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1197 hidden_pointer = 0;
949 1198
950 if (len == (size_t)-2) 1199 if (OPTION (Opt_pointerBlank))
951 return NOCHAR; 1200 pointer_ev.start (NOW + pointerBlankDelay);
952 1201#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} 1202}
985 1203
986#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
987void 1205void
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 () 1206rxvt_term::pointer_blank ()
1001{ 1207{
1002 if (! (Options & Opt_pointerBlank)) 1208 if (!OPTION (Opt_pointerBlank))
1003 return; 1209 return;
1004 1210
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1211 XDefineCursor (display->display, vt, display->blank_cursor);
1006 XFlush (display->display); 1212 XFlush (display->display);
1007 1213
1008 hidden_pointer = 1; 1214 hidden_pointer = 1;
1009} 1215}
1010 1216
… …
1017 pointer_blank (); 1223 pointer_blank ();
1018} 1224}
1019#endif 1225#endif
1020 1226
1021void 1227void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1228rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1229{
1024 int button_number, key_state = 0; 1230 int button_number, key_state = 0;
1025 int x, y; 1231 int x, y;
1026 1232
1027 x = ev.x; 1233 x = ev.x;
1028 y = ev.y; 1234 y = ev.y;
1029 pixel_position (&x, &y); 1235 pixel_position (&x, &y);
1030 1236
1031 if (MEvent.button == AnyButton) 1237 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1238 button_number = 3;
1034 }
1035 else 1239 else
1036 { 1240 {
1037 button_number = MEvent.button - Button1; 1241 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1242 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1243 if (button_number >= 3)
1040 button_number += (64 - 3); 1244 button_number += (64 - 3);
1041 } 1245 }
1042 1246
1043 if (PrivateModes & PrivMode_MouseX10) 1247 if (priv_modes & PrivMode_MouseX10)
1044 { 1248 {
1045 /* 1249 /*
1046 * do not report ButtonRelease 1250 * do not report ButtonRelease
1047 * no state info allowed 1251 * no state info allowed
1048 */ 1252 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1267 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1268 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1269#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1270 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1271#endif
1068
1069 } 1272 }
1070 1273
1071#ifdef DEBUG_MOUSEREPORT 1274#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1275 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1276 if (key_state & 16)
1074 fputc ('C', stderr); 1277 fputc ('C', stderr);
1075 if (key_state & 4) 1278 if (key_state & 4)
1076 fputc ('S', stderr); 1279 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1283 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1284 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1285 button_number,
1083 x + 1, 1286 x + 1,
1084 y + 1); 1287 y + 1);
1085#else 1288#endif
1289
1086 tt_printf ("\033[M%c%c%c", 1290 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1291 (32 + button_number + key_state),
1088 (32 + x + 1), 1292 (32 + x + 1),
1089 (32 + y + 1)); 1293 (32 + y + 1));
1090#endif
1091} 1294}
1092 1295
1093#ifdef USING_W11LIB 1296#ifdef USING_W11LIB
1094void 1297void
1095rxvt_W11_process_x_event (XEvent *ev) 1298rxvt_W11_process_x_event (XEvent *ev)
… …
1102 1305
1103/*{{{ process an X event */ 1306/*{{{ process an X event */
1104void 1307void
1105rxvt_term::x_cb (XEvent &ev) 1308rxvt_term::x_cb (XEvent &ev)
1106{ 1309{
1310 dDisp;
1311
1107 SET_R (this); 1312 SET_R (this);
1108 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1109 1314
1110#if defined(CURSOR_BLINK) 1315 if (ev.xany.window == vt
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 }
1121#endif
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; 1317 return;
1140#endif
1141 1318
1319 // for XQueryPointer
1142 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1322 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 1323
1195 switch (ev.type) 1324 switch (ev.type)
1196 { 1325 {
1197 case KeyPress: 1326 case KeyPress:
1327#if ISO_14755
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1198 lookup_key (ev.xkey); 1330 lookup_key (ev.xkey);
1331
1332 break;
1333
1334 case KeyRelease:
1335 {
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1199 break; 1398 break;
1200 1399
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1206 else 1405#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; 1406 break;
1215 } 1407 }
1216#endif
1217 1408
1218 case ButtonPress: 1409 case ButtonPress:
1219 button_press (ev.xbutton); 1410 button_press (ev.xbutton);
1220 break; 1411 break;
1221 1412
… …
1223 button_release (ev.xbutton); 1414 button_release (ev.xbutton);
1224 break; 1415 break;
1225 1416
1226 case ClientMessage: 1417 case ClientMessage:
1227 if (ev.xclient.format == 32 1418 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1420 {
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 destroy (); 1422 destroy ();
1423#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev);
1428#endif
1429 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1230#ifdef OFFIX_DND 1439#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1440 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile 1442 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1443 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1444 || ev.xclient.data.l[0] == DndLink))
1236 { 1445 {
1237 /* Get Dnd data */ 1446 /* Get Dnd data */
1238 Atom ActualType; 1447 Atom ActualType;
1239 int ActualFormat; 1448 int ActualFormat;
1240 unsigned char *data; 1449 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1450 unsigned long Size, RemainingBytes;
1242 1451
1243 XGetWindowProperty (display->display, display->root, 1452 XGetWindowProperty (disp, display->root,
1244 xa[XA_DNDSELECTION], 1453 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1454 0L, 1000000L,
1246 False, AnyPropertyType, 1455 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1456 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1457 &Size, &RemainingBytes,
1249 &data); 1458 &data);
1250 XChangeProperty (display->display, display->root, 1459 set_string_property (XA_CUT_BUFFER0, data);
1251 XA_CUT_BUFFER0, XA_STRING, 1460 XFree (data);
1252 8, PropModeReplace,
1253 data, STRLEN (data));
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1256 } 1463 }
1257#endif /* OFFIX_DND */ 1464#endif /* OFFIX_DND */
1258 break; 1465 break;
1259 1466
1260 case MappingNotify: 1467 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1468 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1469 break;
1263 1470
1264 /* 1471 /*
1265 * XXX: this is not the _current_ arrangement 1472 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1473 * Here's my conclusion:
… …
1285 break; 1492 break;
1286 } 1493 }
1287 break; 1494 break;
1288 1495
1289 case FocusIn: 1496 case FocusIn:
1290 if (!TermWin.focus) 1497 focus_in ();
1498 break;
1499
1500 case FocusOut:
1501 focus_out ();
1502 break;
1503
1504 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0])
1291 { 1506 {
1292 TermWin.focus = 1; 1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1508 ;
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 1509
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 {
1512 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 }
1515
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517 if (OPTION (Opt_transparent))
1518 check_our_parents ();
1519#endif
1303 } 1520 }
1304 break; 1521 break;
1305 1522
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: 1523 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1326 { 1525 && ev.xproperty.state == PropertyNewValue)
1327 int height, width; 1526 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1527
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; 1528 break;
1359 1529
1360 case SelectionClear: 1530 case SelectionClear:
1361 display->set_selection_owner (0); 1531 selection_clear ();
1362 break; 1532 break;
1363 1533
1364 case SelectionNotify: 1534 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1535 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1536 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1537 break;
1369 1538
1370 case SelectionRequest: 1539 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1372 break; 1541 break;
1373 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1374 case UnmapNotify: 1551 case UnmapNotify:
1375 TermWin.mapped = 0; 1552 mapped = 0;
1376#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1378#endif 1555#endif
1379 break; 1556 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; 1557 break;
1387 1558
1388#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1389 case ReparentNotify: 1560 case ReparentNotify:
1390 rootwin_cb (ev); 1561 rootwin_cb (ev);
1391 break; 1562 break;
1392#endif /* TRANSPARENT */ 1563#endif /* TRANSPARENT */
1393 1564
1394 case GraphicsExpose: 1565 case GraphicsExpose:
1395 case Expose: 1566 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1567 if (ev.xany.window == vt)
1397 { 1568 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1569 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1573
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1579
1406 // ev.xexpose.width, TermWin.height, False);
1407#endif
1408 want_refresh = 1; 1580 want_refresh = 1;
1409 } 1581 }
1410 else 1582 else
1411 { 1583 {
1412 XEvent unused_event; 1584 XEvent unused_event;
1413 1585
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1587 ;
1416 &unused_event)) ; 1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1589 ;
1418 GraphicsExpose, 1590
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1591 if (isScrollbarWindow (ev.xany.window))
1421 { 1592 {
1422 scrollBar.setIdle (); 1593 scrollBar.setIdle ();
1423 scrollbar_show (0); 1594 scrollbar_show (0);
1424 } 1595 }
1425#ifdef MENUBAR 1596#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1598 menubar_expose ();
1428#endif 1599#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1433 } 1605 }
1434 break; 1606 break;
1435 1607
1436 case MotionNotify: 1608 case MotionNotify:
1437#ifdef POINTER_BLANK 1609#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1611 pointer_unblank ();
1440#endif 1612#endif
1441#if MENUBAR 1613#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1614 if (isMenuBarWindow (ev.xany.window))
1443 { 1615 {
1444 menubar_control (& (ev.xbutton)); 1616 menubar_control (ev.xbutton);
1445 break; 1617 break;
1446 } 1618 }
1447#endif 1619#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1621 break;
1450 1622
1451 if (ev.xany.window == TermWin.vt) 1623 if (ev.xany.window == vt)
1452 { 1624 {
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1628 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1456 ; 1630 ;
1457 1631
1458 XQueryPointer (display->display, TermWin.vt, 1632 XQueryPointer (disp, vt,
1459 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1635 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1636 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1637#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1638 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1639 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1640 {
1467#endif 1641#endif
1642#if ISO_14755
1643 // 5.4
1644 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1645 {
1646 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1647 break;
1648 }
1649#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1650 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1651 ev.xbutton.state & Button3Mask ? 2 : 0);
1652
1470#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1656 {
1474 int dist; 1657 int dist;
1475
1476 pending_scroll_selection=1;
1477 1658
1478 /* don't clobber the current delay if we are 1659 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1660 * already in the middle of scrolling.
1480 */ 1661 */
1481 if (scroll_selection_delay<=0) 1662 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1663 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1664
1484 /* save the event params so we can highlight 1665 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1666 * the selection in the pending-scroll loop
1486 */ 1667 */
1487 selection_save_x=ev.xbutton.x; 1668 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1669 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1670 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1671
1492 /* calc number of lines to scroll */ 1672 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1673 if (ev.xbutton.y < int_bwidth)
1494 { 1674 {
1495 scroll_selection_dir = UP; 1675 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1676 dist = int_bwidth - ev.xbutton.y;
1497 } 1677 }
1498 else 1678 else
1499 { 1679 {
1500 scroll_selection_dir = DN; 1680 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1681 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1682 }
1683
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1684 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1685 / SELECTION_SCROLL_LINE_SPEEDUP
1686 + 1;
1506 MIN_IT (scroll_selection_lines, 1687 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1688 SELECTION_SCROLL_MAX_LINES);
1508 } 1689 }
1509 else 1690 else
1510 { 1691 {
1511 /* we are within the text window, so we 1692 /* we are within the text window, so we
1512 * shouldn't be scrolling 1693 * shouldn't be scrolling
1513 */ 1694 */
1514 pending_scroll_selection = 0; 1695 if (sel_scroll_ev.active)
1696 sel_scroll_ev.stop();
1515 } 1697 }
1516#endif 1698#endif
1517#ifdef MOUSE_THRESHOLD 1699#ifdef MOUSE_THRESHOLD
1518
1519 } 1700 }
1520#endif 1701#endif
1521
1522 } 1702 }
1523 } 1703 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1704 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1705 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1706 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1707 MotionNotify, &ev))
1708 ;
1709
1528 XQueryPointer (display->display, scrollBar.win, 1710 XQueryPointer (disp, scrollBar.win,
1529 &unused_root, &unused_child, 1711 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1713 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1714 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1716 scrollbar_size ());
1535 scr_refresh (refresh_type); 1717 want_refresh = 1;
1536 refresh_limit = 0; 1718 refresh_limit = 0;
1537 scrollbar_show (1); 1719 scrollbar_show (1);
1538 } 1720 }
1539 break; 1721 break;
1540 } 1722 }
1541}
1542 1723
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1728 {
1729 if (hidden_cursor)
1730 {
1731 hidden_cursor = 0;
1732 want_refresh = 1;
1733 }
1734
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1736 }
1737#endif
1738
1739#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 {
1742 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease)
1745 if (hidden_pointer)
1746 pointer_unblank ();
1747
1748 if (ev.type == KeyPress && hidden_pointer == 0)
1749 pointer_blank ();
1750 }
1751#endif
1752}
1753
1754void
1755rxvt_term::focus_in ()
1756{
1757 if (!focus)
1758 {
1759 focus = 1;
1760 want_refresh = 1;
1761
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763
1764#if USE_XIM
1765 if (Input_Context != NULL)
1766 {
1767 IMSetStatusPosition ();
1768 XSetICFocus (Input_Context);
1769 }
1770#endif
1771#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1774#endif
1775#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade])
1777 {
1778 pix_colors = pix_colors_focused;
1779 scr_recolour ();
1780 }
1781#endif
1782 }
1783}
1784
1785void
1786rxvt_term::focus_out ()
1787{
1788 if (focus)
1789 {
1790 focus = 0;
1791 want_refresh = 1;
1792
1793 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794
1795#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf)
1797 {
1798 iso14755buf = 0;
1799# if ENABLE_OVERLAY
1800 scr_overlay_off ();
1801# endif
1802 }
1803#endif
1804#if USE_XIM
1805 if (Input_Context != NULL)
1806 XUnsetICFocus (Input_Context);
1807#endif
1808#if CURSOR_BLINK
1809 if (OPTION (Opt_cursorBlink))
1810 cursor_blink_ev.stop ();
1811 hidden_cursor = 0;
1812#endif
1813#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade])
1815 {
1816 pix_colors = pix_colors_unfocused;
1817 scr_recolour ();
1818 }
1819#endif
1820 }
1821}
1822
1823#if TRANSPARENT
1543void 1824void
1544rxvt_term::rootwin_cb (XEvent &ev) 1825rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1826{
1546 SET_R (this); 1827 SET_R (this);
1547 SET_LOCALE (locale); 1828 SET_LOCALE (locale);
1548 1829
1549 switch (ev.type) 1830 switch (ev.type)
1550 { 1831 {
1551 case PropertyNotify: 1832 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 /* 1833 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1834 * 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. 1835 * use the property to determine the pixmap. We use it later on.
1564 */ 1836 */
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]) 1837 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1839 return;
1570 }
1571 1840
1572 /* FALLTHROUGH */ 1841 /* FALLTHROUGH */
1573 case ReparentNotify: 1842 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1844 want_refresh = want_full_refresh = 1;
1577 break; 1845 break;
1578#endif
1579 } 1846 }
1580} 1847}
1848#endif
1581 1849
1582void 1850void
1583rxvt_term::button_press (const XButtonEvent &ev) 1851rxvt_term::button_press (XButtonEvent &ev)
1584{ 1852{
1585 int reportmode = 0, clickintime; 1853 int reportmode = 0, clickintime;
1586 1854
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1855 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1856
1588 if (!bypass_keystate) 1857 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1858 reportmode = !! (priv_modes & PrivMode_mouse_report);
1859
1590 /* 1860 /*
1591 * VT window processing of button press 1861 * VT window processing of button press
1592 */ 1862 */
1593 if (ev.window == TermWin.vt) 1863 if (ev.window == vt)
1594 { 1864 {
1595#if RXVT_GRAPHICS 1865#if ISO_14755
1596 if (ev.subwindow != None) 1866 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1868 {
1599#endif 1869 iso14755_54 (ev.x, ev.y);
1600 1870 return;
1601 { 1871 }
1872#endif
1873
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1874 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1875
1603 if (reportmode) 1876 if (reportmode)
1877 {
1878 /* mouse report from vt window */
1879 /* save the xbutton state (for ButtonRelease) */
1880 MEvent.state = ev.state;
1881#ifdef MOUSE_REPORT_DOUBLECLICK
1882 if (ev.button == MEvent.button && clickintime)
1604 { 1883 {
1605 /* mouse report from vt window */ 1884 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1885 MEvent.clicks++;
1607 MEvent.state = ev.state; 1886
1608#ifdef MOUSE_REPORT_DOUBLECLICK 1887 if (MEvent.clicks > 1)
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1888 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1889 /* only report double clicks */
1616 MEvent.clicks = 2; 1890 MEvent.clicks = 2;
1617 mouse_report (ev); 1891 mouse_report (ev);
1618 1892
1619 /* don't report the release */ 1893 /* don't report the release */
1620 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1895 MEvent.button = AnyButton;
1622 }
1623 } 1896 }
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 } 1897 }
1637 else 1898 else
1638 { 1899 {
1639 if (ev.button != MEvent.button) 1900 /* different button, or time expired */
1640 MEvent.clicks = 0; 1901 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; 1902 MEvent.button = ev.button;
1663 break; 1903 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 } 1904 }
1905#else
1906 MEvent.button = ev.button;
1907 mouse_report (ev);
1908#endif /* MOUSE_REPORT_DOUBLECLICK */
1909
1910 }
1911 else
1912 {
1913 if (ev.button != MEvent.button)
1914 MEvent.clicks = 0;
1915
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917 switch (ev.button)
1918 {
1919 case Button1:
1920 /* allow meta + click to select rectangular areas */
1921 /* should be done in screen.C */
1922#if ENABLE_FRILLS
1923 selection.rect = !!(ev.state & ModMetaMask);
1924#else
1925 selection.rect = false;
1926#endif
1927
1928 /* allow shift+left click to extend selection */
1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930 {
1931 if (MEvent.button == Button1 && clickintime)
1932 selection_rotate (ev.x, ev.y);
1933 else
1934 selection_extend (ev.x, ev.y, 1);
1935 }
1936 else
1937 {
1938 if (MEvent.button == Button1 && clickintime)
1939 MEvent.clicks++;
1940 else
1941 MEvent.clicks = 1;
1942
1943 selection_click (MEvent.clicks, ev.x, ev.y);
1944 }
1945
1946 MEvent.button = Button1;
1947 break;
1948
1949 case Button3:
1950 if (MEvent.button == Button3 && clickintime)
1951 selection_rotate (ev.x, ev.y);
1952 else
1953 selection_extend (ev.x, ev.y, 1);
1954
1955 MEvent.button = Button3;
1956 break;
1957 }
1958 }
1959
1674 MEvent.time = ev.time; 1960 MEvent.time = ev.time;
1675 return; 1961 return;
1676 }
1677 } 1962 }
1678 1963
1679 /* 1964 /*
1680 * Scrollbar window processing of button press 1965 * Scrollbar window processing of button press
1681 */ 1966 */
… …
1745 upordown = 1; /* down */ 2030 upordown = 1; /* down */
1746 } 2031 }
1747 if (upordown) 2032 if (upordown)
1748 { 2033 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2035 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 2036#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 2037 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 2038 {
1754 if (upordown < 0) 2039 if (upordown < 0)
1755 scrollBar.setUp (); 2040 scrollBar.setUp ();
… …
1771 break; 2056 break;
1772 case R_SB_ALIGN_BOTTOM: 2057 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 2058 csrO = scrollBar.bot - scrollBar.top;
1774 break; 2059 break;
1775 } 2060 }
2061
1776 if (scrollBar.style == R_SB_XTERM 2062 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 2063 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 2064 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 2065 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 2066
1781 scrollBar.setMotion (); 2067 scrollBar.setMotion ();
1782 break; 2068 break;
1783 2069
1784 case Button1: 2070 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2071 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2075 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2076 if (scrollBar.style != R_SB_XTERM)
1791 { 2077 {
1792 if (scrollbar_above_slider (ev.y)) 2078 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2080 scr_page (UP, nrow - 1);
1795# else 2081# else
1796 scr_page (UP, TermWin.nrow / 4); 2082 scr_page (UP, nrow / 4);
1797# endif 2083# endif
1798 else if (scrollbar_below_slider (ev.y)) 2084 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2085# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2086 scr_page (DN, nrow - 1);
1801# else 2087# else
1802 scr_page (DN, TermWin.nrow / 4); 2088 scr_page (DN, nrow / 4);
1803# endif 2089# endif
1804 else 2090 else
1805 scrollBar.setMotion (); 2091 scrollBar.setMotion ();
1806 } 2092 }
1807 else 2093 else
1808 { 2094 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2095 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2096 (nrow
1811 * scrollbar_position (ev.y) 2097 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2098 / scrollbar_size ()));
1813 } 2099 }
2100
1814 break; 2101 break;
1815 } 2102 }
1816 } 2103 }
2104
1817 return; 2105 return;
1818 } 2106 }
2107
1819#if MENUBAR 2108#if MENUBAR
1820 /* 2109 /*
1821 * Menubar window processing of button press 2110 * Menubar window processing of button press
1822 */ 2111 */
1823 if (isMenuBarWindow (ev.window)) 2112 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev); 2113 menubar_control (ev);
1825#endif 2114#endif
1826} 2115}
1827 2116
1828void 2117void
1829rxvt_term::button_release (const XButtonEvent &ev) 2118rxvt_term::button_release (XButtonEvent &ev)
1830{ 2119{
1831 int reportmode = 0; 2120 int reportmode = 0;
1832 2121
1833 csrO = 0; /* reset csr Offset */ 2122 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2123 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2124 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2125
1837 if (scrollbar_isUpDn ()) 2126 if (scrollbar_isUpDn ())
1838 { 2127 {
1839 scrollBar.setIdle (); 2128 scrollBar.setIdle ();
1840 scrollbar_show (0); 2129 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 2131 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 2132#endif
1844
1845 } 2133 }
2134
1846#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop();
1848#endif 2138#endif
2139
1849 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1850 { 2141 {
1851#ifdef RXVT_GRAPHICS 2142#if ISO_14755
1852 if (ev.subwindow != None) 2143 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 2145 return;
1855#endif 2146#endif
1856
1857 {
1858 if (reportmode) 2147 if (reportmode)
2148 {
2149 /* mouse report from vt window */
2150 /* don't report release of wheel "buttons" */
2151 if (ev.button >= 4)
2152 return;
2153#ifdef MOUSE_REPORT_DOUBLECLICK
2154 /* only report the release of 'slow' single clicks */
2155 if (MEvent.button != AnyButton
2156 && (ev.button != MEvent.button
2157 || (ev.time - MEvent.time
2158 > MULTICLICK_TIME / 2)))
1859 { 2159 {
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; 2160 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2161 MEvent.button = AnyButton;
1877 mouse_report (ev); 2162 mouse_report (ev);
2163 }
2164#else /* MOUSE_REPORT_DOUBLECLICK */
2165 MEvent.button = AnyButton;
2166 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2167#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2168 return;
2169 }
2170
2171 /*
2172 * dumb hack to compensate for the failure of click-and-drag
2173 * when overriding mouse reporting
2174 */
2175 if (priv_modes & PrivMode_mouse_report
2176 && bypass_keystate
2177 && ev.button == Button1 && MEvent.clicks <= 1)
2178 selection_extend (ev.x, ev.y, 0);
2179
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2183 switch (ev.button)
2184 {
2185 case Button1:
2186 case Button3:
2187 selection_make (ev.time);
2188 break;
2189 case Button2:
2190 selection_request (ev.time, ev.x, ev.y);
2191 break;
2192#ifdef MOUSE_WHEEL
2193 case Button4:
2194 case Button5:
2195 {
2196 int i;
2197 page_dirn v;
2198
2199 v = ev.button == Button4 ? UP : DN;
2200
2201 if (ev.state & ShiftMask)
2202 i = 1;
2203 else if (OPTION (Opt_mouseWheelScrollPage))
2204 i = nrow - 1;
2205 else
2206 i = 5;
2207
2208# ifdef MOUSE_SLIP_WHEELING
2209 if (ev.state & ControlMask)
2210 {
2211 mouse_slip_wheel_speed += v ? -1 : 1;
2212 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2213 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2214
2215 if (slip_wheel_ev.at < NOW)
2216 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2217
2218 slip_wheel_ev.start ();
2219 }
2220 else
2221 {
2222# endif
2223 scr_page (v, i);
2224 scrollbar_show (1);
2225# ifdef MOUSE_SLIP_WHEELING
2226 }
2227# endif
1880 } 2228 }
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; 2229 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 2230#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 } 2231 }
1939 } 2232 }
1940#ifdef MENUBAR 2233#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2234 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2235 menubar_control (ev);
1943#endif 2236#endif
1944} 2237}
1945 2238
1946
1947#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2240#if TINTING
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = display->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
1948/* 2471/*
1949 * Check our parents are still who we think they are. 2472 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2473 * Do transparency updates if required
1951 */ 2474 */
1952int 2475int
1953rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
1954{ 2477{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2478 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2479 unsigned long nitems, bytes_after;
1957 Atom atype; 2480 Atom atype;
1958 unsigned char *prop = NULL; 2481 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2482 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2483 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2484 XWindowAttributes wattr, wrootattr;
2485 dDisp;
1962 2486
1963 pchanged = 0; 2487 pchanged = 0;
1964 2488
1965 if (! (Options & Opt_transparent)) 2489 if (!OPTION (Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
1967 2491
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2492 XGetWindowAttributes (disp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2493 rootdepth = wrootattr.depth;
1970 2494
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2495 XGetWindowAttributes (disp, parent[0], &wattr);
2496
1972 if (rootdepth != wattr.depth) 2497 if (rootdepth != wattr.depth)
1973 { 2498 {
1974 if (am_transparent) 2499 if (am_transparent)
1975 { 2500 {
1976 pchanged = 1; 2501 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2503 am_transparent = am_pixmap_trans = 0;
1980 } 2504 }
2505
1981 return pchanged; /* Don't try any more */ 2506 return pchanged; /* Don't try any more */
1982 } 2507 }
1983 2508
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2509 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2510 XSync (disp, False);
1986 2511
1987 /* 2512 /*
1988 * Make the frame window set by the window manager have 2513 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2514 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2515 * windows for each client, so we have to take care about that.
1991 */ 2516 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2517 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2518 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2520 &nitems, &bytes_after, &prop) == Success);
2521
1996 if (!i || prop == NULL) 2522 if (!i || prop == NULL)
2523 i = (xa[XA_ESETROOT_PMAP_ID]
2524 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526 &nitems, &bytes_after, &prop) == Success);
2527
2528 if (!i || prop == NULL
2529#if TINTING
2530 || !rs[Rs_color + Color_tint]
2531#endif
2532 )
1997 have_pixmap = 0; 2533 have_pixmap = 0;
1998 else 2534 else
1999 { 2535 {
2000 have_pixmap = 1; 2536 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2537 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2538 XFree (prop);
2003 } 2539 }
2540
2004 if (have_pixmap) 2541 if (have_pixmap)
2005 { 2542 {
2006 /* 2543 /*
2007 * Copy display->root pixmap transparency 2544 * Copy display->root pixmap transparency
2008 */ 2545 */
2009 int sx, sy, nx, ny; 2546 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2547 unsigned int nw, nh;
2011 Window cr; 2548 Window cr;
2012 XImage *image; 2549 XImage *image;
2013 GC gc; 2550 GC gc;
2014 XGCValues gcvalue; 2551 XGCValues gcvalue;
2015 2552
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2553 XTranslateCoordinates (disp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2554 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2555 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2556 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2557 nx = ny = 0;
2558
2021 if (sx < 0) 2559 if (sx < 0)
2022 { 2560 {
2023 nw += sx; 2561 nw += sx;
2024 nx = -sx; 2562 nx = -sx;
2025 sx = 0; 2563 sx = 0;
2026 } 2564 }
2565
2027 if (sy < 0) 2566 if (sy < 0)
2028 { 2567 {
2029 nh += sy; 2568 nh += sy;
2030 ny = -sy; 2569 ny = -sy;
2031 sy = 0; 2570 sy = 0;
2032 } 2571 }
2572
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2575
2576 XSync (disp, False);
2035 allowedxerror = -1; 2577 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2579
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2580 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2581 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2582 allowedxerror = 0;
2583
2041 if (image == NULL) 2584 if (image == NULL)
2042 { 2585 {
2043 if (am_transparent && am_pixmap_trans) 2586 if (am_transparent && am_pixmap_trans)
2044 { 2587 {
2045 pchanged = 1; 2588 pchanged = 1;
2046 if (TermWin.pixmap != None) 2589 if (pixmap != None)
2047 { 2590 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2591 XFreePixmap (disp, pixmap);
2049 TermWin.pixmap = None; 2592 pixmap = None;
2050 } 2593 }
2051 } 2594 }
2595
2052 am_pixmap_trans = 0; 2596 am_pixmap_trans = 0;
2053 } 2597 }
2054 else 2598 else
2055 { 2599 {
2056 if (TermWin.pixmap != None) 2600 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2601 XFreePixmap (disp, pixmap);
2602
2603#if TINTING
2604 if (ISSET_PIXCOLOR (Color_tint))
2605 {
2606 unsigned short rm, gm, bm;
2607 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608
2609 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2610
2611 ShadeXImage (display, image, shade, rm, gm, bm);
2612 }
2613#endif
2614
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2615 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2616 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2619 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2620 XFreeGC (disp, gc);
2067 XDestroyImage (image); 2621 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2069 TermWin.pixmap); 2623 XClearWindow (disp, parent[0]);
2624
2070 if (!am_transparent || !am_pixmap_trans) 2625 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2626 pchanged = 1;
2627
2072 am_transparent = am_pixmap_trans = 1; 2628 am_transparent = am_pixmap_trans = 1;
2073 } 2629 }
2074 } 2630 }
2631
2075 if (!am_pixmap_trans) 2632 if (am_pixmap_trans)
2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2634 else
2076 { 2635 {
2077 unsigned int n; 2636 unsigned int n;
2078 /* 2637 /*
2079 * InheritPixmap transparency 2638 * InheritPixmap transparency
2080 */ 2639 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2641 {
2085 oldp = TermWin.parent[i]; 2642 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2643 XQueryTree (disp, parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2644 &parent[i], &list, &n);
2088 XFree (list); 2645 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2646
2090 if (TermWin.parent[i] == display->root) 2647 if (parent[i] == display->root)
2091 { 2648 {
2092 if (oldp != None) 2649 if (oldp != None)
2093 pchanged = 1; 2650 pchanged = 1;
2651
2094 break; 2652 break;
2095 } 2653 }
2654
2096 if (oldp != TermWin.parent[i]) 2655 if (oldp != parent[i])
2097 pchanged = 1; 2656 pchanged = 1;
2098 } 2657 }
2658
2099 n = 0; 2659 n = 0;
2660
2100 if (pchanged) 2661 if (pchanged)
2101 { 2662 {
2102 for (; n < (unsigned int)i; n++) 2663 for (; n < (unsigned int)i; n++)
2103 { 2664 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2665 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) 2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2667 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2109 break; 2669 break;
2110 } 2670 }
2111 } 2671 }
2112 } 2672 }
2113 if (n > (int) (sizeof (TermWin.parent) 2673
2114 / sizeof (TermWin.parent[0]))) 2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2115 { 2675 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2677 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; 2678 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2679 /* XXX: also turn off Opt_transparent? */
2123 } 2680 }
2124 else 2681 else
2125 { 2682 {
2683#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2684 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2685 * 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); 2686 sleep (1);
2136# endif 2687#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2688 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2689 {
2140 ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2691 XClearWindow (disp, parent[n]);
2142 ParentRelative); 2692 }
2693
2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2143 am_transparent = 1; 2695 am_transparent = 1;
2144 } 2696 }
2697
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2699 parent[i] = None;
2700 }
2701
2702 if (scrollBar.win)
2147 } 2703 {
2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2705 scrollBar.setIdle ();
2706 scrollbar_show (0);
2707 }
2708
2709 if (am_transparent)
2710 {
2711 want_refresh = want_full_refresh = 1;
2712 if (am_pixmap_trans)
2713 flush ();
2714 }
2715
2148 return pchanged; 2716 return pchanged;
2149} 2717}
2150#endif 2718#endif
2151 2719
2152/*}}} */ 2720/*}}} */
2721
2722bool
2723rxvt_term::cmd_parse ()
2724{
2725 bool flag = false;
2726 wchar_t ch = NOCHAR;
2727 char *seq_begin; // remember start of esc-sequence here
2728
2729 for (;;)
2730 {
2731 if (ch == NOCHAR)
2732 {
2733 seq_begin = cmdbuf_ptr;
2734 ch = next_char ();
2735
2736 if (ch == NOCHAR)
2737 break;
2738 }
2739
2740 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2741 {
2742 if (!seen_input)
2743 {
2744 seen_input = 1;
2745 // many badly-written programs (e.g. jed) contain a race condition:
2746 // they first read the screensize and then install a SIGWINCH handler.
2747 // some window managers resize the window early, and these programs
2748 // then sometimes get the size wrong.
2749 // unfortunately other programs are even more buggy and dislike
2750 // being sent SIGWINCH, so only do it when we were in fact being
2751 // resized.
2752 if (seen_resize && cmd_pid)
2753 kill (-cmd_pid, SIGWINCH);
2754 }
2755
2756 /* Read a text string from the input buffer */
2757 wchar_t buf[UBUFSIZ];
2758 bool refreshnow = false;
2759 int nlines = 0;
2760 wchar_t *str = buf;
2761 wchar_t *eol = str + min (ncol, UBUFSIZ);
2762
2763 for (;;)
2764 {
2765 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2766 break;
2767
2768 *str++ = ch;
2769
2770 if (ch == C0_LF || str >= eol)
2771 {
2772 if (ch == C0_LF)
2773 nlines++;
2774
2775 refresh_count++;
2776
2777 if (!OPTION (Opt_jumpScroll)
2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2779 {
2780 refreshnow = true;
2781 refresh_count = 0;
2782 ch = NOCHAR;
2783 break;
2784 }
2785
2786 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1)
2788 {
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2790 scr_add_lines (buf, str - buf, nlines);
2791
2792 nlines = 0;
2793 str = buf;
2794 eol = str + min (ncol, UBUFSIZ);
2795 }
2796
2797 if (str >= eol)
2798 {
2799 if (eol >= buf + UBUFSIZ)
2800 {
2801 ch = NOCHAR;
2802 break;
2803 }
2804 else
2805 eol = min (eol + ncol, buf + UBUFSIZ);
2806 }
2807
2808 }
2809
2810 seq_begin = cmdbuf_ptr;
2811 ch = next_char ();
2812 }
2813
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2815 scr_add_lines (buf, str - buf, nlines);
2816
2817 /*
2818 * If there have been a lot of new lines, then update the screen
2819 * What the heck I'll cheat and only refresh less than every page-full.
2820 * the number of pages between refreshes is refresh_limit, which
2821 * is incremented here because we must be doing flat-out scrolling.
2822 */
2823 if (refreshnow)
2824 {
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++;
2827 else
2828 {
2829 flag = true;
2830 scr_refresh (refresh_type);
2831 want_refresh = 1;
2832 }
2833 }
2834
2835 }
2836 else
2837 {
2838 try
2839 {
2840 process_nonprinting (ch);
2841 }
2842 catch (const class out_of_input &o)
2843 {
2844 // we ran out of input, retry later
2845 cmdbuf_ptr = seq_begin;
2846 break;
2847 }
2848
2849 ch = NOCHAR;
2850 }
2851 }
2852
2853 return flag;
2854}
2855
2856// read the next character
2857wchar_t
2858rxvt_term::next_char ()
2859{
2860 while (cmdbuf_ptr < cmdbuf_endp)
2861 {
2862 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2864 return *cmdbuf_ptr++;
2865
2866 wchar_t wc;
2867 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2868
2869 if (len == (size_t)-2)
2870 {
2871 // the mbstate stores incomplete sequences. didn't know this :/
2872 cmdbuf_ptr = cmdbuf_endp;
2873 break;
2874 }
2875
2876 if (len == (size_t)-1)
2877 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2878
2879 // assume wchar == unicode
2880 cmdbuf_ptr += len;
2881 return wc & UNICODE_MASK;
2882 }
2883
2884 return NOCHAR;
2885}
2886
2887// read the next octet
2888uint32_t
2889rxvt_term::next_octet ()
2890{
2891 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR;
2894}
2895
2896/* rxvt_cmd_getc () - Return next input character */
2897/*
2898 * Return the next input character after first passing any keyboard input
2899 * to the command.
2900 */
2901wchar_t
2902rxvt_term::cmd_getc ()
2903{
2904 wchar_t c = next_char ();
2905
2906 if (c == NOCHAR)
2907 throw out_of_input;
2908
2909 return c;
2910}
2911
2912uint32_t
2913rxvt_term::cmd_get8 ()
2914{
2915 uint32_t c = next_octet ();
2916
2917 if (c == NOCHAR)
2918 throw out_of_input;
2919
2920 return c;
2921}
2153 2922
2154/*{{{ print pipe */ 2923/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2924/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2925#ifdef PRINTPIPE
2157FILE * 2926FILE *
2158rxvt_term::popen_printer () 2927rxvt_term::popen_printer ()
2159{ 2928{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2929 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2930
2162 if (stream == NULL) 2931 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2932 rxvt_warn ("can't open printer pipe, not printing.\n");
2933
2164 return stream; 2934 return stream;
2165} 2935}
2166 2936
2167int 2937int
2168rxvt_term::pclose_printer (FILE *stream) 2938rxvt_term::pclose_printer (FILE *stream)
2169{ 2939{
2170 fflush (stream); 2940 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); 2941 return pclose (stream);
2177# endif
2178} 2942}
2179 2943
2180/* 2944/*
2181 * simulate attached vt100 printer 2945 * simulate attached vt100 printer
2182 */ 2946 */
2183void 2947void
2184rxvt_term::process_print_pipe () 2948rxvt_term::process_print_pipe ()
2185{ 2949{
2186 int done; 2950 int done;
2187 FILE *fd; 2951 FILE *fd;
2188 2952
2189 if ((fd = popen_printer ()) == NULL) 2953 if ((fd = popen_printer ()) == NULL)
2190 return; 2954 return;
2191 2955
2192 /* 2956 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2957 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2958 * is received.
2195 */ 2959 */
2196 for (done = 0; !done;) 2960 for (done = 0; !done;)
2197 { 2961 {
2198 unsigned char buf[8]; 2962 unsigned char buf[8];
2199 unsigned char ch; 2963 unicode_t ch;
2200 unsigned int i, len; 2964 unsigned int i, len;
2201 2965
2202 if ((ch = cmd_getc ()) != C0_ESC) 2966 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2967 {
2204 if (putc (ch, fd) == EOF) 2968 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2969 break; /* done = 1 */
… …
2220 { 2984 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2985 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2986 break; /* done = 1 */
2223 } 2987 }
2224 } 2988 }
2989
2225 for (i = 0; i < len; i++) 2990 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2991 if (putc (buf[i], fd) == EOF)
2227 { 2992 {
2228 done = 1; 2993 done = 1;
2229 break; 2994 break;
2230 } 2995 }
2231 } 2996 }
2232 } 2997 }
2998
2233 pclose_printer (fd); 2999 pclose_printer (fd);
2234} 3000}
2235#endif /* PRINTPIPE */ 3001#endif /* PRINTPIPE */
2236/*}}} */ 3002/*}}} */
2237 3003
2238/* *INDENT-OFF* */ 3004/* *INDENT-OFF* */
2239enum { 3005enum {
2240 C1_40 = 0x40, 3006 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3007 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, 3008 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, 3009 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 3010 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 3011};
2246/* *INDENT-ON* */ 3012/* *INDENT-ON* */
2247 3013
2248/*{{{ process non-printing single characters */ 3014/*{{{ process non-printing single characters */
2249void 3015void
2250rxvt_term::process_nonprinting (unsigned char ch) 3016rxvt_term::process_nonprinting (unicode_t ch)
2251{ 3017{
2252 switch (ch) 3018 switch (ch)
2253 { 3019 {
3020 case C0_ESC:
3021 process_escape_seq ();
3022 break;
2254 case C0_ENQ: /* terminal Status */ 3023 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 3024 if (rs[Rs_answerbackstring])
2256 tt_write ( 3025 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 3026 else
2260 tt_write ((unsigned char *)VT100_ANS, 3027 tt_write (VT100_ANS, strlen (VT100_ANS));
2261 (unsigned int)STRLEN (VT100_ANS));
2262 break; 3028 break;
2263 case C0_BEL: /* bell */ 3029 case C0_BEL: /* bell */
2264 scr_bell (); 3030 scr_bell ();
2265 break; 3031 break;
2266 case C0_BS: /* backspace */ 3032 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 3047 scr_charset_choose (1);
2282 break; 3048 break;
2283 case C0_SI: /* shift in - acs */ 3049 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 3050 scr_charset_choose (0);
2285 break; 3051 break;
3052
3053#ifdef EIGHT_BIT_CONTROLS
3054 // 8-bit controls
3055 case 0x90: /* DCS */
3056 process_dcs_seq ();
3057 break;
3058 case 0x9b: /* CSI */
3059 process_csi_seq ();
3060 break;
3061 case 0x9d: /* CSI */
3062 process_osc_seq ();
3063 break;
3064#endif
2286 } 3065 }
2287} 3066}
2288/*}}} */ 3067/*}}} */
2289 3068
2290 3069
2291/*{{{ process VT52 escape sequences */ 3070/*{{{ process VT52 escape sequences */
2292void 3071void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 3072rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 3073{
2295 int row, col; 3074 int row, col;
2296 3075
2297 switch (ch) 3076 switch (ch)
2298 { 3077 {
… …
2350 3129
2351/*{{{ process escape sequences */ 3130/*{{{ process escape sequences */
2352void 3131void
2353rxvt_term::process_escape_seq () 3132rxvt_term::process_escape_seq ()
2354{ 3133{
2355 unsigned char ch = cmd_getc (); 3134 unicode_t ch = cmd_getc ();
2356 3135
2357 if (PrivateModes & PrivMode_vt52) 3136 if (priv_modes & PrivMode_vt52)
2358 { 3137 {
2359 process_escape_vt52 (ch); 3138 process_escape_vt52 (ch);
2360 return; 3139 return;
2361 } 3140 }
2362 3141
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3156 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3157 break;
2379 case '+': 3158 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3159 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3160 break;
2382#ifdef MULTICHAR_SET 3161#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': 3162 case '6':
2389 scr_backindex (); 3163 scr_backindex ();
2390 break; 3164 break;
2391#endif 3165#endif
2392 case '7': 3166 case '7':
2393 scr_cursor (SAVE); 3167 scr_cursor (SAVE);
2394 break; 3168 break;
2395 case '8': 3169 case '8':
2396 scr_cursor (RESTORE); 3170 scr_cursor (RESTORE);
2397 break; 3171 break;
2398#ifndef NO_FRILLS 3172#if ENABLE_FRILLS
2399 case '9': 3173 case '9':
2400 scr_forwardindex (); 3174 scr_forwardindex ();
2401 break; 3175 break;
2402#endif 3176#endif
2403 case '=': 3177 case '=':
… …
2413 break; 3187 break;
2414 3188
2415 /* 8.3.87: NEXT LINE */ 3189 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3190 case C1_NEL: /* ESC E */
2417 { 3191 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3192 wchar_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3193 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2420 } 3194 }
2421 break; 3195 break;
2422 3196
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3197 /* kidnapped escape sequence: Should be 8.3.48 */
2424 case C1_ESA: /* ESC G */ 3198 case C1_ESA: /* ESC G */
… …
2434 case C1_RI: /* ESC M */ 3208 case C1_RI: /* ESC M */
2435 scr_index (DN); 3209 scr_index (DN);
2436 break; 3210 break;
2437 3211
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3212 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3213 /*case C1_SS2: scr_single_shift (2); break; */
2440 3214
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3215 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3216 /*case C1_SS3: scr_single_shift (3); break; */
2443 3217
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3218 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3219 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3220 process_dcs_seq ();
2447 break; 3221 break;
2448 3222
2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3223 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2450 case C1_SCI: /* ESC Z */ 3224 case C1_SCI: /* ESC Z */
2451 tt_write ((const unsigned char *)ESCZ_ANSWER, 3225 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2453 break; /* steal obsolete ESC [ c */ 3226 break; /* steal obsolete ESC [ c */
2454 3227
2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3228 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2456 case C1_CSI: /* ESC [ */ 3229 case C1_CSI: /* ESC [ */
2457 process_csi_seq (); 3230 process_csi_seq ();
… …
2462 process_osc_seq (); 3235 process_osc_seq ();
2463 break; 3236 break;
2464 3237
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3238 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3239 case 'c':
3240 mbstate.reset ();
2467 scr_poweron (); 3241 scr_poweron ();
2468 scrollbar_show (1); 3242 scrollbar_show (1);
2469 break; 3243 break;
2470 3244
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3245 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3257
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3258/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3259/* *INDENT-OFF* */
2486enum { 3260enum {
2487 CSI_ICH = 0x40, 3261 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3262 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 , 3263 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, 3264 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, 3265 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, 3266 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, 3267 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, */ 3282 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, [, \, ], ^, _, */ 3283 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, */ 3284 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, */ 3285 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, */ 3286 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, {, |, }, ~, */ 3287 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3288 };
2515/* *INDENT-ON* */ 3289/* *INDENT-ON* */
2516 3290
2517void 3291void
2518rxvt_term::process_csi_seq () 3292rxvt_term::process_csi_seq ()
2519{ 3293{
2520 unsigned char ch, priv, i; 3294 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3295 unsigned int nargs, p;
2522 int n, ndef; 3296 int n, ndef;
2523 int arg[ESC_ARGS]; 3297 int arg[ESC_ARGS];
2524 3298
2525 for (nargs = ESC_ARGS; nargs > 0;) 3299 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3300 arg[--nargs] = 0;
2527 3301
2528 priv = 0; 3302 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3304 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3305 { /* '<' '=' '>' '?' */
2532 priv = ch; 3306 priv = ch;
2533 ch = cmd_getc (); 3307 ch = cmd_getc ();
2534 } 3308 }
3309
2535 /* read any numerical arguments */ 3310 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3311 for (n = -1; ch < CSI_ICH; )
2537 { 3312 {
2538 if (isdigit (ch)) 3313 if (isdigit (ch))
2539 { 3314 {
… …
2546 { 3321 {
2547 if (nargs < ESC_ARGS) 3322 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3323 arg[nargs++] = n;
2549 n = -1; 3324 n = -1;
2550 } 3325 }
2551 else if (ch == '\b') 3326 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); 3327 process_nonprinting (ch);
2563 } 3328
2564 ch = cmd_getc (); 3329 ch = cmd_getc ();
2565 } 3330 }
2566 3331
2567 if (ch > CSI_7F) 3332 if (ch > CSI_7F)
2568 return; 3333 return;
… …
2590 { 3355 {
2591 switch (priv) 3356 switch (priv)
2592 { 3357 {
2593 case '>': 3358 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3359 if (ch == CSI_DA) /* secondary device attributes */
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3360 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2596 break; 3361 break;
2597 case '?': 3362 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3363 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3364 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3365 break;
… …
2705 3470
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3471 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3472 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3473 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3474 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3475 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3476 break;
2712 3477
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3478 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3479 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3480 break;
2717 3481
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3482 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3483 process_sgr_mode (nargs, arg);
2720 break; 3484 break;
… …
2726 tt_printf ("\033[0n"); 3490 tt_printf ("\033[0n");
2727 break; 3491 break;
2728 case 6: /* CPR requested */ 3492 case 6: /* CPR requested */
2729 scr_report_position (); 3493 scr_report_position ();
2730 break; 3494 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3495 case 7: /* unofficial extension */
3496 if (OPTION (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3497 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3498 break;
2735#endif
2736 case 8: /* unofficial extension */ 3499 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3501 break;
2739 } 3502 }
2740 break; 3503 break;
2741 3504
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3505 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3538 break;
2776 3539
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3540 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3541 if (arg[0] == 4)
2779 scr_insert_mode (0); 3542 scr_insert_mode (0);
3543 else if (arg[0] == 20)
3544 priv_modes &= ~PrivMode_LFNL;
2780 break; 3545 break;
2781 3546
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3547 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3548 if (arg[0] == 4)
2784 scr_insert_mode (1); 3549 scr_insert_mode (1);
3550 else if (arg[0] == 20)
3551 priv_modes |= PrivMode_LFNL;
2785 break; 3552 break;
2786 3553
2787 /* 3554 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3555 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3556 */
… …
2801 break; 3568 break;
2802 case CSI_75: 3569 case CSI_75:
2803 scr_cursor (RESTORE); 3570 scr_cursor (RESTORE);
2804 break; 3571 break;
2805 3572
2806#ifndef NO_FRILLS 3573#if ENABLE_FRILLS
2807 case CSI_74: 3574 case CSI_74:
2808 process_window_ops (arg, nargs); 3575 process_window_ops (arg, nargs);
2809 break; 3576 break;
2810#endif 3577#endif
2811 3578
2812 case CSI_78: /* DECREQTPARM */ 3579 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3580 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3581 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3582 break;
2816 3583
2817 default: 3584 default:
2818 break; 3585 break;
2819 } 3586 }
2820} 3587}
2821/*}}} */ 3588/*}}} */
2822 3589
2823#ifndef NO_FRILLS 3590#if ENABLE_FRILLS
2824/* ARGSUSED */ 3591/* ARGSUSED */
2825void 3592void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3593rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3594{
2828 int x, y; 3595 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3596 XWindowAttributes wattr;
2833 Window wdummy; 3597 Window wdummy;
3598 dDisp;
2834 3599
2835 if (nargs == 0) 3600 if (nargs == 0)
2836 return; 3601 return;
3602
2837 switch (args[0]) 3603 switch (args[0])
2838 { 3604 {
2839 /* 3605 /*
2840 * commands 3606 * commands
2841 */ 3607 */
2842 case 1: /* deiconify window */ 3608 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3609 XMapWindow (disp, parent[0]);
2844 break; 3610 break;
2845 case 2: /* iconify window */ 3611 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3612 XIconifyWindow (disp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3613 break;
2849 case 3: /* set position (pixels) */ 3614 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3615 XMoveWindow (disp, parent[0], args[1], args[2]);
2851 break; 3616 break;
2852 case 4: /* set size (pixels) */ 3617 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3619 break;
2855 case 5: /* raise window */ 3620 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3621 XRaiseWindow (disp, parent[0]);
2857 break; 3622 break;
2858 case 6: /* lower window */ 3623 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3624 XLowerWindow (disp, parent[0]);
2860 break; 3625 break;
2861 case 7: /* refresh window */ 3626 case 7: /* refresh window */
2862 scr_touch (true); 3627 scr_touch (true);
2863 break; 3628 break;
2864 case 8: /* set size (chars) */ 3629 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3630 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3631 (unsigned int) (args[1] * fheight));
2867 break; 3632 break;
3633
3634 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3635 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3636 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3637 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
2872 break; 3639 break;
3640
3641
2873 /* 3642 /*
2874 * reports - some output format copied from XTerm 3643 * reports - some output format copied from XTerm
2875 */ 3644 */
2876 case 11: /* report window state */ 3645 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3648 break;
2880 case 13: /* report window position */ 3649 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3650 XGetWindowAttributes (disp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3651 XTranslateCoordinates (disp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3652 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3653 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3654 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3655 break;
2887 case 14: /* report window size (pixels) */ 3656 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3659 break;
3660 case 18: /* report text area size (chars) */
3661 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662 break;
2891 case 18: /* report window size (chars) */ 3663 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3664 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3665 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3666 case 20: /* report icon label */
3667 {
3668 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3669 XGetIconName (disp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671 XFree (s);
3672 }
2898 break; 3673 break;
2899 case 21: /* report window title */ 3674 case 21: /* report window title */
3675 {
3676 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3677 XFetchName (disp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679 XFree (s);
3680 }
2902 break; 3681 break;
2903#endif
2904
2905 } 3682 }
2906} 3683}
2907#endif 3684#endif
2908 3685
2909/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
2910/* 3687/*
2911 * get input up until STRING TERMINATOR (or BEL) 3688 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3689 * ends_how is terminator used. returned input must be free()'d
2913 */ 3690 */
2914unsigned char * 3691char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3692rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3693{
2917 int seen_esc = 0; /* seen escape? */ 3694 unicode_t ch;
3695 bool seen_esc = false;
2918 unsigned int n = 0; 3696 unsigned int n = 0;
2919 unsigned char *s; 3697 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3698
2922 for (; (ch = cmd_getc ());) 3699 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3700 {
2924 if (ch == C0_BEL 3701 if (seen_esc)
2925 || ch == CHAR_ST 3702 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3703 if (ch == 0x5c) /* 7bit ST */
2927 break; 3704 break;
3705 else
3706 return NULL;
3707 }
2928 if (ch == C0_ESC) 3708 else if (ch == C0_ESC)
2929 { 3709 {
2930 seen_esc = 1; 3710 seen_esc = true;
2931 continue; 3711 continue;
2932 } 3712 }
2933 else if (ch == '\t') 3713 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3714 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3715 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3716 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3717
3718 seen_esc = false;
3719
3720 if (n >= STRING_MAX - 1)
3721 // stop at some sane length
3722 return NULL;
3723
3724 if (ch == C0_SYN)
3725 string[n++] = cmd_get8 ();
3726 else
2938 string[n++] = ch; 3727 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3728 }
3729
2941 string[n++] = '\0'; 3730 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3731
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3732 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3733
2946 return s; 3734 return rxvt_wcstombs (string);
2947} 3735}
2948 3736
2949/*----------------------------------------------------------------------*/ 3737/*----------------------------------------------------------------------*/
2950/* 3738/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3739 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3740 */
2953void 3741void
2954rxvt_term::process_dcs_seq () 3742rxvt_term::process_dcs_seq ()
2955{ 3743{
2956 unsigned char eh, *s; 3744 char *s;
3745 unicode_t eh;
3746
2957 /* 3747 /*
2958 * Not handled yet 3748 * Not handled yet
2959 */ 3749 */
2960 s = get_to_st (&eh); 3750 s = get_to_st (eh);
2961 if (s) 3751 if (s)
2962 free (s); 3752 free (s);
3753
2963 return; 3754 return;
2964} 3755}
2965 3756
2966/*----------------------------------------------------------------------*/ 3757/*----------------------------------------------------------------------*/
2967/* 3758/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3759 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3760 */
2970void 3761void
2971rxvt_term::process_osc_seq () 3762rxvt_term::process_osc_seq ()
2972{ 3763{
2973 unsigned char ch, eh, *s; 3764 unicode_t ch, eh;
2974 int arg; 3765 int arg;
2975 3766
2976 ch = cmd_getc (); 3767 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3768 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3769 arg = arg * 10 + (ch - '0');
2979 3770
2980 if (ch == ';') 3771 if (ch == ';')
2981 { 3772 {
2982 s = get_to_st (&eh); 3773 char *s = get_to_st (eh);
3774
2983 if (s) 3775 if (s)
2984 { 3776 {
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); 3777 process_xterm_seq (arg, s, eh);
2997 free (s); 3778 free (s);
2998 } 3779 }
2999 } 3780 }
3000} 3781}
3782
3783void
3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785{
3786 if (str[0] == '?' && !str[1])
3787 {
3788 unsigned short r, g, b;
3789 pix_colors_focused[color].get (display, r, g, b);
3790 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3791 }
3792 else
3793 set_window_color (color, str);
3794}
3795
3001/* 3796/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3797 * 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 */ 3798 */
3022void 3799void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3800rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3024{ 3801{
3025 int changed = 0; 3802 int changed = 0;
3026 int color; 3803 int color;
3027 char *buf, *name; 3804 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1];
3806 int saveop = op;
3807 dDisp;
3028 3808
3029 assert (str != NULL); 3809 assert (str != NULL);
3030 switch (op) 3810 switch (op)
3031 { 3811 {
3032 case XTerm_name: 3812 case XTerm_name:
3033 set_title (str); 3813 set_title (str);
3034 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
3035 case XTerm_iconName: 3815 case XTerm_iconName:
3036 set_iconName (str); 3816 set_icon_name (str);
3037 break; 3817 break;
3038 case XTerm_title: 3818 case XTerm_title:
3039 set_title (str); 3819 set_title (str);
3040 break; 3820 break;
3821 case XTerm_property:
3822 if (str[0] == '?')
3823 {
3824 Atom prop = display->atom (str + 1);
3825 Atom actual_type;
3826 int actual_format;
3827 unsigned long nitems;
3828 unsigned long bytes_after;
3829 unsigned char *value = 0;
3830 const char *str = "";
3831
3832 if (prop
3833 && XGetWindowProperty (disp, parent[0],
3834 prop, 0, 1<<16, 0, AnyPropertyType,
3835 &actual_type, &actual_format,
3836 &nitems, &bytes_after, &value) == Success
3837 && actual_type != None
3838 && actual_format == 8)
3839 str = (const char *)(value);
3840
3841 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3842
3843 XFree (value);
3844 }
3845 else
3846 {
3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3848
3849 if (eq)
3850 {
3851 *eq = 0;
3852 set_utf8_property (display->atom (str), eq + 1);
3853 }
3854 else
3855 XDeleteProperty (disp, parent[0],
3856 display->atom (str));
3857 }
3858 break;
3859
3041 case XTerm_Color: 3860 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3861 for (buf = (char *)str; buf && *buf;)
3043 { 3862 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3864 break;
3865
3046 *name++ = '\0'; 3866 *name++ = '\0';
3047 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3048 if (color < 0 || color >= TOTAL_COLORS) 3868
3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3049 break; 3870 break;
3871
3050 if ((buf = STRCHR (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3873 *buf++ = '\0';
3874
3875 if (name[0] == '?' && !name[1])
3876 {
3877 unsigned short r, g, b;
3878 pix_colors_focused[color].get (display, r, g, b);
3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880 }
3881 else
3052 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3053 } 3883 }
3884 break;
3885 case XTerm_Color00:
3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3887 break;
3888 case XTerm_Color01:
3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3054 break; 3890 break;
3055#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3894 break;
3059#endif 3895#endif
3060 case XTerm_Color_pointer: 3896 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3897 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3898 break;
3899 case XTerm_Color_pointer_bg:
3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3901 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#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: 3903 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3905 break;
3073#endif 3906 case Rxvt_Color_BD:
3074 3907 case URxvt_Color_BD:
3075 case XTerm_Menu: 3908 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; 3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3913 break;
3914 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3916 break;
3917#endif
3918#if TRANSPARENT && TINTING
3919 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3921 check_our_parents ();
3922 if (am_transparent)
3923 want_full_refresh = want_refresh = 1;
3924 break;
3925#endif
3926
3081 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3082 if (*str != ';') 3928 if (*str != ';')
3083 { 3929 {
3084#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3087#endif
3088 scr_touch (true); 3933 scr_touch (true);
3934#endif
3089 } 3935 }
3936
3090 while ((str = STRCHR (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3091 { 3938 {
3092 str++; 3939 str++;
3093#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
3095#endif 3942#endif
3096
3097 } 3943 }
3944
3098 if (changed) 3945 if (changed)
3099 { 3946 {
3100#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3948 resize_pixmap ();
3102#endif
3103 scr_touch (true); 3949 scr_touch (true);
3950#endif
3104 } 3951 }
3105 break; 3952 break;
3106 3953
3107 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3108 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3109 break; 3956 break;
3110 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3111 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3112 break; 3959 break;
3960
3113 case XTerm_logfile: 3961 case XTerm_logfile:
3962 // TODO, when secure mode?
3963 break;
3964
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3969 break;
3115 case XTerm_font: 3970#endif
3116 change_font (0, str);
3117 break;
3118#if 0 3971#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3120 { 3973 {
3121 int fd; 3974 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3976 {
3124 scr_dump (fd); 3977 scr_dump (fd);
3125 close (fd); 3978 close (fd);
3126 } 3979 }
3127 } 3980 }
3128 break; 3981 break;
3129#endif 3982#endif
3983 case XTerm_font:
3984 op = URxvt_font;
3985 case URxvt_font:
3986#if ENABLE_STYLES
3987 case URxvt_boldFont:
3988 case URxvt_italicFont:
3989 case URxvt_boldItalicFont:
3990#endif
3991 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp);
3996 else
3997 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3999
4000 res = strdup (str);
4001 allocated.push_back ((void *)res);
4002 set_fonts ();
4003 }
4004 break;
4005
4006#if ENABLE_FRILLS
4007 case URxvt_locale:
4008 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4010 else
4011 {
4012 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8);
4014 init_xlocale ();
4015 }
4016 break;
4017
4018 case URxvt_view_up:
4019 case URxvt_view_down:
4020 {
4021 int lines = atoi (str);
4022
4023 if (lines)
4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
4025 else
4026 scr_erase_savelines ();
4027 }
4028
4029 break;
4030#endif
4031
4032#if ENABLE_PERL
4033 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet
4036 break;
4037#endif
3131 } 4038 }
3132} 4039}
3133/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
3134 4041
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4042/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 4050 * so no need for fancy checking
3144 */ 4051 */
3145int 4052int
3146rxvt_term::privcases (int mode, unsigned long bit) 4053rxvt_term::privcases (int mode, unsigned long bit)
3147{ 4054{
3148 int state; 4055 int state;
3149 4056
3150 if (mode == 's') 4057 if (mode == 's')
3151 { 4058 {
3152 SavedModes |= (PrivateModes & bit); 4059 SavedModes |= (priv_modes & bit);
3153 return -1; 4060 return -1;
3154 } 4061 }
3155 else 4062 else
3156 { 4063 {
3157 if (mode == 'r') 4064 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4065 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 4066 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4067 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 4068 PrivMode (state, bit);
3162 } 4069 }
4070
3163 return state; 4071 return state;
3164} 4072}
3165 4073
3166/* we're not using priv _yet_ */ 4074/* we're not using priv _yet_ */
3167void 4075void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 4077{
3170 unsigned int i, j; 4078 unsigned int i, j;
3171 int state; 4079 int state;
4080
3172 static const struct 4081 static const struct
3173 { 4082 {
3174 const int argval; 4083 const int argval;
3175 const unsigned long bit; 4084 const unsigned long bit;
3176 } 4085 }
4086
3177 argtopriv[] = { 4087 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 4088 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 4089 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 4090 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 4091 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 4092 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 4093 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 4094 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 4096 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 4097#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 4098 { menuBar_esc, PrivMode_menuBar },
3188#endif 4099#endif
4100 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 4102#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 4103 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 4104#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 4105 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 4106 { 40, PrivMode_132OK },
4107 // 41 xterm more fixes NYI
4108 // 45 margin bell NYI
4109 // 46 start logging
3195 { 47, PrivMode_Screen }, 4110 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 4111 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 4112#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 4113 { 67, PrivMode_BackSpace },
3199#endif 4114#endif
3200 { 1000, PrivMode_MouseX11 }, 4115 { 1000, PrivMode_MouseX11 },
4116 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4117 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4118 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 4119 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 4120 { 1011, PrivMode_Keypress }, // rxvt extension
4121 // 1035 enable modifiers for alt, numlock NYI
4122 // 1036 send ESC for meta keys NYI
4123 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 4124 { 1047, PrivMode_Screen },
4125 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4126 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4127 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4128 };
3206 4129
3207 if (nargs == 0) 4130 if (nargs == 0)
3208 return; 4131 return;
3209 4132
… …
3224 state = privcases (mode, argtopriv[j].bit); 4147 state = privcases (mode, argtopriv[j].bit);
3225 break; 4148 break;
3226 } 4149 }
3227 4150
3228 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4152 switch (arg[i])
3231 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 set_option (Opt_intensityStyles, mode);
4157
4158 scr_touch (true);
4159 break;
4160#endif
3232 case 1048: /* alternative cursor save */ 4161 case 1048: /* alternative cursor save */
4162 case 1049:
4163 if (OPTION (Opt_secondaryScreen))
3233 if (mode == 0) 4164 if (mode == 0)
3234 scr_cursor (RESTORE); 4165 scr_cursor (RESTORE);
3235 else if (mode == 1) 4166 else if (mode == 1)
3236 scr_cursor (SAVE); 4167 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; 4168 break;
4169 }
4170
4171 if (state >= 0)
4172 /* extra handling for values with valid 0 or 1 state */
4173 switch (arg[i])
4174 {
4175 /* case 1: - application cursor keys */
4176 case 2: /* VT52 mode */
4177 /* oddball mode. should be set regardless of set/reset
4178 * parameter. Return from VT52 mode with an ESC < from
4179 * within VT52 mode
4180 */
4181 PrivMode (1, PrivMode_vt52);
4182 break;
3253 case 3: /* 80/132 */ 4183 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4184 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4185 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4186 break;
3258 case 4: /* smooth scrolling */ 4187 case 4: /* smooth scrolling */
3259 if (state)
3260 Options &= ~Opt_jumpScroll;
3261 else
3262 Options |= Opt_jumpScroll; 4188 set_option (Opt_jumpScroll, !state);
3263 break; 4189 break;
3264 case 5: /* reverse video */ 4190 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4191 scr_rvideo_mode (state);
3266 break; 4192 break;
3267 case 6: /* relative/absolute origins */ 4193 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4194 scr_relative_origin (state);
3269 break; 4195 break;
3270 case 7: /* autowrap */ 4196 case 7: /* autowrap */
3271 scr_autowrap (state); 4197 scr_autowrap (state);
3272 break; 4198 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4199 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4200 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4201 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4202 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4203 break;
3278#ifdef menuBar_esc 4204#ifdef menuBar_esc
3279 case menuBar_esc: 4205 case menuBar_esc:
3280#ifdef MENUBAR 4206#ifdef MENUBAR
3281 map_menuBar (state); 4207 map_menuBar (state);
3282#endif 4208#endif
3283 break; 4209 break;
3284#endif 4210#endif
3285#ifdef scrollBar_esc 4211#ifdef scrollBar_esc
3286 case scrollBar_esc: 4212 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4213 if (scrollbar_mapping (state))
3288 { 4214 {
3289 resize_all_windows (0, 0, 0); 4215 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4216 scr_touch (true);
3291 } 4217 }
3292 break; 4218 break;
3293#endif 4219#endif
3294 case 25: /* visible/invisible cursor */ 4220 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4221 scr_cursor_visible (state);
3296 break; 4222 break;
3297 /* case 35: - shift keys */ 4223 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4224 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4225 case 47: /* secondary screen */
3300 scr_change_screen (state); 4226 scr_change_screen (state);
3301 break; 4227 break;
3302 /* case 66: - application key pad */ 4228 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4229 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4230 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4231 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4232 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4233 break;
3308#if 0 4234#if 0
3309 case 1001: 4235 case 1001:
3310 break; /* X11 mouse highlighting */ 4236 break; /* X11 mouse highlighting */
3311#endif 4237#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4238 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state)
3314 Options &= ~Opt_scrollTtyOutput;
3315 else
3316 Options |= Opt_scrollTtyOutput; 4239 set_option (Opt_scrollTtyOutput, !state);
3317 break; 4240 break;
3318 case 1011: /* scroll to bottom on key press */ 4241 case 1011: /* scroll to bottom on key press */
3319 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4242 set_option (Opt_scrollTtyKeypress, state);
3321 else
3322 Options &= ~Opt_scrollTtyKeypress;
3323 break; 4243 break;
3324 case 1047: /* secondary screen w/ clearing */ 4244 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4245 if (OPTION (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 4246 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4247 scr_erase_screen (2);
3328 scr_change_screen (state); 4248 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4249 break;
4250 case 1049: /* secondary screen w/ clearing first */
4251 scr_change_screen (state);
4252 if (OPTION (Opt_secondaryScreen))
4253 if (current_screen != PRIMARY)
4254 scr_erase_screen (2);
4255 break;
4256 default:
4257 break;
3332 } 4258 }
3333 } 4259 }
3334} 4260}
3335/*}}} */ 4261/*}}} */
3336 4262
3337/*{{{ process sgr sequences */ 4263/*{{{ process sgr sequences */
3338void 4264void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4265rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4266{
3341 unsigned int i; 4267 unsigned int i;
3342 short rendset; 4268 short rendset;
3343 int rendstyle; 4269 int rendstyle;
3344 4270
3345 if (nargs == 0) 4271 if (nargs == 0)
3346 { 4272 {
3347 scr_rendition (0, ~RS_None); 4273 scr_rendition (0, ~RS_None);
3348 return; 4274 return;
3349 } 4275 }
4276
3350 for (i = 0; i < nargs; i++) 4277 for (i = 0; i < nargs; i++)
3351 { 4278 {
3352 rendset = -1; 4279 rendset = -1;
3353 switch (arg[i]) 4280 switch (arg[i])
3354 { 4281 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4283 rendset = 0, rendstyle = ~RS_None;
3357 break; 4284 break;
3358 case 1: 4285 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4286 rendset = 1, rendstyle = RS_Bold;
3360 break; 4287 break;
4288 //case 2: // low intensity
4289 case 3:
4290 rendset = 1, rendstyle = RS_Italic;
4291 break;
3361 case 4: 4292 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4293 rendset = 1, rendstyle = RS_Uline;
3363 break; 4294 break;
3364 case 5: 4295 case 5: // slowly blinking
4296 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4297 rendset = 1, rendstyle = RS_Blink;
3366 break; 4298 break;
4299 //case 6: // scoansi light background
3367 case 7: 4300 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4301 rendset = 1, rendstyle = RS_RVid;
3369 break; 4302 break;
3370 case 22: 4303 case 8:
4304 // invisible. NYI
4305 break;
4306 //case 9: // crossed out
4307 //case 10: // scoansi acs off, primary font
4308 //case 11: // scoansi acs on, first alt font
4309 //case 12: // scoansi acs on, |0x80, second alt font
4310 //...
4311 //case 19: // ninth alt font
4312 //case 20: // gothic
4313 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4314 rendset = 0, rendstyle = RS_Bold;
4315 break;
4316 case 22: // normal intensity
4317 rendset = 0, rendstyle = RS_Bold;
4318 break;
4319 case 23: // disable italic
4320 rendset = 0, rendstyle = RS_Italic;
3372 break; 4321 break;
3373 case 24: 4322 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4323 rendset = 0, rendstyle = RS_Uline;
3375 break; 4324 break;
3376 case 25: 4325 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4326 rendset = 0, rendstyle = RS_Blink;
3378 break; 4327 break;
4328 case 26: // variable spacing (iso 8613)
4329 rendset = 0, rendstyle = RS_Blink;
4330 break;
3379 case 27: 4331 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4332 rendset = 0, rendstyle = RS_RVid;
3381 break; 4333 break;
4334 //case 28: // visible. NYI
4335 //case 29: // not crossed-out
3382 } 4336 }
4337
3383 if (rendset != -1) 4338 if (rendset != -1)
3384 { 4339 {
3385 scr_rendition (rendset, rendstyle); 4340 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4341 continue; /* for (;i;) */
3387 } 4342 }
… …
3394 case 33: 4349 case 33:
3395 case 34: 4350 case 34:
3396 case 35: 4351 case 35:
3397 case 36: 4352 case 36:
3398 case 37: 4353 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4354 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4355 break;
3402#ifdef TTY_256COLOR 4356 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4357 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4358 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4360 i += 2;
3409 } 4361 }
3410 break; 4362 break;
3411#endif
3412 case 39: /* default fg */ 4363 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4364 scr_color (Color_fg, Color_fg);
3414 break; 4365 break;
3415 4366
3416 case 40: 4367 case 40:
… …
3419 case 43: 4370 case 43:
3420 case 44: 4371 case 44:
3421 case 45: 4372 case 45:
3422 case 46: 4373 case 46:
3423 case 47: 4374 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4375 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4376 break;
3427#ifdef TTY_256COLOR 4377 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4378 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4379 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4380 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4381 i += 2;
3434 } 4382 }
3435 break; 4383 break;
3436#endif
3437 case 49: /* default bg */ 4384 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4385 scr_color (Color_bg, Color_bg);
3439 break; 4386 break;
3440 4387
3441#ifndef NO_BRIGHTCOLOR 4388 //case 50: // not variable spacing
4389
4390#if ENABLE_FRILLS
3442 case 90: 4391 case 90:
3443 case 91: /* set bright fg color */ 4392 case 91: /* set bright fg color */
3444 case 92: 4393 case 92:
3445 case 93: 4394 case 93:
3446 case 94: 4395 case 94:
3447 case 95: 4396 case 95:
3448 case 96: 4397 case 96:
3449 case 97: 4398 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4400 break;
3453 case 100: 4401 case 100:
3454 case 101: /* set bright bg color */ 4402 case 101: /* set bright bg color */
3455 case 102: 4403 case 102:
3456 case 103: 4404 case 103:
3457 case 104: 4405 case 104:
3458 case 105: 4406 case 105:
3459 case 106: 4407 case 106:
3460 case 107: 4408 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4409 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4410 break;
3464#endif 4411#endif
3465
3466 } 4412 }
3467 } 4413 }
3468} 4414}
3469/*}}} */ 4415/*}}} */
3470 4416
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4417/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4418void
3473rxvt_term::process_graphics () 4419rxvt_term::process_graphics ()
3474{ 4420{
3475 unsigned char ch, cmd = cmd_getc (); 4421 unicode_t ch, cmd = cmd_getc ();
3476 4422
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4423 if (cmd == 'Q')
3479 { /* query graphics */ 4424 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4425 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4426 return;
3482 } 4427 }
3483 /* swallow other graphics sequences until terminating ':' */ 4428 /* swallow other graphics sequences until terminating ':' */
3484 do 4429 do
3485 ch = cmd_getc (); 4430 ch = cmd_getc ();
3486 while (ch != ':'); 4431 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} 4432}
3533/*}}} */ 4433/*}}} */
3534 4434
3535/* ------------------------------------------------------------------------- */ 4435/* ------------------------------------------------------------------------- */
3536 4436
… …
3540 */ 4440 */
3541void 4441void
3542rxvt_term::tt_printf (const char *fmt,...) 4442rxvt_term::tt_printf (const char *fmt,...)
3543{ 4443{
3544 va_list arg_ptr; 4444 va_list arg_ptr;
3545 unsigned char buf[256]; 4445 char buf[256];
3546 4446
3547 va_start (arg_ptr, fmt); 4447 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4448 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4449 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4450 tt_write (buf, strlen (buf));
3551} 4451}
3552 4452
3553/* ---------------------------------------------------------------------- */ 4453/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4454/* 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. 4455 * or generated by us in response to a query ESC sequence.
3556 */ 4456 */
4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4458
3557void 4459void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4460rxvt_term::tt_write (const char *data, unsigned int len)
3559{ 4461{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return;
3561 4464
3562 if (len) 4465 if (pty.pty < 0)
4466 return;
4467
4468 if (v_buflen == 0)
4469 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4471
4472 if ((unsigned int)written == len)
4473 return;
4474
4475 data += written;
4476 len -= written;
3563 { 4477 }
4478
4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4480
4481 memcpy (v_buffer + v_buflen, data, len);
4482 v_buflen += len;
4483
4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485}
4486
4487void rxvt_term::pty_write ()
4488{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490
4491 if (written > 0)
4492 {
4493 v_buflen -= written;
4494
3564 if (v_buflen == 0) 4495 if (v_buflen == 0)
3565 { 4496 {
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); 4497 free (v_buffer);
3593 v_buffer = 0; 4498 v_buffer = 0;
3594 v_buflen = 0; 4499 v_buflen = 0;
3595 4500
3596 pty_ev.set (EVENT_READ); 4501 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; 4502 return;
3609 } 4503 }
4504
4505 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4506 }
4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4508 pty_ev.set (EVENT_READ);
3611} 4509}
3612 4510
3613/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
3614 4512

Diff Legend

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