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

Diff Legend

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