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.43 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC

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

Diff Legend

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