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.37 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 2007 UTC

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

Diff Legend

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