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

Diff Legend

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