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

Diff Legend

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