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.54 by pcg, Sun Feb 22 12:58:02 2004 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 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;
… …
204 scr_move_to (0, 1); 443 scr_move_to (0, 1);
205 return; 444 return;
206 } 445 }
207 else if (keysym == XK_End) 446 else if (keysym == XK_End)
208 { 447 {
209 scr_move_to (1, 0); 448 scr_move_to (1, 1);
210 return; 449 return;
211 } 450 }
212 } 451 }
213#endif 452#endif
214 } 453 }
… …
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 > top_row && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
726 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
727 scrollbar_show (1); 1014 scrollbar_show (1);
728#ifdef USE_XIM 1015#ifdef USE_XIM
729 IMSendSpot (); 1016 IMSendSpot ();
730#endif 1017#endif
731
732 } 1018 }
733 1019
734 display->flush (); 1020 display->flush ();
735} 1021}
736 1022
737void 1023void
738rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
739{ 1025{
740 SET_R (this); 1026 make_current ();
741 SET_LOCALE (locale);
742 1027
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0;
743 flush (); 1041 flush ();
744} 1042}
745 1043
746#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
747void 1045void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 1063 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 1064 }
767} 1065}
768#endif 1066#endif
769 1067
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void
1070rxvt_term::cont_scroll_cb (time_watcher &w)
1071{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 }
1079}
1080#endif
1081
1082#ifdef SELECTION_SCROLLING
1083void
1084rxvt_term::sel_scroll_cb (time_watcher &w)
1085{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 }
1093}
1094#endif
1095
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void
1098rxvt_term::slip_wheel_cb (time_watcher &w)
1099{
1100 if (mouse_slip_wheel_speed == 0
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 }
1111}
1112#endif
1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
770bool 1132bool
771rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
772{ 1134{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1136
1137 if (CBUFSIZ == n)
1138 {
1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1140 n = 0;
1141 }
774 1142
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1145 cmdbuf_endp = cmdbuf_ptr + n;
778 1146
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
780 1148
781 if (n > 0) 1149 if (r > 0)
782 { 1150 {
783 cmdbuf_endp += n; 1151 cmdbuf_endp += r;
784 return true; 1152 return true;
785 } 1153 }
786 else if (n < 0 && errno != EAGAIN) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 {
1156#if HAVE_SCHED_YIELD
1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1159#endif
1160 }
1161 else
1162 {
1163 pty_ev.stop ();
1164
1165 if (!OPTION (Opt_hold))
787 destroy (); 1166 destroy ();
788 1167 }
1168
789 return false; 1169 return false;
790} 1170}
791 1171
792void 1172void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
794{ 1174{
795 SET_R (this); 1175 make_current ();
796 SET_LOCALE (locale); 1176
1177 if (revents & EVENT_READ)
1178 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ())
1180 if (cmd_parse ())
1181 break;
797 1182
798 if (revents & EVENT_WRITE) 1183 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1184 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} 1185}
916 1186
917// read the next character, currently handles UTF-8 1187void
918// will probably handle all sorts of other stuff in the future 1188rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1189{
922 while (cmdbuf_ptr < cmdbuf_endp) 1190 XDefineCursor (display->display, vt, TermWin_cursor);
923 { 1191 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1192
927 wchar_t wc; 1193#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1194 hidden_pointer = 0;
929 1195
930 if (len == (size_t)-2) 1196 if (OPTION (Opt_pointerBlank))
931 return NOCHAR; 1197 pointer_ev.start (NOW + pointerBlankDelay);
932 1198#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} 1199}
965 1200
966#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
967void 1202void
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 () 1203rxvt_term::pointer_blank ()
981{ 1204{
982 if (! (Options & Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
983 return; 1206 return;
984 1207
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
986 XFlush (display->display); 1209 XFlush (display->display);
987 1210
988 hidden_pointer = 1; 1211 hidden_pointer = 1;
989} 1212}
990 1213
991void 1214void
992rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
993{ 1216{
994 SET_R (this); 1217 make_current ();
995 SET_LOCALE (locale);
996 1218
997 pointer_blank (); 1219 pointer_blank ();
998} 1220}
999#endif 1221#endif
1000 1222
1001void 1223void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1224rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1225{
1004 int button_number, key_state = 0; 1226 int button_number, key_state = 0;
1005 int x, y; 1227 int x, y;
1006 1228
1007 x = ev.x; 1229 x = ev.x;
1008 y = ev.y; 1230 y = ev.y;
1009 pixel_position (&x, &y); 1231 pixel_position (&x, &y);
1010 1232
1011 if (MEvent.button == AnyButton) 1233 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1234 button_number = 3;
1014 }
1015 else 1235 else
1016 { 1236 {
1017 button_number = MEvent.button - Button1; 1237 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1238 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1239 if (button_number >= 3)
1020 button_number += (64 - 3); 1240 button_number += (64 - 3);
1021 } 1241 }
1022 1242
1023 if (PrivateModes & PrivMode_MouseX10) 1243 if (priv_modes & PrivMode_MouseX10)
1024 { 1244 {
1025 /* 1245 /*
1026 * do not report ButtonRelease 1246 * do not report ButtonRelease
1027 * no state info allowed 1247 * no state info allowed
1028 */ 1248 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1263 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1264 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1265#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1266 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1267#endif
1048
1049 } 1268 }
1050 1269
1051#ifdef DEBUG_MOUSEREPORT 1270#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1271 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1272 if (key_state & 16)
1054 fputc ('C', stderr); 1273 fputc ('C', stderr);
1055 if (key_state & 4) 1274 if (key_state & 4)
1056 fputc ('S', stderr); 1275 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1279 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1280 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1281 button_number,
1063 x + 1, 1282 x + 1,
1064 y + 1); 1283 y + 1);
1065#else 1284#endif
1285
1066 tt_printf ("\033[M%c%c%c", 1286 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1287 (32 + button_number + key_state),
1068 (32 + x + 1), 1288 (32 + x + 1),
1069 (32 + y + 1)); 1289 (32 + y + 1));
1070#endif
1071} 1290}
1072 1291
1073#ifdef USING_W11LIB 1292#ifdef USING_W11LIB
1074void 1293void
1075rxvt_W11_process_x_event (XEvent *ev) 1294rxvt_W11_process_x_event (XEvent *ev)
… …
1082 1301
1083/*{{{ process an X event */ 1302/*{{{ process an X event */
1084void 1303void
1085rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1086{ 1305{
1087 SET_R (this); 1306 make_current ();
1088 SET_LOCALE (locale);
1089 1307
1090#if defined(CURSOR_BLINK) 1308 dDisp;
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1092 {
1093 if (hidden_cursor)
1094 {
1095 hidden_cursor = 0;
1096 want_refresh = 1;
1097 }
1098 1309
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1310 if (ev.xany.window == vt
1100 } 1311 && SHOULD_INVOKE (HOOK_X_EVENT)
1101#endif 1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
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; 1313 return;
1120#endif
1121 1314
1315 // for XQueryPointer
1122 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1318 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 1319
1175 switch (ev.type) 1320 switch (ev.type)
1176 { 1321 {
1177 case KeyPress: 1322 case KeyPress:
1323#if ISO_14755
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1178 lookup_key (ev.xkey); 1326 lookup_key (ev.xkey);
1327
1328 break;
1329
1330 case KeyRelease:
1331 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1179 break; 1394 break;
1180 1395
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1186 else 1401#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; 1402 break;
1195 } 1403 }
1196#endif
1197 1404
1198 case ButtonPress: 1405 case ButtonPress:
1199 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1200 break; 1407 break;
1201 1408
… …
1203 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1204 break; 1411 break;
1205 1412
1206 case ClientMessage: 1413 case ClientMessage:
1207 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1209 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1210#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1211 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1213 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1216 { 1441 {
1217 /* Get Dnd data */ 1442 /* Get Dnd data */
1218 Atom ActualType; 1443 Atom ActualType;
1219 int ActualFormat; 1444 int ActualFormat;
1220 unsigned char *data; 1445 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1222 1447
1223 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1224 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1450 0L, 1000000L,
1226 False, AnyPropertyType, 1451 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1229 &data); 1454 &data);
1230 XChangeProperty (display->display, display->root, 1455 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1456 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1236 } 1459 }
1237#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1238 break; 1461 break;
1239 1462
1240 case MappingNotify: 1463 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1464 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1465 break;
1243 1466
1244 /* 1467 /*
1245 * XXX: this is not the _current_ arrangement 1468 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1469 * Here's my conclusion:
… …
1265 break; 1488 break;
1266 } 1489 }
1267 break; 1490 break;
1268 1491
1269 case FocusIn: 1492 case FocusIn:
1270 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1271 { 1502 {
1272 TermWin.focus = 1; 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1273 want_refresh = 1; 1504 ;
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 1505
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 {
1508 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 }
1511
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent))
1514 check_our_parents ();
1515#endif
1283 } 1516 }
1284 break; 1517 break;
1285 1518
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: 1519 case PropertyNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1306 { 1521 && ev.xproperty.state == PropertyNewValue)
1307 int height, width; 1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1308 1523
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; 1524 break;
1339 1525
1340 case SelectionClear: 1526 case SelectionClear:
1341 display->set_selection_owner (0); 1527 selection_clear ();
1342 break; 1528 break;
1343 1529
1344 case SelectionNotify: 1530 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1531 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1533 break;
1349 1534
1350 case SelectionRequest: 1535 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1352 break; 1537 break;
1353 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1354 case UnmapNotify: 1547 case UnmapNotify:
1355 TermWin.mapped = 0; 1548 mapped = 0;
1356#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1357 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1358#endif 1551#endif
1359 break; 1552 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; 1553 break;
1367 1554
1368#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1369 case ReparentNotify: 1556 case ReparentNotify:
1370 rootwin_cb (ev); 1557 rootwin_cb (ev);
1371 break; 1558 break;
1372#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1373 1560
1374 case GraphicsExpose: 1561 case GraphicsExpose:
1375 case Expose: 1562 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1377 { 1564 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1565 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1569
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1575
1386 // ev.xexpose.width, TermWin.height, False);
1387#endif
1388 want_refresh = 1; 1576 want_refresh = 1;
1389 } 1577 }
1390 else 1578 else
1391 { 1579 {
1392 XEvent unused_event; 1580 XEvent unused_event;
1393 1581
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1395 Expose, 1583 ;
1396 &unused_event)) ; 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1585 ;
1398 GraphicsExpose, 1586
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1401 { 1588 {
1402 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
1403 scrollbar_show (0); 1590 scrollbar_show (0);
1404 } 1591 }
1405#ifdef MENUBAR 1592#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1594 menubar_expose ();
1408#endif 1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1409 } 1601 }
1410 break; 1602 break;
1411 1603
1412 case MotionNotify: 1604 case MotionNotify:
1413#ifdef POINTER_BLANK 1605#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1607 pointer_unblank ();
1416#endif 1608#endif
1417#if MENUBAR 1609#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1610 if (isMenuBarWindow (ev.xany.window))
1419 { 1611 {
1420 menubar_control (& (ev.xbutton)); 1612 menubar_control (ev.xbutton);
1421 break; 1613 break;
1422 } 1614 }
1423#endif 1615#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1617 break;
1426 1618
1427 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1428 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1625 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1432 ; 1627 ;
1433 1628
1434 XQueryPointer (display->display, TermWin.vt, 1629 XQueryPointer (disp, vt,
1435 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1633 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1637 {
1443#endif 1638#endif
1639#if ISO_14755
1640 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1644 break;
1645 }
1646#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1446#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1449 { 1653 {
1450 int dist; 1654 int dist;
1451
1452 pending_scroll_selection=1;
1453 1655
1454 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
1456 */ 1658 */
1457 if (scroll_selection_delay<=0) 1659 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1661
1460 /* save the event params so we can highlight 1662 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1663 * the selection in the pending-scroll loop
1462 */ 1664 */
1463 selection_save_x=ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1668
1468 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1470 { 1671 {
1471 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1473 } 1674 }
1474 else 1675 else
1475 { 1676 {
1476 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y - 1678 dist = ev.xbutton.y - (int_bwidth + height);
1478 (TermWin.int_bwidth + TermWin.height);
1479 } 1679 }
1680
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1681 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1;
1482 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1484 } 1686 }
1485 else 1687 else
1486 { 1688 {
1487 /* we are within the text window, so we 1689 /* we are within the text window, so we
1488 * shouldn't be scrolling 1690 * shouldn't be scrolling
1489 */ 1691 */
1490 pending_scroll_selection = 0; 1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop();
1491 } 1694 }
1492#endif 1695#endif
1493#ifdef MOUSE_THRESHOLD 1696#ifdef MOUSE_THRESHOLD
1494
1495 } 1697 }
1496#endif 1698#endif
1497
1498 } 1699 }
1499 } 1700 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1702 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1503 MotionNotify, &ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1504 XQueryPointer (display->display, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1505 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1711 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1713 scrollbar_size ());
1511 scr_refresh (refresh_type); 1714 want_refresh = 1;
1512 refresh_limit = 0; 1715 refresh_limit = 0;
1513 scrollbar_show (1); 1716 scrollbar_show (1);
1514 } 1717 }
1515 break; 1718 break;
1516 } 1719 }
1517}
1518 1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749}
1750
1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1818}
1819
1820#if TRANSPARENT
1519void 1821void
1520rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1823{
1522 SET_R (this); 1824 make_current ();
1523 SET_LOCALE (locale);
1524 1825
1525 switch (ev.type) 1826 switch (ev.type)
1526 { 1827 {
1527 case PropertyNotify: 1828 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 /* 1829 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1830 * 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. 1831 * use the property to determine the pixmap. We use it later on.
1540 */ 1832 */
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]) 1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1835 return;
1546 }
1547 1836
1548 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1549 case ReparentNotify: 1838 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1553 break; 1841 break;
1554#endif
1555 } 1842 }
1556} 1843}
1844#endif
1557 1845
1558void 1846void
1559rxvt_term::button_press (const XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1560{ 1848{
1561 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1562 1850
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1564 if (!bypass_keystate) 1853 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1855
1566 /* 1856 /*
1567 * VT window processing of button press 1857 * VT window processing of button press
1568 */ 1858 */
1569 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1570 { 1860 {
1861#if ISO_14755
1862 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 {
1865 iso14755_54 (ev.x, ev.y);
1866 return;
1867 }
1868#endif
1869
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1870 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1871
1572 if (reportmode) 1872 if (reportmode)
1573 { 1873 {
1574 /* mouse report from vt window */ 1874 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1875 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1876 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1579 { 1879 {
1580 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1581 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1582 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1583 { 1884 {
1584 /* only report double clicks */ 1885 /* only report double clicks */
1585 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1586 mouse_report (ev); 1887 mouse_report (ev);
… …
1605 } 1906 }
1606 else 1907 else
1607 { 1908 {
1608 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1610 switch (ev.button) 1913 switch (ev.button)
1611 { 1914 {
1612 case Button1: 1915 case Button1:
1916 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */
1918#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask);
1920#else
1921 selection.rect = false;
1922#endif
1923
1613 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1615 { 1926 {
1616 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1618 else 1929 else
1619 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1620 } 1931 }
1621 else 1932 else
1622 { 1933 {
1623 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1624 MEvent.clicks++; 1935 MEvent.clicks++;
1625 else 1936 else
1626 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1627 1938
1628 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1629 } 1940 }
1630 1941
1631 MEvent.button = Button1; 1942 MEvent.button = Button1;
1632 break; 1943 break;
1633 1944
1634 case Button3: 1945 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1637 else 1948 else
1638 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1950
1639 MEvent.button = Button3; 1951 MEvent.button = Button3;
1640 break; 1952 break;
1641 } 1953 }
1642 } 1954 }
1955
1643 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1644 return; 1957 return;
1645 } 1958 }
1646 1959
1647 /* 1960 /*
… …
1713 upordown = 1; /* down */ 2026 upordown = 1; /* down */
1714 } 2027 }
1715 if (upordown) 2028 if (upordown)
1716 { 2029 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 2032#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 2034 {
1722 if (upordown < 0) 2035 if (upordown < 0)
1723 scrollBar.setUp (); 2036 scrollBar.setUp ();
… …
1739 break; 2052 break;
1740 case R_SB_ALIGN_BOTTOM: 2053 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 2054 csrO = scrollBar.bot - scrollBar.top;
1742 break; 2055 break;
1743 } 2056 }
2057
1744 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 2062
1749 scrollBar.setMotion (); 2063 scrollBar.setMotion ();
1750 break; 2064 break;
1751 2065
1752 case Button1: 2066 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1757 case Button3: 2071 case Button3:
1758 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1759 { 2073 {
1760 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1763# else 2077# else
1764 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1765# endif 2079# endif
1766 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1769# else 2083# else
1770 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1771# endif 2085# endif
1772 else 2086 else
1773 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1774 } 2088 }
1775 else 2089 else
1776 { 2090 {
1777 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 2092 (nrow
1779 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 2094 / scrollbar_size ()));
1781 } 2095 }
2096
1782 break; 2097 break;
1783 } 2098 }
1784 } 2099 }
2100
1785 return; 2101 return;
1786 } 2102 }
2103
1787#if MENUBAR 2104#if MENUBAR
1788 /* 2105 /*
1789 * Menubar window processing of button press 2106 * Menubar window processing of button press
1790 */ 2107 */
1791 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
1792 menubar_control (ev); 2109 menubar_control (ev);
1793#endif 2110#endif
1794} 2111}
1795 2112
1796void 2113void
1797rxvt_term::button_release (const XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1798{ 2115{
1799 int reportmode = 0; 2116 int reportmode = 0;
1800 2117
1801 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 2119 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 2121
1805 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1806 { 2123 {
1807 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1808 scrollbar_show (0); 2125 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 2127 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 2128#endif
1812
1813 } 2129 }
2130
1814#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop();
1816#endif 2134#endif
2135
1817 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1818 { 2137 {
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
1819 if (reportmode) 2143 if (reportmode)
1820 { 2144 {
1821 /* mouse report from vt window */ 2145 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 2146 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 2147 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2161 MEvent.button = AnyButton;
1838 mouse_report (ev); 2162 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2163#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2164 return;
1841 } 2165 }
2166
1842 /* 2167 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2168 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2169 * when overriding mouse reporting
1845 */ 2170 */
1846 if (PrivateModes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2172 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
1850 2178
1851 switch (ev.button) 2179 switch (ev.button)
1852 { 2180 {
1853 case Button1: 2181 case Button1:
1854 case Button3: 2182 case Button3:
… …
1862 case Button5: 2190 case Button5:
1863 { 2191 {
1864 int i; 2192 int i;
1865 page_dirn v; 2193 page_dirn v;
1866 2194
1867 v = (ev.button == Button4) ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2196
1868 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
1869 i = 1; 2198 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
1871 i = TermWin.nrow - 1; 2200 i = nrow - 1;
1872 else 2201 else
1873 i = 5; 2202 i = 5;
2203
1874# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
1876 { 2206 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210
2211 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2213
2214 slip_wheel_ev.start ();
2215 }
2216 else
2217 {
2218# endif
2219 scr_page (v, i);
2220 scrollbar_show (1);
2221# ifdef MOUSE_SLIP_WHEELING
1879 } 2222 }
1880# endif 2223# 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 } 2224 }
1895 break; 2225 break;
1896#endif 2226#endif
1897
1898 } 2227 }
1899 } 2228 }
1900#ifdef MENUBAR 2229#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2230 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2231 menubar_control (ev);
1903#endif 2232#endif
1904} 2233}
1905 2234
1906
1907#ifdef TRANSPARENT 2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
1908/* 2467/*
1909 * Check our parents are still who we think they are. 2468 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2469 * Do transparency updates if required
1911 */ 2470 */
1912int 2471int
1913rxvt_term::check_our_parents () 2472rxvt_term::check_our_parents ()
1914{ 2473{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2474 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2475 unsigned long nitems, bytes_after;
1917 Atom atype; 2476 Atom atype;
1918 unsigned char *prop = NULL; 2477 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2478 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2479 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
1922 2482
1923 pchanged = 0; 2483 pchanged = 0;
1924 2484
1925 if (! (Options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
1927 2487
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
1930 2490
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
1932 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
1933 { 2494 {
1934 if (am_transparent) 2495 if (am_transparent)
1935 { 2496 {
1936 pchanged = 1; 2497 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
1940 } 2500 }
2501
1941 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
1942 } 2503 }
1943 2504
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2505 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2506 XSync (disp, False);
1946 2507
1947 /* 2508 /*
1948 * Make the frame window set by the window manager have 2509 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2510 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2511 * windows for each client, so we have to take care about that.
1951 */ 2512 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2513 i = (xa[XA_XROOTPMAP_ID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2516 &nitems, &bytes_after, &prop) == Success);
2517
1956 if (!i || prop == NULL) 2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
1957 have_pixmap = 0; 2529 have_pixmap = 0;
1958 else 2530 else
1959 { 2531 {
1960 have_pixmap = 1; 2532 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2533 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2534 XFree (prop);
1963 } 2535 }
2536
1964 if (have_pixmap) 2537 if (have_pixmap)
1965 { 2538 {
1966 /* 2539 /*
1967 * Copy display->root pixmap transparency 2540 * Copy display->root pixmap transparency
1968 */ 2541 */
1969 int sx, sy, nx, ny; 2542 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2543 unsigned int nw, nh;
1971 Window cr; 2544 Window cr;
1972 XImage *image; 2545 XImage *image;
1973 GC gc; 2546 GC gc;
1974 XGCValues gcvalue; 2547 XGCValues gcvalue;
1975 2548
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2553 nx = ny = 0;
2554
1981 if (sx < 0) 2555 if (sx < 0)
1982 { 2556 {
1983 nw += sx; 2557 nw += sx;
1984 nx = -sx; 2558 nx = -sx;
1985 sx = 0; 2559 sx = 0;
1986 } 2560 }
2561
1987 if (sy < 0) 2562 if (sy < 0)
1988 { 2563 {
1989 nh += sy; 2564 nh += sy;
1990 ny = -sy; 2565 ny = -sy;
1991 sy = 0; 2566 sy = 0;
1992 } 2567 }
2568
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
1995 allowedxerror = -1; 2573 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2575
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2577 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2578 allowedxerror = 0;
2579
2001 if (image == NULL) 2580 if (image == NULL)
2002 { 2581 {
2003 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2004 { 2583 {
2005 pchanged = 1; 2584 pchanged = 1;
2006 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2007 { 2586 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2009 TermWin.pixmap = None; 2588 pixmap = None;
2010 } 2589 }
2011 } 2590 }
2591
2012 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2013 } 2593 }
2014 else 2594 else
2015 { 2595 {
2016 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2612 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2615 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2616 XFreeGC (disp, gc);
2027 XDestroyImage (image); 2617 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2029 TermWin.pixmap); 2619 XClearWindow (disp, parent[0]);
2620
2030 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2622 pchanged = 1;
2623
2032 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2033 } 2625 }
2034 } 2626 }
2627
2035 if (!am_pixmap_trans) 2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2036 { 2631 {
2037 unsigned int n; 2632 unsigned int n;
2038 /* 2633 /*
2039 * InheritPixmap transparency 2634 * InheritPixmap transparency
2040 */ 2635 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2637 {
2045 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2048 XFree (list); 2641 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2642
2050 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2051 { 2644 {
2052 if (oldp != None) 2645 if (oldp != None)
2053 pchanged = 1; 2646 pchanged = 1;
2647
2054 break; 2648 break;
2055 } 2649 }
2650
2056 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2057 pchanged = 1; 2652 pchanged = 1;
2058 } 2653 }
2654
2059 n = 0; 2655 n = 0;
2656
2060 if (pchanged) 2657 if (pchanged)
2061 { 2658 {
2062 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2063 { 2660 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2661 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) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2663 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2069 break; 2665 break;
2070 } 2666 }
2071 } 2667 }
2072 } 2668 }
2073 if (n > (int) (sizeof (TermWin.parent) 2669
2074 / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2075 { 2671 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2673 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; 2674 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2083 } 2676 }
2084 else 2677 else
2085 { 2678 {
2679#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2680 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2681 * 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); 2682 sleep (1);
2096# endif 2683#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2685 {
2100 ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2687 XClearWindow (disp, parent[n]);
2102 ParentRelative); 2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2103 am_transparent = 1; 2691 am_transparent = 1;
2104 } 2692 }
2693
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2107 } 2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2108 return pchanged; 2712 return pchanged;
2109} 2713}
2110#endif 2714#endif
2111 2715
2112/*}}} */ 2716/*}}} */
2717
2718bool
2719rxvt_term::cmd_parse ()
2720{
2721 bool flag = false;
2722 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here
2724
2725 for (;;)
2726 {
2727 if (ch == NOCHAR)
2728 {
2729 seq_begin = cmdbuf_ptr;
2730 ch = next_char ();
2731
2732 if (ch == NOCHAR)
2733 break;
2734 }
2735
2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2737 {
2738 if (!seen_input)
2739 {
2740 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs
2744 // then sometimes get the size wrong.
2745 // unfortunately other programs are even more buggy and dislike
2746 // being sent SIGWINCH, so only do it when we were in fact being
2747 // resized.
2748 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH);
2750 }
2751
2752 /* Read a text string from the input buffer */
2753 wchar_t buf[UBUFSIZ];
2754 bool refreshnow = false;
2755 int nlines = 0;
2756 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758
2759 for (;;)
2760 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762 break;
2763
2764 *str++ = ch;
2765
2766 if (ch == C0_LF || str >= eol)
2767 {
2768 if (ch == C0_LF)
2769 nlines++;
2770
2771 refresh_count++;
2772
2773 if (!OPTION (Opt_jumpScroll)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 {
2776 refreshnow = true;
2777 refresh_count = 0;
2778 ch = NOCHAR;
2779 break;
2780 }
2781
2782 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1)
2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2786 scr_add_lines (buf, str - buf, nlines);
2787
2788 nlines = 0;
2789 str = buf;
2790 eol = str + min (ncol, UBUFSIZ);
2791 }
2792
2793 if (str >= eol)
2794 {
2795 if (eol >= buf + UBUFSIZ)
2796 {
2797 ch = NOCHAR;
2798 break;
2799 }
2800 else
2801 eol = min (eol + ncol, buf + UBUFSIZ);
2802 }
2803
2804 }
2805
2806 seq_begin = cmdbuf_ptr;
2807 ch = next_char ();
2808 }
2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2811 scr_add_lines (buf, str - buf, nlines);
2812
2813 /*
2814 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */
2819 if (refreshnow)
2820 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true;
2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2828 }
2829 }
2830
2831 }
2832 else
2833 {
2834 try
2835 {
2836 process_nonprinting (ch);
2837 }
2838 catch (const class out_of_input &o)
2839 {
2840 // we ran out of input, retry later
2841 cmdbuf_ptr = seq_begin;
2842 break;
2843 }
2844
2845 ch = NOCHAR;
2846 }
2847 }
2848
2849 return flag;
2850}
2851
2852// read the next character
2853wchar_t
2854rxvt_term::next_char ()
2855{
2856 while (cmdbuf_ptr < cmdbuf_endp)
2857 {
2858 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2860 return *cmdbuf_ptr++;
2861
2862 wchar_t wc;
2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2864
2865 if (len == (size_t)-2)
2866 {
2867 // the mbstate stores incomplete sequences. didn't know this :/
2868 cmdbuf_ptr = cmdbuf_endp;
2869 break;
2870 }
2871
2872 if (len == (size_t)-1)
2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2874
2875 // assume wchar == unicode
2876 cmdbuf_ptr += len;
2877 return wc & UNICODE_MASK;
2878 }
2879
2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2890}
2891
2892/* rxvt_cmd_getc () - Return next input character */
2893/*
2894 * Return the next input character after first passing any keyboard input
2895 * to the command.
2896 */
2897wchar_t
2898rxvt_term::cmd_getc ()
2899{
2900 wchar_t c = next_char ();
2901
2902 if (c == NOCHAR)
2903 throw out_of_input;
2904
2905 return c;
2906}
2907
2908uint32_t
2909rxvt_term::cmd_get8 ()
2910{
2911 uint32_t c = next_octet ();
2912
2913 if (c == NOCHAR)
2914 throw out_of_input;
2915
2916 return c;
2917}
2113 2918
2114/*{{{ print pipe */ 2919/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2920/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2921#ifdef PRINTPIPE
2117FILE * 2922FILE *
2118rxvt_term::popen_printer () 2923rxvt_term::popen_printer ()
2119{ 2924{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2925 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2926
2122 if (stream == NULL) 2927 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2928 rxvt_warn ("can't open printer pipe, not printing.\n");
2929
2124 return stream; 2930 return stream;
2125} 2931}
2126 2932
2127int 2933int
2128rxvt_term::pclose_printer (FILE *stream) 2934rxvt_term::pclose_printer (FILE *stream)
2129{ 2935{
2130 fflush (stream); 2936 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); 2937 return pclose (stream);
2137# endif
2138} 2938}
2139 2939
2140/* 2940/*
2141 * simulate attached vt100 printer 2941 * simulate attached vt100 printer
2142 */ 2942 */
2143void 2943void
2144rxvt_term::process_print_pipe () 2944rxvt_term::process_print_pipe ()
2145{ 2945{
2146 int done; 2946 int done;
2147 FILE *fd; 2947 FILE *fd;
2148 2948
2149 if ((fd = popen_printer ()) == NULL) 2949 if ((fd = popen_printer ()) == NULL)
2150 return; 2950 return;
2151 2951
2152 /* 2952 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2953 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2954 * is received.
2155 */ 2955 */
2156 for (done = 0; !done;) 2956 for (done = 0; !done;)
2157 { 2957 {
2158 unsigned char buf[8]; 2958 unsigned char buf[8];
2159 unsigned char ch; 2959 unicode_t ch;
2160 unsigned int i, len; 2960 unsigned int i, len;
2161 2961
2162 if ((ch = cmd_getc ()) != C0_ESC) 2962 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2963 {
2164 if (putc (ch, fd) == EOF) 2964 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2965 break; /* done = 1 */
… …
2180 { 2980 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2981 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2982 break; /* done = 1 */
2183 } 2983 }
2184 } 2984 }
2985
2185 for (i = 0; i < len; i++) 2986 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2987 if (putc (buf[i], fd) == EOF)
2187 { 2988 {
2188 done = 1; 2989 done = 1;
2189 break; 2990 break;
2190 } 2991 }
2191 } 2992 }
2192 } 2993 }
2994
2193 pclose_printer (fd); 2995 pclose_printer (fd);
2194} 2996}
2195#endif /* PRINTPIPE */ 2997#endif /* PRINTPIPE */
2196/*}}} */ 2998/*}}} */
2197 2999
2198/* *INDENT-OFF* */ 3000/* *INDENT-OFF* */
2199enum { 3001enum {
2200 C1_40 = 0x40, 3002 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3003 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, 3004 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, 3005 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 3006 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 3007};
2206/* *INDENT-ON* */ 3008/* *INDENT-ON* */
2207 3009
2208/*{{{ process non-printing single characters */ 3010/*{{{ process non-printing single characters */
2209void 3011void
2210rxvt_term::process_nonprinting (unsigned char ch) 3012rxvt_term::process_nonprinting (unicode_t ch)
2211{ 3013{
2212 switch (ch) 3014 switch (ch)
2213 { 3015 {
3016 case C0_ESC:
3017 process_escape_seq ();
3018 break;
2214 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2216 tt_write ( 3021 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 3022 else
2220 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2221 (unsigned int)STRLEN (VT100_ANS));
2222 break; 3024 break;
2223 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2224 scr_bell (); 3026 scr_bell ();
2225 break; 3027 break;
2226 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 3043 scr_charset_choose (1);
2242 break; 3044 break;
2243 case C0_SI: /* shift in - acs */ 3045 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 3046 scr_charset_choose (0);
2245 break; 3047 break;
3048
3049#ifdef EIGHT_BIT_CONTROLS
3050 // 8-bit controls
3051 case 0x90: /* DCS */
3052 process_dcs_seq ();
3053 break;
3054 case 0x9b: /* CSI */
3055 process_csi_seq ();
3056 break;
3057 case 0x9d: /* CSI */
3058 process_osc_seq ();
3059 break;
3060#endif
2246 } 3061 }
2247} 3062}
2248/*}}} */ 3063/*}}} */
2249 3064
2250 3065
2251/*{{{ process VT52 escape sequences */ 3066/*{{{ process VT52 escape sequences */
2252void 3067void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 3068rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 3069{
2255 int row, col; 3070 int row, col;
2256 3071
2257 switch (ch) 3072 switch (ch)
2258 { 3073 {
… …
2310 3125
2311/*{{{ process escape sequences */ 3126/*{{{ process escape sequences */
2312void 3127void
2313rxvt_term::process_escape_seq () 3128rxvt_term::process_escape_seq ()
2314{ 3129{
2315 unsigned char ch = cmd_getc (); 3130 unicode_t ch = cmd_getc ();
2316 3131
2317 if (PrivateModes & PrivMode_vt52) 3132 if (priv_modes & PrivMode_vt52)
2318 { 3133 {
2319 process_escape_vt52 (ch); 3134 process_escape_vt52 (ch);
2320 return; 3135 return;
2321 } 3136 }
2322 3137
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 3152 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 3153 break;
2339 case '+': 3154 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 3155 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 3156 break;
2342#ifdef MULTICHAR_SET 3157#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': 3158 case '6':
2349 scr_backindex (); 3159 scr_backindex ();
2350 break; 3160 break;
2351#endif 3161#endif
2352 case '7': 3162 case '7':
2353 scr_cursor (SAVE); 3163 scr_cursor (SAVE);
2354 break; 3164 break;
2355 case '8': 3165 case '8':
2356 scr_cursor (RESTORE); 3166 scr_cursor (RESTORE);
2357 break; 3167 break;
2358#ifndef NO_FRILLS 3168#if ENABLE_FRILLS
2359 case '9': 3169 case '9':
2360 scr_forwardindex (); 3170 scr_forwardindex ();
2361 break; 3171 break;
2362#endif 3172#endif
2363 case '=': 3173 case '=':
… …
2373 break; 3183 break;
2374 3184
2375 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
2377 { 3187 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2380 } 3190 }
2381 break; 3191 break;
2382 3192
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
2384 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
2394 case C1_RI: /* ESC M */ 3204 case C1_RI: /* ESC M */
2395 scr_index (DN); 3205 scr_index (DN);
2396 break; 3206 break;
2397 3207
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3208 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3209 /*case C1_SS2: scr_single_shift (2); break; */
2400 3210
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3211 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3212 /*case C1_SS3: scr_single_shift (3); break; */
2403 3213
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3214 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3215 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3216 process_dcs_seq ();
2407 break; 3217 break;
2408 3218
2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2410 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
2411 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2413 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
2414 3223
2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2416 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
2417 process_csi_seq (); 3226 process_csi_seq ();
… …
2422 process_osc_seq (); 3231 process_osc_seq ();
2423 break; 3232 break;
2424 3233
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3234 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3235 case 'c':
3236 mbstate.reset ();
2427 scr_poweron (); 3237 scr_poweron ();
2428 scrollbar_show (1); 3238 scrollbar_show (1);
2429 break; 3239 break;
2430 3240
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3241 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3253
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3254/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3255/* *INDENT-OFF* */
2446enum { 3256enum {
2447 CSI_ICH = 0x40, 3257 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3258 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 , 3259 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, 3260 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, 3261 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, 3262 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, 3263 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, */ 3278 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, [, \, ], ^, _, */ 3279 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, */ 3280 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, */ 3281 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, */ 3282 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, {, |, }, ~, */ 3283 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3284 };
2475/* *INDENT-ON* */ 3285/* *INDENT-ON* */
2476 3286
2477void 3287void
2478rxvt_term::process_csi_seq () 3288rxvt_term::process_csi_seq ()
2479{ 3289{
2480 unsigned char ch, priv, i; 3290 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3291 unsigned int nargs, p;
2482 int n, ndef; 3292 int n, ndef;
2483 int arg[ESC_ARGS]; 3293 int arg[ESC_ARGS];
2484 3294
2485 for (nargs = ESC_ARGS; nargs > 0;) 3295 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3296 arg[--nargs] = 0;
2487 3297
2488 priv = 0; 3298 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3300 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3301 { /* '<' '=' '>' '?' */
2492 priv = ch; 3302 priv = ch;
2493 ch = cmd_getc (); 3303 ch = cmd_getc ();
2494 } 3304 }
3305
2495 /* read any numerical arguments */ 3306 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3307 for (n = -1; ch < CSI_ICH; )
2497 { 3308 {
2498 if (isdigit (ch)) 3309 if (isdigit (ch))
2499 { 3310 {
… …
2506 { 3317 {
2507 if (nargs < ESC_ARGS) 3318 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3319 arg[nargs++] = n;
2509 n = -1; 3320 n = -1;
2510 } 3321 }
2511 else if (ch == '\b') 3322 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); 3323 process_nonprinting (ch);
2523 } 3324
2524 ch = cmd_getc (); 3325 ch = cmd_getc ();
2525 } 3326 }
2526 3327
2527 if (ch > CSI_7F) 3328 if (ch > CSI_7F)
2528 return; 3329 return;
… …
2550 { 3351 {
2551 switch (priv) 3352 switch (priv)
2552 { 3353 {
2553 case '>': 3354 case '>':
2554 if (ch == CSI_DA) /* secondary device attributes */ 3355 if (ch == CSI_DA) /* secondary device attributes */
2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2556 break; 3357 break;
2557 case '?': 3358 case '?':
2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2559 process_terminal_mode (ch, priv, nargs, arg); 3360 process_terminal_mode (ch, priv, nargs, arg);
2560 break; 3361 break;
… …
2665 3466
2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3467 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2667 arg[0] = -arg[0]; 3468 arg[0] = -arg[0];
2668 /* FALLTHROUGH */ 3469 /* FALLTHROUGH */
2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2671 break; 3472 break;
2672 3473
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3476 break;
2677 3477
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
2680 break; 3480 break;
… …
2686 tt_printf ("\033[0n"); 3486 tt_printf ("\033[0n");
2687 break; 3487 break;
2688 case 6: /* CPR requested */ 3488 case 6: /* CPR requested */
2689 scr_report_position (); 3489 scr_report_position ();
2690 break; 3490 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3491 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure))
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3493 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3494 break;
2695#endif
2696 case 8: /* unofficial extension */ 3495 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3497 break;
2699 } 3498 }
2700 break; 3499 break;
2701 3500
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3501 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3534 break;
2736 3535
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3536 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3537 if (arg[0] == 4)
2739 scr_insert_mode (0); 3538 scr_insert_mode (0);
3539 else if (arg[0] == 20)
3540 priv_modes &= ~PrivMode_LFNL;
2740 break; 3541 break;
2741 3542
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3543 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3544 if (arg[0] == 4)
2744 scr_insert_mode (1); 3545 scr_insert_mode (1);
3546 else if (arg[0] == 20)
3547 priv_modes |= PrivMode_LFNL;
2745 break; 3548 break;
2746 3549
2747 /* 3550 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3551 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3552 */
… …
2761 break; 3564 break;
2762 case CSI_75: 3565 case CSI_75:
2763 scr_cursor (RESTORE); 3566 scr_cursor (RESTORE);
2764 break; 3567 break;
2765 3568
2766#ifndef NO_FRILLS 3569#if ENABLE_FRILLS
2767 case CSI_74: 3570 case CSI_74:
2768 process_window_ops (arg, nargs); 3571 process_window_ops (arg, nargs);
2769 break; 3572 break;
2770#endif 3573#endif
2771 3574
2772 case CSI_78: /* DECREQTPARM */ 3575 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3576 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3577 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3578 break;
2776 3579
2777 default: 3580 default:
2778 break; 3581 break;
2779 } 3582 }
2780} 3583}
2781/*}}} */ 3584/*}}} */
2782 3585
2783#ifndef NO_FRILLS 3586#if ENABLE_FRILLS
2784/* ARGSUSED */ 3587/* ARGSUSED */
2785void 3588void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3589rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3590{
2788 int x, y; 3591 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3592 XWindowAttributes wattr;
2793 Window wdummy; 3593 Window wdummy;
3594 dDisp;
2794 3595
2795 if (nargs == 0) 3596 if (nargs == 0)
2796 return; 3597 return;
3598
2797 switch (args[0]) 3599 switch (args[0])
2798 { 3600 {
2799 /* 3601 /*
2800 * commands 3602 * commands
2801 */ 3603 */
2802 case 1: /* deiconify window */ 3604 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3605 XMapWindow (disp, parent[0]);
2804 break; 3606 break;
2805 case 2: /* iconify window */ 3607 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3608 XIconifyWindow (disp, parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3609 break;
2809 case 3: /* set position (pixels) */ 3610 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3611 XMoveWindow (disp, parent[0], args[1], args[2]);
2811 break; 3612 break;
2812 case 4: /* set size (pixels) */ 3613 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3615 break;
2815 case 5: /* raise window */ 3616 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3617 XRaiseWindow (disp, parent[0]);
2817 break; 3618 break;
2818 case 6: /* lower window */ 3619 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3620 XLowerWindow (disp, parent[0]);
2820 break; 3621 break;
2821 case 7: /* refresh window */ 3622 case 7: /* refresh window */
2822 scr_touch (true); 3623 scr_touch (true);
2823 break; 3624 break;
2824 case 8: /* set size (chars) */ 3625 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3626 set_widthheight ((unsigned int) (args[2] * fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3627 (unsigned int) (args[1] * fheight));
2827 break; 3628 break;
3629
3630 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3631 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3632 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3633 set_widthheight ((unsigned int)width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
2832 break; 3635 break;
3636
3637
2833 /* 3638 /*
2834 * reports - some output format copied from XTerm 3639 * reports - some output format copied from XTerm
2835 */ 3640 */
2836 case 11: /* report window state */ 3641 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3642 XGetWindowAttributes (disp, parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3644 break;
2840 case 13: /* report window position */ 3645 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3647 XTranslateCoordinates (disp, parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3648 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3649 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3650 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3651 break;
2847 case 14: /* report window size (pixels) */ 3652 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3655 break;
3656 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break;
2851 case 18: /* report window size (chars) */ 3659 case 19: /* report window size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3660 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2853 break; 3661 break;
2854#if 0 /* XXX: currently disabled due to security concerns */
2855 case 20: /* report icon label */ 3662 case 20: /* report icon label */
3663 {
3664 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3665 XGetIconName (disp, parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s);
3668 }
2858 break; 3669 break;
2859 case 21: /* report window title */ 3670 case 21: /* report window title */
3671 {
3672 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3673 XFetchName (disp, parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s);
3676 }
2862 break; 3677 break;
2863#endif
2864
2865 } 3678 }
2866} 3679}
2867#endif 3680#endif
2868 3681
2869/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
2870/* 3683/*
2871 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3685 * ends_how is terminator used. returned input must be free()'d
2873 */ 3686 */
2874unsigned char * 3687char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3689{
2877 int seen_esc = 0; /* seen escape? */ 3690 unicode_t ch;
3691 bool seen_esc = false;
2878 unsigned int n = 0; 3692 unsigned int n = 0;
2879 unsigned char *s; 3693 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3694
2882 for (; (ch = cmd_getc ());) 3695 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3696 {
2884 if (ch == C0_BEL 3697 if (seen_esc)
2885 || ch == CHAR_ST 3698 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3699 if (ch == 0x5c) /* 7bit ST */
2887 break; 3700 break;
3701 else
3702 return NULL;
3703 }
2888 if (ch == C0_ESC) 3704 else if (ch == C0_ESC)
2889 { 3705 {
2890 seen_esc = 1; 3706 seen_esc = true;
2891 continue; 3707 continue;
2892 } 3708 }
2893 else if (ch == '\t') 3709 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3710 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3711 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3712 return NULL; /* other control character - exit */
2897 if (n < sizeof (string) - 1) 3713
3714 seen_esc = false;
3715
3716 if (n >= STRING_MAX - 1)
3717 // stop at some sane length
3718 return NULL;
3719
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
2898 string[n++] = ch; 3723 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3724 }
3725
2901 string[n++] = '\0'; 3726 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3727
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3729
2906 return s; 3730 return rxvt_wcstombs (string);
2907} 3731}
2908 3732
2909/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
2910/* 3734/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3736 */
2913void 3737void
2914rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
2915{ 3739{
2916 unsigned char eh, *s; 3740 char *s;
3741 unicode_t eh;
3742
2917 /* 3743 /*
2918 * Not handled yet 3744 * Not handled yet
2919 */ 3745 */
2920 s = get_to_st (&eh); 3746 s = get_to_st (eh);
2921 if (s) 3747 if (s)
2922 free (s); 3748 free (s);
3749
2923 return; 3750 return;
2924} 3751}
2925 3752
2926/*----------------------------------------------------------------------*/ 3753/*----------------------------------------------------------------------*/
2927/* 3754/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3755 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3756 */
2930void 3757void
2931rxvt_term::process_osc_seq () 3758rxvt_term::process_osc_seq ()
2932{ 3759{
2933 unsigned char ch, eh, *s; 3760 unicode_t ch, eh;
2934 int arg; 3761 int arg;
2935 3762
2936 ch = cmd_getc (); 3763 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
2939 3766
2940 if (ch == ';') 3767 if (ch == ';')
2941 { 3768 {
2942 s = get_to_st (&eh); 3769 char *s = get_to_st (eh);
3770
2943 if (s) 3771 if (s)
2944 { 3772 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
2957 free (s); 3774 free (s);
2958 } 3775 }
2959 } 3776 }
2960} 3777}
3778
3779void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{
3782 if (str[0] == '?' && !str[1])
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color].get (display, r, g, b);
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color, str);
3790}
3791
2961/* 3792/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title
2964 * 1 = change iconName
2965 * 2 = change title
2966 * 4 = change color
2967 * 12 = change text color
2968 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour
2970 * 18 = change bold character color
2971 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented)
2973 * 50 = change font
2974 *
2975 * rxvt extensions:
2976 * 9 = change locale (NYI)
2977 * 10 = menu (may change in future)
2978 * 20 = bg pixmap
2979 * 39 = change default fg color
2980 * 49 = change default bg color
2981 * 55 = dump scrollback buffer and all of screen
2982 */ 3794 */
2983void 3795void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2985{ 3797{
2986 int changed = 0; 3798 int changed = 0;
2987 int color; 3799 int color;
2988 char *buf, *name; 3800 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1];
3802 int saveop = op;
3803 dDisp;
2989 3804
2990 assert (str != NULL); 3805 assert (str != NULL);
2991 switch (op) 3806 switch (op)
2992 { 3807 {
2993 case XTerm_name: 3808 case XTerm_name:
2994 set_title (str); 3809 set_title (str);
2995 /* FALLTHROUGH */ 3810 /* FALLTHROUGH */
2996 case XTerm_iconName: 3811 case XTerm_iconName:
2997 set_iconName (str); 3812 set_icon_name (str);
2998 break; 3813 break;
2999 case XTerm_title: 3814 case XTerm_title:
3000 set_title (str); 3815 set_title (str);
3001 break; 3816 break;
3817 case XTerm_property:
3818 if (str[0] == '?')
3819 {
3820 Atom prop = display->atom (str + 1);
3821 Atom actual_type;
3822 int actual_format;
3823 unsigned long nitems;
3824 unsigned long bytes_after;
3825 unsigned char *value = 0;
3826 const char *str = "";
3827
3828 if (prop
3829 && XGetWindowProperty (disp, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None
3834 && actual_format == 8)
3835 str = (const char *)(value);
3836
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3838
3839 XFree (value);
3840 }
3841 else
3842 {
3843 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3844
3845 if (eq)
3846 {
3847 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1);
3849 }
3850 else
3851 XDeleteProperty (disp, parent[0],
3852 display->atom (str));
3853 }
3854 break;
3855
3002 case XTerm_Color: 3856 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3857 for (buf = (char *)str; buf && *buf;)
3004 { 3858 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3860 break;
3861
3007 *name++ = '\0'; 3862 *name++ = '\0';
3008 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3009 if (color < 0 || color >= TOTAL_COLORS) 3864
3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3010 break; 3866 break;
3867
3011 if ((buf = STRCHR (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3869 *buf++ = '\0';
3870
3871 if (name[0] == '?' && !name[1])
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3013 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3014 } 3879 }
3880 break;
3881 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break;
3884 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3015 break; 3886 break;
3016#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3890 break;
3020#endif 3891#endif
3021 case XTerm_Color_pointer: 3892 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3894 break;
3895 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3897 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str);
3027 break;
3028 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str);
3030 break;
3031 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3901 break;
3034#endif 3902 case Rxvt_Color_BD:
3035 3903 case URxvt_Color_BD:
3036 case XTerm_Menu: 3904 process_color_seq (op, Color_BD, str, resp);
3037 /*
3038 * rxvt_menubar_dispatch () violates the constness of the string,
3039 * so DON'T do it here
3040 */
3041 break; 3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3909 break;
3910 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
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
3042 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3043 if (*str != ';') 3924 if (*str != ';')
3044 { 3925 {
3045#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3048#endif
3049 scr_touch (true); 3929 scr_touch (true);
3930#endif
3050 } 3931 }
3932
3051 while ((str = STRCHR (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3052 { 3934 {
3053 str++; 3935 str++;
3054#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
3056#endif 3938#endif
3057
3058 } 3939 }
3940
3059 if (changed) 3941 if (changed)
3060 { 3942 {
3061#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3062 resize_pixmap (); 3944 resize_pixmap ();
3063#endif
3064 scr_touch (true); 3945 scr_touch (true);
3946#endif
3065 } 3947 }
3066 break; 3948 break;
3067 3949
3068 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3069 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3070 break; 3952 break;
3071 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3072 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3073 break; 3955 break;
3956
3074 case XTerm_logfile: 3957 case XTerm_logfile:
3958 // TODO, when secure mode?
3959 break;
3960
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3075 break; 3965 break;
3076 case XTerm_font: 3966#endif
3077 change_font (str);
3078 break;
3079 case XTerm_locale:
3080 if (str[0] == '?' && !str[1])
3081 tt_printf ("%-.250s\n", locale);
3082 else
3083 {
3084 set_locale (str);
3085 im_cb ();
3086 }
3087 break;
3088#if 0 3967#if 0
3089 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3090 { 3969 {
3091 int fd; 3970 int fd;
3092 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3093 { 3972 {
3094 scr_dump (fd); 3973 scr_dump (fd);
3095 close (fd); 3974 close (fd);
3096 } 3975 }
3097 } 3976 }
3098 break; 3977 break;
3099#endif 3978#endif
3979 case XTerm_font:
3980 op = URxvt_font;
3981 case URxvt_font:
3982#if ENABLE_STYLES
3983 case URxvt_boldFont:
3984 case URxvt_italicFont:
3985 case URxvt_boldItalicFont:
3986#endif
3987 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp);
3992 else
3993 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)];
3100 3995
3996 res = strdup (str);
3997 allocated.push_back ((void *)res);
3998 set_fonts ();
3999 }
4000 break;
4001
4002#if ENABLE_FRILLS
4003 case URxvt_locale:
4004 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4006 else
4007 {
4008 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8);
4010 init_xlocale ();
4011 }
4012 break;
4013
4014 case URxvt_view_up:
4015 case URxvt_view_down:
4016 {
4017 int lines = atoi (str);
4018
4019 if (lines)
4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
4021 else
4022 scr_erase_savelines ();
4023 }
4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet
4032 break;
4033#endif
3101 } 4034 }
3102} 4035}
3103/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
3104 4037
3105/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4038/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3113 * so no need for fancy checking 4046 * so no need for fancy checking
3114 */ 4047 */
3115int 4048int
3116rxvt_term::privcases (int mode, unsigned long bit) 4049rxvt_term::privcases (int mode, unsigned long bit)
3117{ 4050{
3118 int state; 4051 int state;
3119 4052
3120 if (mode == 's') 4053 if (mode == 's')
3121 { 4054 {
3122 SavedModes |= (PrivateModes & bit); 4055 SavedModes |= (priv_modes & bit);
3123 return -1; 4056 return -1;
3124 } 4057 }
3125 else 4058 else
3126 { 4059 {
3127 if (mode == 'r') 4060 if (mode == 'r')
3128 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4061 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3129 else 4062 else
3130 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4063 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3131 PrivMode (state, bit); 4064 PrivMode (state, bit);
3132 } 4065 }
4066
3133 return state; 4067 return state;
3134} 4068}
3135 4069
3136/* we're not using priv _yet_ */ 4070/* we're not using priv _yet_ */
3137void 4071void
3138rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3139{ 4073{
3140 unsigned int i, j; 4074 unsigned int i, j;
3141 int state; 4075 int state;
4076
3142 static const struct 4077 static const struct
3143 { 4078 {
3144 const int argval; 4079 const int argval;
3145 const unsigned long bit; 4080 const unsigned long bit;
3146 } 4081 }
4082
3147 argtopriv[] = { 4083 argtopriv[] = {
3148 { 1, PrivMode_aplCUR }, 4084 { 1, PrivMode_aplCUR },
3149 { 2, PrivMode_vt52 }, 4085 { 2, PrivMode_vt52 },
3150 { 3, PrivMode_132 }, 4086 { 3, PrivMode_132 },
3151 { 4, PrivMode_smoothScroll }, 4087 { 4, PrivMode_smoothScroll },
3152 { 5, PrivMode_rVideo }, 4088 { 5, PrivMode_rVideo },
3153 { 6, PrivMode_relOrigin }, 4089 { 6, PrivMode_relOrigin },
3154 { 7, PrivMode_Autowrap }, 4090 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode
3155 { 9, PrivMode_MouseX10 }, 4092 { 9, PrivMode_MouseX10 },
3156#ifdef menuBar_esc 4093#ifdef menuBar_esc
3157 { menuBar_esc, PrivMode_menuBar }, 4094 { menuBar_esc, PrivMode_menuBar },
3158#endif 4095#endif
4096 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor },
3159#ifdef scrollBar_esc 4098#ifdef scrollBar_esc
3160 { scrollBar_esc, PrivMode_scrollBar }, 4099 { scrollBar_esc, PrivMode_scrollBar },
3161#endif 4100#endif
3162 { 25, PrivMode_VisibleCursor },
3163 { 35, PrivMode_ShiftKeys }, 4101 { 35, PrivMode_ShiftKeys }, // rxvt extension
3164 { 40, PrivMode_132OK }, 4102 { 40, PrivMode_132OK },
4103 // 41 xterm more fixes NYI
4104 // 45 margin bell NYI
4105 // 46 start logging
3165 { 47, PrivMode_Screen }, 4106 { 47, PrivMode_Screen },
3166 { 66, PrivMode_aplKP }, 4107 { 66, PrivMode_aplKP },
3167#ifndef NO_BACKSPACE_KEY 4108#ifndef NO_BACKSPACE_KEY
3168 { 67, PrivMode_BackSpace }, 4109 { 67, PrivMode_BackSpace },
3169#endif 4110#endif
3170 { 1000, PrivMode_MouseX11 }, 4111 { 1000, PrivMode_MouseX11 },
4112 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4113 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4114 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3171 { 1010, PrivMode_TtyOutputInh }, 4115 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3172 { 1011, PrivMode_Keypress }, 4116 { 1011, PrivMode_Keypress }, // rxvt extension
4117 // 1035 enable modifiers for alt, numlock NYI
4118 // 1036 send ESC for meta keys NYI
4119 // 1037 send DEL for keypad delete NYI
3173 { 1047, PrivMode_Screen }, 4120 { 1047, PrivMode_Screen },
4121 // 1048 save and restore cursor
3174 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4122 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4123 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3175 }; 4124 };
3176 4125
3177 if (nargs == 0) 4126 if (nargs == 0)
3178 return; 4127 return;
3179 4128
… …
3194 state = privcases (mode, argtopriv[j].bit); 4143 state = privcases (mode, argtopriv[j].bit);
3195 break; 4144 break;
3196 } 4145 }
3197 4146
3198 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
3199 if (state == -1)
3200 switch (arg[i]) 4148 switch (arg[i])
3201 { 4149 {
4150#if ENABLE_STYLES
4151 case 1021:
4152 set_option (Opt_intensityStyles, mode);
4153
4154 scr_touch (true);
4155 break;
4156#endif
3202 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
4158 case 1049:
4159 if (OPTION (Opt_secondaryScreen))
3203 if (mode == 0) 4160 if (mode == 0)
3204 scr_cursor (RESTORE); 4161 scr_cursor (RESTORE);
3205 else if (mode == 1) 4162 else if (mode == 1)
3206 scr_cursor (SAVE); 4163 scr_cursor (SAVE);
3207 /* FALLTHROUGH */
3208 default:
3209 continue; /* for (;i;) */
3210 }
3211
3212 /* extra handling for values with valid 0 or 1 state */
3213 switch (arg[i])
3214 {
3215 /* case 1: - application cursor keys */
3216 case 2: /* VT52 mode */
3217 /* oddball mode. should be set regardless of set/reset
3218 * parameter. Return from VT52 mode with an ESC < from
3219 * within VT52 mode
3220 */
3221 PrivMode (1, PrivMode_vt52);
3222 break; 4164 break;
4165 }
4166
4167 if (state >= 0)
4168 /* extra handling for values with valid 0 or 1 state */
4169 switch (arg[i])
4170 {
4171 /* case 1: - application cursor keys */
4172 case 2: /* VT52 mode */
4173 /* oddball mode. should be set regardless of set/reset
4174 * parameter. Return from VT52 mode with an ESC < from
4175 * within VT52 mode
4176 */
4177 PrivMode (1, PrivMode_vt52);
4178 break;
3223 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
3224 if (PrivateModes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
3225 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
3226 (unsigned int)TermWin.height);
3227 break; 4182 break;
3228 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
3229 if (state)
3230 Options &= ~Opt_jumpScroll;
3231 else
3232 Options |= Opt_jumpScroll; 4184 set_option (Opt_jumpScroll, !state);
3233 break; 4185 break;
3234 case 5: /* reverse video */ 4186 case 5: /* reverse video */
3235 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
3236 break; 4188 break;
3237 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
3238 scr_relative_origin (state); 4190 scr_relative_origin (state);
3239 break; 4191 break;
3240 case 7: /* autowrap */ 4192 case 7: /* autowrap */
3241 scr_autowrap (state); 4193 scr_autowrap (state);
3242 break; 4194 break;
3243 /* case 8: - auto repeat, can't do on a per window basis */ 4195 /* case 8: - auto repeat, can't do on a per window basis */
3244 case 9: /* X10 mouse reporting */ 4196 case 9: /* X10 mouse reporting */
3245 if (state) /* orthogonal */ 4197 if (state) /* orthogonal */
3246 PrivateModes &= ~ (PrivMode_MouseX11); 4198 priv_modes &= ~PrivMode_MouseX11;
3247 break; 4199 break;
3248#ifdef menuBar_esc 4200#ifdef menuBar_esc
3249 case menuBar_esc: 4201 case menuBar_esc:
3250#ifdef MENUBAR 4202#ifdef MENUBAR
3251 map_menuBar (state); 4203 map_menuBar (state);
3252#endif 4204#endif
3253 break; 4205 break;
3254#endif 4206#endif
3255#ifdef scrollBar_esc 4207#ifdef scrollBar_esc
3256 case scrollBar_esc: 4208 case scrollBar_esc:
3257 if (scrollbar_mapping (state)) 4209 if (scrollbar_mapping (state))
3258 { 4210 {
3259 resize_all_windows (0, 0, 0); 4211 resize_all_windows (0, 0, 0);
3260 scr_touch (true); 4212 scr_touch (true);
3261 } 4213 }
3262 break; 4214 break;
3263#endif 4215#endif
3264 case 25: /* visible/invisible cursor */ 4216 case 25: /* visible/invisible cursor */
3265 scr_cursor_visible (state); 4217 scr_cursor_visible (state);
3266 break; 4218 break;
3267 /* case 35: - shift keys */ 4219 /* case 35: - shift keys */
3268 /* case 40: - 80 <--> 132 mode */ 4220 /* case 40: - 80 <--> 132 mode */
3269 case 47: /* secondary screen */ 4221 case 47: /* secondary screen */
3270 scr_change_screen (state); 4222 scr_change_screen (state);
3271 break; 4223 break;
3272 /* case 66: - application key pad */ 4224 /* case 66: - application key pad */
3273 /* case 67: - backspace key */ 4225 /* case 67: - backspace key */
3274 case 1000: /* X11 mouse reporting */ 4226 case 1000: /* X11 mouse reporting */
3275 if (state) /* orthogonal */ 4227 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX10); 4228 priv_modes &= ~PrivMode_MouseX10;
3277 break; 4229 break;
3278#if 0 4230#if 0
3279 case 1001: 4231 case 1001:
3280 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
3281#endif 4233#endif
3282 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
3283 if (state)
3284 Options &= ~Opt_scrollTtyOutput;
3285 else
3286 Options |= Opt_scrollTtyOutput; 4235 set_option (Opt_scrollTtyOutput, !state);
3287 break; 4236 break;
3288 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
3289 if (state)
3290 Options |= Opt_scrollTtyKeypress; 4238 set_option (Opt_scrollTtyKeypress, state);
3291 else
3292 Options &= ~Opt_scrollTtyKeypress;
3293 break; 4239 break;
3294 case 1047: /* secondary screen w/ clearing */ 4240 case 1047: /* secondary screen w/ clearing last */
3295 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4241 if (OPTION (Opt_secondaryScreen))
3296 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
3297 scr_erase_screen (2); 4243 scr_erase_screen (2);
3298 scr_change_screen (state); 4244 scr_change_screen (state);
3299 /* FALLTHROUGH */
3300 default:
3301 break; 4245 break;
4246 case 1049: /* secondary screen w/ clearing first */
4247 scr_change_screen (state);
4248 if (OPTION (Opt_secondaryScreen))
4249 if (current_screen != PRIMARY)
4250 scr_erase_screen (2);
4251 break;
4252 default:
4253 break;
3302 } 4254 }
3303 } 4255 }
3304} 4256}
3305/*}}} */ 4257/*}}} */
3306 4258
3307/*{{{ process sgr sequences */ 4259/*{{{ process sgr sequences */
3308void 4260void
3309rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4261rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3310{ 4262{
3311 unsigned int i; 4263 unsigned int i;
3312 short rendset; 4264 short rendset;
3313 int rendstyle; 4265 int rendstyle;
3314 4266
3315 if (nargs == 0) 4267 if (nargs == 0)
3316 { 4268 {
3317 scr_rendition (0, ~RS_None); 4269 scr_rendition (0, ~RS_None);
3318 return; 4270 return;
3319 } 4271 }
4272
3320 for (i = 0; i < nargs; i++) 4273 for (i = 0; i < nargs; i++)
3321 { 4274 {
3322 rendset = -1; 4275 rendset = -1;
3323 switch (arg[i]) 4276 switch (arg[i])
3324 { 4277 {
… …
3326 rendset = 0, rendstyle = ~RS_None; 4279 rendset = 0, rendstyle = ~RS_None;
3327 break; 4280 break;
3328 case 1: 4281 case 1:
3329 rendset = 1, rendstyle = RS_Bold; 4282 rendset = 1, rendstyle = RS_Bold;
3330 break; 4283 break;
4284 //case 2: // low intensity
4285 case 3:
4286 rendset = 1, rendstyle = RS_Italic;
4287 break;
3331 case 4: 4288 case 4:
3332 rendset = 1, rendstyle = RS_Uline; 4289 rendset = 1, rendstyle = RS_Uline;
3333 break; 4290 break;
3334 case 5: 4291 case 5: // slowly blinking
4292 case 6: // rapidly blinking
3335 rendset = 1, rendstyle = RS_Blink; 4293 rendset = 1, rendstyle = RS_Blink;
3336 break; 4294 break;
4295 //case 6: // scoansi light background
3337 case 7: 4296 case 7:
3338 rendset = 1, rendstyle = RS_RVid; 4297 rendset = 1, rendstyle = RS_RVid;
3339 break; 4298 break;
3340 case 22: 4299 case 8:
4300 // invisible. NYI
4301 break;
4302 //case 9: // crossed out
4303 //case 10: // scoansi acs off, primary font
4304 //case 11: // scoansi acs on, first alt font
4305 //case 12: // scoansi acs on, |0x80, second alt font
4306 //...
4307 //case 19: // ninth alt font
4308 //case 20: // gothic
4309 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3341 rendset = 0, rendstyle = RS_Bold; 4310 rendset = 0, rendstyle = RS_Bold;
4311 break;
4312 case 22: // normal intensity
4313 rendset = 0, rendstyle = RS_Bold;
4314 break;
4315 case 23: // disable italic
4316 rendset = 0, rendstyle = RS_Italic;
3342 break; 4317 break;
3343 case 24: 4318 case 24:
3344 rendset = 0, rendstyle = RS_Uline; 4319 rendset = 0, rendstyle = RS_Uline;
3345 break; 4320 break;
3346 case 25: 4321 case 25:
3347 rendset = 0, rendstyle = RS_Blink; 4322 rendset = 0, rendstyle = RS_Blink;
3348 break; 4323 break;
4324 case 26: // variable spacing (iso 8613)
4325 rendset = 0, rendstyle = RS_Blink;
4326 break;
3349 case 27: 4327 case 27:
3350 rendset = 0, rendstyle = RS_RVid; 4328 rendset = 0, rendstyle = RS_RVid;
3351 break; 4329 break;
4330 //case 28: // visible. NYI
4331 //case 29: // not crossed-out
3352 } 4332 }
4333
3353 if (rendset != -1) 4334 if (rendset != -1)
3354 { 4335 {
3355 scr_rendition (rendset, rendstyle); 4336 scr_rendition (rendset, rendstyle);
3356 continue; /* for (;i;) */ 4337 continue; /* for (;i;) */
3357 } 4338 }
… …
3364 case 33: 4345 case 33:
3365 case 34: 4346 case 34:
3366 case 35: 4347 case 35:
3367 case 36: 4348 case 36:
3368 case 37: 4349 case 37:
3369 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4350 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3370 Color_fg);
3371 break; 4351 break;
3372#ifdef TTY_256COLOR 4352 case 38: // set fg color, ISO 8613-6
3373 case 38:
3374 if (nargs > i + 2 && arg[i + 1] == 5) 4353 if (nargs > i + 2 && arg[i + 1] == 5)
3375 { 4354 {
3376 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4355 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3377 Color_fg);
3378 i += 2; 4356 i += 2;
3379 } 4357 }
3380 break; 4358 break;
3381#endif
3382 case 39: /* default fg */ 4359 case 39: /* default fg */
3383 scr_color (Color_fg, Color_fg); 4360 scr_color (Color_fg, Color_fg);
3384 break; 4361 break;
3385 4362
3386 case 40: 4363 case 40:
… …
3389 case 43: 4366 case 43:
3390 case 44: 4367 case 44:
3391 case 45: 4368 case 45:
3392 case 46: 4369 case 46:
3393 case 47: 4370 case 47:
3394 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4371 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3395 Color_bg);
3396 break; 4372 break;
3397#ifdef TTY_256COLOR 4373 case 48: // set bg color, ISO 8613-6
3398 case 48:
3399 if (nargs > i + 2 && arg[i + 1] == 5) 4374 if (nargs > i + 2 && arg[i + 1] == 5)
3400 { 4375 {
3401 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4376 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3402 Color_bg);
3403 i += 2; 4377 i += 2;
3404 } 4378 }
3405 break; 4379 break;
3406#endif
3407 case 49: /* default bg */ 4380 case 49: /* default bg */
3408 scr_color (Color_bg, Color_bg); 4381 scr_color (Color_bg, Color_bg);
3409 break; 4382 break;
3410 4383
3411#ifndef NO_BRIGHTCOLOR 4384 //case 50: // not variable spacing
4385
4386#if ENABLE_FRILLS
3412 case 90: 4387 case 90:
3413 case 91: /* set bright fg color */ 4388 case 91: /* set bright fg color */
3414 case 92: 4389 case 92:
3415 case 93: 4390 case 93:
3416 case 94: 4391 case 94:
3417 case 95: 4392 case 95:
3418 case 96: 4393 case 96:
3419 case 97: 4394 case 97:
3420 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4395 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3421 Color_fg);
3422 break; 4396 break;
3423 case 100: 4397 case 100:
3424 case 101: /* set bright bg color */ 4398 case 101: /* set bright bg color */
3425 case 102: 4399 case 102:
3426 case 103: 4400 case 103:
3427 case 104: 4401 case 104:
3428 case 105: 4402 case 105:
3429 case 106: 4403 case 106:
3430 case 107: 4404 case 107:
3431 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4405 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3432 Color_bg);
3433 break; 4406 break;
3434#endif 4407#endif
3435
3436 } 4408 }
3437 } 4409 }
3438} 4410}
3439/*}}} */ 4411/*}}} */
3440 4412
3441/*{{{ process Rob Nation's own graphics mode sequences */ 4413/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3442void 4414void
3443rxvt_term::process_graphics () 4415rxvt_term::process_graphics ()
3444{ 4416{
3445 unsigned char ch, cmd = cmd_getc (); 4417 unicode_t ch, cmd = cmd_getc ();
3446 4418
3447 if (cmd == 'Q') 4419 if (cmd == 'Q')
3448 { /* query graphics */ 4420 { /* query graphics */
3449 tt_printf ("\033G0\n"); /* no graphics */ 4421 tt_printf ("\033G0\012"); /* no graphics */
3450 return; 4422 return;
3451 } 4423 }
3452 /* swallow other graphics sequences until terminating ':' */ 4424 /* swallow other graphics sequences until terminating ':' */
3453 do 4425 do
3454 ch = cmd_getc (); 4426 ch = cmd_getc ();
… …
3464 */ 4436 */
3465void 4437void
3466rxvt_term::tt_printf (const char *fmt,...) 4438rxvt_term::tt_printf (const char *fmt,...)
3467{ 4439{
3468 va_list arg_ptr; 4440 va_list arg_ptr;
3469 unsigned char buf[256]; 4441 char buf[256];
3470 4442
3471 va_start (arg_ptr, fmt); 4443 va_start (arg_ptr, fmt);
3472 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3473 va_end (arg_ptr); 4445 va_end (arg_ptr);
3474 tt_write (buf, STRLEN (buf)); 4446 tt_write (buf, strlen (buf));
3475} 4447}
3476 4448
3477/* ---------------------------------------------------------------------- */ 4449/* ---------------------------------------------------------------------- */
3478/* Write data to the pty as typed by the user, pasted with the mouse, 4450/* Write data to the pty as typed by the user, pasted with the mouse,
3479 * or generated by us in response to a query ESC sequence. 4451 * or generated by us in response to a query ESC sequence.
3480 */ 4452 */
4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4454
3481void 4455void
3482rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
3483{ 4457{
3484 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
3485 4460
3486 if (len) 4461 if (pty.pty < 0)
4462 return;
4463
4464 if (v_buflen == 0)
4465 {
4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4467
4468 if ((unsigned int)written == len)
4469 return;
4470
4471 data += written;
4472 len -= written;
3487 { 4473 }
4474
4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4476
4477 memcpy (v_buffer + v_buflen, data, len);
4478 v_buflen += len;
4479
4480 pty_ev.set (EVENT_READ | EVENT_WRITE);
4481}
4482
4483void rxvt_term::pty_write ()
4484{
4485 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4486
4487 if (written > 0)
4488 {
4489 v_buflen -= written;
4490
3488 if (v_buflen == 0) 4491 if (v_buflen == 0)
3489 { 4492 {
3490 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3491
3492 if ((unsigned int)written == len)
3493 return;
3494
3495 data += written;
3496 len -= written;
3497 }
3498
3499
3500 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3501
3502 memcpy (v_buffer + v_buflen, data, len);
3503 v_buflen += len;
3504 }
3505
3506 for (;;)
3507 {
3508 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3509
3510 if (written > 0)
3511 {
3512 v_buflen -= written;
3513
3514 if (v_buflen == 0)
3515 {
3516 free (v_buffer); 4493 free (v_buffer);
3517 v_buffer = 0; 4494 v_buffer = 0;
3518 v_buflen = 0; 4495 v_buflen = 0;
3519 4496
3520 pty_ev.set (EVENT_READ); 4497 pty_ev.set (EVENT_READ);
3521 return;
3522 }
3523
3524 memmove (v_buffer, v_buffer + written, v_buflen);
3525 }
3526 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3527 // original code just ignores this...
3528 destroy ();
3529 else
3530 {
3531 pty_ev.set (EVENT_READ | EVENT_WRITE);
3532 return; 4498 return;
3533 } 4499 }
4500
4501 memmove (v_buffer, v_buffer + written, v_buflen);
3534 } 4502 }
4503 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4504 pty_ev.set (EVENT_READ);
3535} 4505}
3536 4506
3537/*----------------------- end-of-file (C source) -----------------------*/ 4507/*----------------------- end-of-file (C source) -----------------------*/
3538 4508

Diff Legend

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