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.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 2006 UTC

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

Diff Legend

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