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

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

Diff Legend

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