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

Diff Legend

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