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

Diff Legend

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