ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 2007 UTC

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

Diff Legend

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