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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.261 by root, Fri Jan 13 15:42:50 2006 UTC

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

Diff Legend

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