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

Diff Legend

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