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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.44 by pcg, Fri Feb 13 12:17:07 2004 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC

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

Diff Legend

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