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

Diff Legend

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