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.38 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.200 by root, Sun Feb 20 19:45:30 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);
83 } 297 }
84 298
85 kbuf[0] = 0; 299 kbuf[0] = 0;
86 300
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) 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 */
368 keysym = XK_Left + (keysym - XK_KP_Left); 569 keysym = XK_Left + (keysym - XK_KP_Left);
… …
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
561 case XK_F1: /* "\033[11~" */ 742 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 743 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 744 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 745 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 746 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 747 FKEY (11, XK_F1);
567 break; 748 break;
568 case XK_F6: /* "\033[17~" */ 749 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 750 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 751 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 752 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 753 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 754 FKEY (17, XK_F6);
574 break; 755 break;
575 case XK_F11: /* "\033[23~" */ 756 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 757 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 758 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 759 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 760 FKEY (23, XK_F11);
580 break; 761 break;
581 case XK_F15: /* "\033[28~" */ 762 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 763 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 764 FKEY (28, XK_F15);
584 break; 765 break;
585 case XK_Help: /* "\033[28~" */ 766 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 767 FKEY (28, XK_Help);
587 break; 768 break;
588 case XK_Menu: /* "\033[29~" */ 769 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 770 FKEY (29, XK_Menu);
590 break; 771 break;
591 case XK_F17: /* "\033[31~" */ 772 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 773 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 774 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 775 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 786 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 787 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 788 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 789 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 790 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 791 FKEY (31, XK_F17);
611 break; 792 break;
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 XFlush (display->display); 947 display->flush ();
759} 948}
760 949
761void 950void
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.mbs); 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);
1081 if (key_state & 8) 1178 if (key_state & 8)
1082 fputc('A', stderr); 1179 fputc ('A', stderr);
1083 if (key_state & 32) 1180 if (key_state & 32)
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)
1100{ 1197{
1101 rxvt_t *r = rxvt_get_r(); 1198 rxvt_t *r = rxvt_get_r ();
1102 1199
1103 x_cb (*ev); 1200 x_cb (*ev);
1104} 1201}
1105#endif 1202#endif
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 {
… …
1332 1424
1333 do 1425 do
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 }
1444 break;
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
1362 break; 1451 break;
1363 1452
1364 case SelectionClear: 1453 case SelectionClear:
1365 selection_clear (); 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;
… …
1387#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1477#endif
1390 break; 1478 break;
1391 1479
1392 case PropertyNotify:
1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1394 if (ev.xproperty.state == PropertyNewValue)
1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1396 break;
1397
1398#ifdef TRANSPARENT 1480#ifdef TRANSPARENT
1399 case ReparentNotify: 1481 case ReparentNotify:
1400 rootwin_cb (ev); 1482 rootwin_cb (ev);
1401 break; 1483 break;
1402#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1403 1485
1404 case GraphicsExpose: 1486 case GraphicsExpose:
1405 case Expose: 1487 case Expose:
1406 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == TermWin.vt)
1407 { 1489 {
1408#ifdef NO_SLOW_LINK_SUPPORT 1490 do
1409 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1410 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1411#else 1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1412 // 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))
1413 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1414 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1415 //scr_expose (ev.xexpose.x, 0, 1500
1416 // ev.xexpose.width, TermWin.height, False); 1501 scr_refresh (refresh_type);
1417#endif
1418 want_refresh = 1;
1419 } 1502 }
1420 else 1503 else
1421 { 1504 {
1422 XEvent unused_event; 1505 XEvent unused_event;
1423 1506
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1425 Expose, 1508 ;
1426 &unused_event)) ; 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1510 ;
1428 GraphicsExpose, 1511
1429 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1431 { 1513 {
1432 scrollBar.setIdle(); 1514 scrollBar.setIdle ();
1433 scrollbar_show (0); 1515 scrollbar_show (0);
1434 } 1516 }
1435#ifdef MENUBAR 1517#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1519 menubar_expose ();
1438#endif 1520#endif
1439#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window);
1441#endif
1442 1521
1522#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0])
1524 XClearWindow (disp, ev.xany.window);
1525#endif
1443 } 1526 }
1444 break; 1527 break;
1445 1528
1446 case MotionNotify: 1529 case MotionNotify:
1447#ifdef POINTER_BLANK 1530#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1531 if (hidden_pointer)
1449 pointer_unblank (); 1532 pointer_unblank ();
1450#endif 1533#endif
1451#if MENUBAR 1534#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1535 if (isMenuBarWindow (ev.xany.window))
1453 { 1536 {
1454 menubar_control (&(ev.xbutton)); 1537 menubar_control (ev.xbutton);
1455 break; 1538 break;
1456 } 1539 }
1457#endif 1540#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1459 break; 1542 break;
1460 1543
1461 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == TermWin.vt)
1462 { 1545 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1464 { 1547 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1466 ; 1549 ;
1467 1550
1468 XQueryPointer(display->display, TermWin.vt, 1551 XQueryPointer (disp, TermWin.vt,
1469 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1472 &unused_mask); 1555 &ev.xbutton.state);
1473#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1559 {
1477#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
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1480#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1575 {
1484 int dist; 1576 int dist;
1485
1486 pending_scroll_selection=1;
1487 1577
1488 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1490 */ 1580 */
1491 if (scroll_selection_delay<=0) 1581 if (!sel_scroll_ev.active)
1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1493 1583
1494 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1496 */ 1586 */
1497 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1498 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1590
1502 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < TermWin.int_bwidth)
1504 { 1593 {
1505 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1506 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = TermWin.int_bwidth - ev.xbutton.y;
1507 } 1596 }
1508 else 1597 else
1509 { 1598 {
1510 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1513 } 1601 }
1602
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1516 MIN_IT(scroll_selection_lines, 1606 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1518 } 1608 }
1519 else 1609 else
1520 { 1610 {
1521 /* we are within the text window, so we 1611 /* we are within the text window, so we
1522 * shouldn't be scrolling 1612 * shouldn't be scrolling
1523 */ 1613 */
1524 pending_scroll_selection = 0; 1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop();
1525 } 1616 }
1526#endif 1617#endif
1527#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1528
1529 } 1619 }
1530#endif 1620#endif
1531
1532 } 1621 }
1533 } 1622 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1624 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1537 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1538 XQueryPointer(display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1539 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1542 &unused_mask); 1633 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1635 scrollbar_size ());
1545 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1637 refresh_limit = 0;
1547 scrollbar_show (1); 1638 scrollbar_show (1);
1548 } 1639 }
1549 break; 1640 break;
1550 } 1641 }
1551} 1642}
1552 1643
1553void 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
1554rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1555{ 1708{
1556 SET_R (this); 1709 SET_R (this);
1557 SET_LOCALE (locale); 1710 SET_LOCALE (locale);
1558 1711
1559 if (ev.type == PropertyNotify) 1712 switch (ev.type)
1560 { 1713 {
1714 case PropertyNotify:
1561 /* 1715 /*
1562 * 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,
1563 * 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.
1564 */ 1718 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1567
1568 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])
1569 return; 1721 return;
1570 }
1571 1722
1723 /* FALLTHROUGH */
1724 case ReparentNotify:
1572 if ((Options & Opt_transparent) && check_our_parents ()) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1;
1727 break;
1573 { 1728 }
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 }
1577} 1729}
1730#endif
1578 1731
1579void 1732void
1580rxvt_term::button_press (const XButtonEvent &ev) 1733rxvt_term::button_press (XButtonEvent &ev)
1581{ 1734{
1582 int reportmode = 0, clickintime; 1735 int reportmode = 0, clickintime;
1583 1736
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate) 1738 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740
1587 /* 1741 /*
1588 * VT window processing of button press 1742 * VT window processing of button press
1589 */ 1743 */
1590 if (ev.window == TermWin.vt) 1744 if (ev.window == TermWin.vt)
1591 { 1745 {
1592#if RXVT_GRAPHICS 1746#if ISO_14755
1593 if (ev.subwindow != None) 1747 // 5.4
1594 rxvt_Gr_ButtonPress (ev.x, ev.y); 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 else 1749 {
1596#endif 1750 iso14755_54 (ev.x, ev.y);
1597 1751 return;
1598 { 1752 }
1753#endif
1754
1599 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1600 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)
1601 { 1764 {
1602 /* mouse report from vt window */ 1765 /* same button, within alloted time */
1603 /* save the xbutton state (for ButtonRelease) */ 1766 MEvent.clicks++;
1604 MEvent.state = ev.state; 1767 if (MEvent.clicks > 1)
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 { 1768 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */ 1769 /* only report double clicks */
1613 MEvent.clicks = 2; 1770 MEvent.clicks = 2;
1614 mouse_report (ev); 1771 mouse_report (ev);
1615 1772
1616 /* don't report the release */ 1773 /* don't report the release */
1617 MEvent.clicks = 0; 1774 MEvent.clicks = 0;
1618 MEvent.button = AnyButton; 1775 MEvent.button = AnyButton;
1619 }
1620 } 1776 }
1621 else
1622 {
1623 /* different button, or time expired */
1624 MEvent.clicks = 1;
1625 MEvent.button = ev.button;
1626 mouse_report (ev);
1627 }
1628#else
1629 MEvent.button = ev.button;
1630 mouse_report (ev);
1631#endif /* MOUSE_REPORT_DOUBLECLICK */
1632
1633 } 1777 }
1634 else 1778 else
1635 { 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 {
1636 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1638 switch (ev.button) 1796 switch (ev.button)
1639 { 1797 {
1640 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
1641 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1643 { 1809 {
1644 if (MEvent.button == Button1 && clickintime)
1645 selection_rotate (ev.x, ev.y);
1646 else
1647 selection_extend (ev.x, ev.y, 1);
1648 }
1649 else
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 MEvent.clicks++;
1653 else
1654 MEvent.clicks = 1;
1655
1656 selection_click (MEvent.clicks, ev.x, ev.y);
1657 }
1658
1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1664 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
1665 else 1812 else
1666 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
1667 MEvent.button = Button3; 1834 MEvent.button = Button3;
1668 break; 1835 break;
1669 }
1670 } 1836 }
1837 }
1838
1671 MEvent.time = ev.time; 1839 MEvent.time = ev.time;
1672 return; 1840 return;
1673 }
1674 } 1841 }
1675 1842
1676 /* 1843 /*
1677 * Scrollbar window processing of button press 1844 * Scrollbar window processing of button press
1678 */ 1845 */
1679 if (isScrollbarWindow(ev.window)) 1846 if (isScrollbarWindow (ev.window))
1680 { 1847 {
1681 scrollBar.setIdle (); 1848 scrollBar.setIdle ();
1682 /* 1849 /*
1683 * Rxvt-style scrollbar: 1850 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider 1851 * move up if mouse is above slider
… …
1696 * Mouse report disabled scrollbar: 1863 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down 1864 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down 1865 * click on scrollbar - send pageup/down
1699 */ 1866 */
1700 if ((scrollBar.style == R_SB_NEXT 1867 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y)) 1868 && scrollbarnext_upButton (ev.y))
1702 || (scrollBar.style == R_SB_RXVT 1869 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y))) 1870 && scrollbarrxvt_upButton (ev.y)))
1704 tt_printf("\033[A"); 1871 tt_printf ("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT 1872 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y)) 1873 && scrollbarnext_dnButton (ev.y))
1707 || (scrollBar.style == R_SB_RXVT 1874 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y))) 1875 && scrollbarrxvt_dnButton (ev.y)))
1709 tt_printf("\033[B"); 1876 tt_printf ("\033[B");
1710 else 1877 else
1711 switch (ev.button) 1878 switch (ev.button)
1712 { 1879 {
1713 case Button2: 1880 case Button2:
1714 tt_printf("\014"); 1881 tt_printf ("\014");
1715 break; 1882 break;
1716 case Button1: 1883 case Button1:
1717 tt_printf("\033[6~"); 1884 tt_printf ("\033[6~");
1718 break; 1885 break;
1719 case Button3: 1886 case Button3:
1720 tt_printf("\033[5~"); 1887 tt_printf ("\033[5~");
1721 break; 1888 break;
1722 } 1889 }
1723 } 1890 }
1724 else 1891 else
1725#endif /* NO_SCROLLBAR_REPORT */ 1892#endif /* NO_SCROLLBAR_REPORT */
… …
1727 { 1894 {
1728 char upordown = 0; 1895 char upordown = 0;
1729 1896
1730 if (scrollBar.style == R_SB_NEXT) 1897 if (scrollBar.style == R_SB_NEXT)
1731 { 1898 {
1732 if (scrollbarnext_upButton(ev.y)) 1899 if (scrollbarnext_upButton (ev.y))
1733 upordown = -1; /* up */ 1900 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y)) 1901 else if (scrollbarnext_dnButton (ev.y))
1735 upordown = 1; /* down */ 1902 upordown = 1; /* down */
1736 } 1903 }
1737 else if (scrollBar.style == R_SB_RXVT) 1904 else if (scrollBar.style == R_SB_RXVT)
1738 { 1905 {
1739 if (scrollbarrxvt_upButton(ev.y)) 1906 if (scrollbarrxvt_upButton (ev.y))
1740 upordown = -1; /* up */ 1907 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y)) 1908 else if (scrollbarrxvt_dnButton (ev.y))
1742 upordown = 1; /* down */ 1909 upordown = 1; /* down */
1743 } 1910 }
1744 if (upordown) 1911 if (upordown)
1745 { 1912 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1913#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1914 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1748#endif 1915#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1)) 1916 if (scr_page (upordown < 0 ? UP : DN, 1))
1750 { 1917 {
1751 if (upordown < 0) 1918 if (upordown < 0)
1752 scrollBar.setUp (); 1919 scrollBar.setUp ();
… …
1768 break; 1935 break;
1769 case R_SB_ALIGN_BOTTOM: 1936 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top; 1937 csrO = scrollBar.bot - scrollBar.top;
1771 break; 1938 break;
1772 } 1939 }
1940
1773 if (scrollBar.style == R_SB_XTERM 1941 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y) 1942 || scrollbar_above_slider (ev.y)
1775 || scrollbar_below_slider(ev.y)) 1943 || scrollbar_below_slider (ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO, 1944 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1777 scrollbar_size()); 1945
1778 scrollBar.setMotion (); 1946 scrollBar.setMotion ();
1779 break; 1947 break;
1780 1948
1781 case Button1: 1949 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1950 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1784 /* FALLTHROUGH */ 1952 /* FALLTHROUGH */
1785 1953
1786 case Button3: 1954 case Button3:
1787 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1788 { 1956 {
1789 if (scrollbar_above_slider(ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, TermWin.nrow - 1);
1792# else 1960# else
1793 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, TermWin.nrow / 4);
1794# endif 1962# endif
1795 else if (scrollbar_below_slider(ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1796# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, TermWin.nrow - 1);
1798# else 1966# else
1799 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, TermWin.nrow / 4);
1800# endif 1968# endif
… …
1803 } 1971 }
1804 else 1972 else
1805 { 1973 {
1806 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow 1975 (TermWin.nrow
1808 * scrollbar_position(ev.y) 1976 * scrollbar_position (ev.y)
1809 / scrollbar_size())); 1977 / scrollbar_size ()));
1810 } 1978 }
1979
1811 break; 1980 break;
1812 } 1981 }
1813 } 1982 }
1814 return; 1983 return;
1815 } 1984 }
1816#if MENUBAR 1985#if MENUBAR
1817 /* 1986 /*
1818 * Menubar window processing of button press 1987 * Menubar window processing of button press
1819 */ 1988 */
1820 if (isMenuBarWindow(ev.window)) 1989 if (isMenuBarWindow (ev.window))
1821 menubar_control (ev); 1990 menubar_control (ev);
1822#endif 1991#endif
1823} 1992}
1824 1993
1825void 1994void
1826rxvt_term::button_release (const XButtonEvent &ev) 1995rxvt_term::button_release (XButtonEvent &ev)
1827{ 1996{
1828 int reportmode = 0; 1997 int reportmode = 0;
1829 1998
1830 csrO = 0; /* reset csr Offset */ 1999 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate) 2000 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2001 reportmode = !! (priv_modes & PrivMode_mouse_report);
1833 2002
1834 if (scrollbar_isUpDn()) 2003 if (scrollbar_isUpDn ())
1835 { 2004 {
1836 scrollBar.setIdle (); 2005 scrollBar.setIdle ();
1837 scrollbar_show (0); 2006 scrollbar_show (0);
1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1839 refresh_type &= ~SMOOTH_REFRESH; 2008 refresh_type &= ~SMOOTH_REFRESH;
1840#endif 2009#endif
1841
1842 } 2010 }
2011
1843#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1844 pending_scroll_selection=0; 2013 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop();
1845#endif 2015#endif
2016
1846 if (ev.window == TermWin.vt) 2017 if (ev.window == TermWin.vt)
1847 { 2018 {
1848#ifdef RXVT_GRAPHICS 2019#if ISO_14755
1849 if (ev.subwindow != None) 2020 // 5.4
1850 rxvt_Gr_ButtonRelease(ev.x, ev.y); 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 else 2022 return;
1852#endif 2023#endif
1853
1854 {
1855 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)))
1856 { 2036 {
1857 /* mouse report from vt window */
1858 /* don't report release of wheel "buttons" */
1859 if (ev.button >= 4)
1860 return;
1861#ifdef MOUSE_REPORT_DOUBLECLICK
1862 /* only report the release of 'slow' single clicks */
1863 if (MEvent.button != AnyButton
1864 && (ev.button != MEvent.button
1865 || (ev.time - MEvent.time
1866 > MULTICLICK_TIME / 2)))
1867 {
1868 MEvent.clicks = 0; 2037 MEvent.clicks = 0;
1869 MEvent.button = AnyButton;
1870 mouse_report (ev);
1871 }
1872#else /* MOUSE_REPORT_DOUBLECLICK */
1873 MEvent.button = AnyButton; 2038 MEvent.button = AnyButton;
1874 mouse_report (ev); 2039 mouse_report (ev);
2040 }
2041#else /* MOUSE_REPORT_DOUBLECLICK */
2042 MEvent.button = AnyButton;
2043 mouse_report (ev);
1875#endif /* MOUSE_REPORT_DOUBLECLICK */ 2044#endif /* MOUSE_REPORT_DOUBLECLICK */
1876 return; 2045 return;
1877 } 2046 }
2047
1878 /* 2048 /*
1879 * dumb hack to compensate for the failure of click-and-drag 2049 * dumb hack to compensate for the failure of click-and-drag
1880 * when overriding mouse reporting 2050 * when overriding mouse reporting
1881 */ 2051 */
1882 if (PrivateModes & PrivMode_mouse_report 2052 if (priv_modes & PrivMode_mouse_report
1883 && bypass_keystate 2053 && bypass_keystate
1884 && ev.button == Button1 && MEvent.clicks <= 1) 2054 && ev.button == Button1 && MEvent.clicks <= 1)
1885 selection_extend (ev.x, ev.y, 0); 2055 selection_extend (ev.x, ev.y, 0);
1886 2056
1887 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:
1888 { 2069 {
1889 case Button1: 2070 int i;
1890 case Button3: 2071 page_dirn v;
1891 selection_make (ev.time); 2072
2073 v = ev.button == Button4 ? UP : DN;
2074
2075 if (ev.state & ShiftMask)
1892 break; 2076 i = 1;
1893 case Button2: 2077 else if (options & Opt_mouseWheelScrollPage)
1894 selection_request (ev.time, ev.x, ev.y); 2078 i = TermWin.nrow - 1;
2079 else
1895 break; 2080 i = 5;
2081
1896#ifdef MOUSE_WHEEL 2082# ifdef MOUSE_SLIP_WHEELING
1897 case Button4: 2083 if (ev.state & ControlMask)
1898 case Button5:
1899 { 2084 {
1900 int i;
1901 page_dirn v;
1902
1903 v = (ev.button == Button4) ? UP : DN;
1904 if (ev.state & ShiftMask)
1905 i = 1;
1906 else if ((Options & Opt_mouseWheelScrollPage))
1907 i = TermWin.nrow - 1;
1908 else
1909 i = 5;
1910# ifdef MOUSE_SLIP_WHEELING
1911 if (ev.state & ControlMask)
1912 {
1913 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)
1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091
2092 slip_wheel_ev.start ();
1915 } 2093 }
2094 else
2095 {
1916# endif 2096# endif
1917# ifdef JUMP_MOUSE_WHEEL 2097# ifdef JUMP_MOUSE_WHEEL
1918 scr_page (v, i); 2098 scr_page (v, i);
1919 scr_refresh (SMOOTH_REFRESH); 2099 scr_refresh (SMOOTH_REFRESH);
1920 scrollbar_show (1); 2100 scrollbar_show (1);
… …
1924 scr_page (v, 1); 2104 scr_page (v, 1);
1925 scr_refresh (SMOOTH_REFRESH); 2105 scr_refresh (SMOOTH_REFRESH);
1926 scrollbar_show (1); 2106 scrollbar_show (1);
1927 } 2107 }
1928# endif 2108# endif
1929 2109# ifdef MOUSE_SLIP_WHEELING
1930 } 2110 }
1931 break;
1932#endif 2111#endif
1933
1934 } 2112 }
2113 break;
2114#endif
1935 } 2115 }
1936 } 2116 }
1937#ifdef MENUBAR 2117#ifdef MENUBAR
1938 else if (isMenuBarWindow(ev.window)) 2118 else if (isMenuBarWindow (ev.window))
1939 menubar_control (ev); 2119 menubar_control (ev);
1940#endif 2120#endif
1941} 2121}
1942 2122
1943
1944#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
1945/* 2355/*
1946 * Check our parents are still who we think they are. 2356 * Check our parents are still who we think they are.
1947 * Do transparency updates if required 2357 * Do transparency updates if required
1948 */ 2358 */
1949int 2359int
1950rxvt_term::check_our_parents () 2360rxvt_term::check_our_parents ()
1951{ 2361{
1952 int i, pchanged, aformat, have_pixmap, rootdepth; 2362 int i, pchanged, aformat, have_pixmap, rootdepth;
1953 unsigned long nitems, bytes_after; 2363 unsigned long nitems, bytes_after;
1954 Atom atype; 2364 Atom atype;
1955 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
1956 Window root, oldp, *list; 2366 Window root, oldp, *list;
1957 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
1958 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
1959 2370
1960 pchanged = 0; 2371 pchanged = 0;
1961 2372
1962 if (!(Options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
1963 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
1964 2375
1965 XGetWindowAttributes(display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
1966 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
1967 2378
1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2380
1969 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
1970 { 2382 {
1971 if (am_transparent) 2383 if (am_transparent)
1972 { 2384 {
1973 pchanged = 1; 2385 pchanged = 1;
1974 XSetWindowBackground(display->display, TermWin.vt, 2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1975 PixColors[Color_bg]);
1976 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
1977 } 2388 }
2389
1978 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
1979 } 2391 }
1980 2392
1981 /* 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. */
1982 XSync(display->display, False); 2394 XSync (disp, False);
1983 2395
1984 /* 2396 /*
1985 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
1986 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
1987 * 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.
1988 */ 2400 */
1989 i = (xa[XA_XROOTPMAPID] != 0 2401 i = (xa[XA_XROOTPMAP_ID]
1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1992 &nitems, &bytes_after, &prop) == Success)); 2404 &nitems, &bytes_after, &prop) == Success);
2405
1993 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 )
1994 have_pixmap = 0; 2417 have_pixmap = 0;
1995 else 2418 else
1996 { 2419 {
1997 have_pixmap = 1; 2420 have_pixmap = 1;
1998 rootpixmap = *((Pixmap *)prop); 2421 rootpixmap = *(Pixmap *)prop;
1999 XFree(prop); 2422 XFree (prop);
2000 } 2423 }
2424
2001 if (have_pixmap) 2425 if (have_pixmap)
2002 { 2426 {
2003 /* 2427 /*
2004 * Copy display->root pixmap transparency 2428 * Copy display->root pixmap transparency
2005 */ 2429 */
2006 int sx, sy, nx, ny; 2430 int sx, sy, nx, ny;
2007 unsigned int nw, nh; 2431 unsigned int nw, nh;
2008 Window cr; 2432 Window cr;
2009 XImage *image; 2433 XImage *image;
2010 GC gc; 2434 GC gc;
2011 XGCValues gcvalue; 2435 XGCValues gcvalue;
2012 2436
2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2014 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2015 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2016 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2017 nx = ny = 0; 2441 nx = ny = 0;
2442
2018 if (sx < 0) 2443 if (sx < 0)
2019 { 2444 {
2020 nw += sx; 2445 nw += sx;
2021 nx = -sx; 2446 nx = -sx;
2022 sx = 0; 2447 sx = 0;
2023 } 2448 }
2449
2024 if (sy < 0) 2450 if (sy < 0)
2025 { 2451 {
2026 nh += sy; 2452 nh += sy;
2027 ny = -sy; 2453 ny = -sy;
2028 sy = 0; 2454 sy = 0;
2029 } 2455 }
2456
2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2032 allowedxerror = -1; 2461 allowedxerror = -1;
2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 ZPixmap); 2463
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2466 allowedxerror = 0;
2467
2038 if (image == NULL) 2468 if (image == NULL)
2039 { 2469 {
2040 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2041 { 2471 {
2042 pchanged = 1; 2472 pchanged = 1;
2043 if (TermWin.pixmap != None) 2473 if (TermWin.pixmap != None)
2044 { 2474 {
2045 XFreePixmap(display->display, TermWin.pixmap); 2475 XFreePixmap (disp, TermWin.pixmap);
2046 TermWin.pixmap = None; 2476 TermWin.pixmap = None;
2047 } 2477 }
2048 } 2478 }
2479
2049 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2050 } 2481 }
2051 else 2482 else
2052 { 2483 {
2053 if (TermWin.pixmap != None) 2484 if (TermWin.pixmap != None)
2054 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
2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height, 2500 szHint.width, szHint.height, image->depth);
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height); 2503 nx, ny, image->width, image->height);
2063 XFreeGC(display->display, gc); 2504 XFreeGC (disp, gc);
2064 XDestroyImage(image); 2505 XDestroyImage (image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2066 TermWin.pixmap); 2507 XClearWindow (disp, TermWin.parent[0]);
2508
2067 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1; 2510 pchanged = 1;
2511
2069 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2070 } 2513 }
2071 } 2514 }
2515
2072 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2518 else
2073 { 2519 {
2074 unsigned int n; 2520 unsigned int n;
2075 /* 2521 /*
2076 * InheritPixmap transparency 2522 * InheritPixmap transparency
2077 */ 2523 */
2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2080 i++)
2081 { 2525 {
2082 oldp = TermWin.parent[i]; 2526 oldp = TermWin.parent[i];
2083 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, TermWin.parent[i - 1], &root,
2084 &TermWin.parent[i], &list, &n); 2528 &TermWin.parent[i], &list, &n);
2085 XFree(list); 2529 XFree (list);
2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2530
2087 if (TermWin.parent[i] == display->root) 2531 if (TermWin.parent[i] == display->root)
2088 { 2532 {
2089 if (oldp != None) 2533 if (oldp != None)
2090 pchanged = 1; 2534 pchanged = 1;
2535
2091 break; 2536 break;
2092 } 2537 }
2538
2093 if (oldp != TermWin.parent[i]) 2539 if (oldp != TermWin.parent[i])
2094 pchanged = 1; 2540 pchanged = 1;
2095 } 2541 }
2542
2096 n = 0; 2543 n = 0;
2544
2097 if (pchanged) 2545 if (pchanged)
2098 { 2546 {
2099 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2100 { 2548 {
2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 { 2551 {
2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2106 break; 2553 break;
2107 } 2554 }
2108 } 2555 }
2109 } 2556 }
2110 if (n > (int)(sizeof(TermWin.parent) 2557
2111 / sizeof(TermWin.parent[0]))) 2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2112 { 2559 {
2113 D_X((stderr, "InheritPixmap Turning off")); 2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2114 XSetWindowBackground(display->display, TermWin.parent[0], 2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2115 PixColors[Color_fg]);
2116 XSetWindowBackground(display->display, TermWin.vt,
2117 PixColors[Color_bg]);
2118 am_transparent = 0; 2562 am_transparent = 0;
2119 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2120 } 2564 }
2121 else 2565 else
2122 { 2566 {
2567#if WAIT_FOR_WM
2123 /* wait (an arbitrary period) for the WM to do its thing 2568 /* wait (an arbitrary period) for the WM to do its thing
2124 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2125# ifdef HAVE_NANOSLEEP
2126 struct timespec rqt;
2127
2128 rqt.tv_sec = 1;
2129 rqt.tv_nsec = 0;
2130 nanosleep(&rqt, NULL);
2131# else
2132 sleep(1); 2570 sleep (1);
2133# endif 2571#endif
2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2135 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2573 {
2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2137 ParentRelative); 2575 XClearWindow (disp, TermWin.parent[n]);
2576 }
2577
2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2139 ParentRelative);
2140 am_transparent = 1; 2579 am_transparent = 1;
2141 } 2580 }
2581
2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2143 TermWin.parent[i] = None; 2583 TermWin.parent[i] = None;
2144 } 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
2145 return pchanged; 2600 return pchanged;
2146} 2601}
2147#endif 2602#endif
2148 2603
2149/*}}} */ 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}
2150 2791
2151/*{{{ print pipe */ 2792/*{{{ print pipe */
2152/*----------------------------------------------------------------------*/ 2793/*----------------------------------------------------------------------*/
2153#ifdef PRINTPIPE 2794#ifdef PRINTPIPE
2154FILE * 2795FILE *
2155rxvt_term::popen_printer () 2796rxvt_term::popen_printer ()
2156{ 2797{
2157 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2798 FILE *stream = popen (rs[Rs_print_pipe], "w");
2158 2799
2159 if (stream == NULL) 2800 if (stream == NULL)
2160 rxvt_print_error("can't open printer pipe"); 2801 rxvt_warn ("can't open printer pipe, not printing.\n");
2802
2161 return stream; 2803 return stream;
2162} 2804}
2163 2805
2164int 2806int
2165rxvt_term::pclose_printer (FILE *stream) 2807rxvt_term::pclose_printer (FILE *stream)
2166{ 2808{
2167 fflush (stream); 2809 fflush (stream);
2168 /* pclose() reported not to work on SunOS 4.1.3 */
2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2170 /* pclose works provided SIGCHLD handler uses waitpid */
2171 return pclose (stream); /* return fclose (stream); */
2172# else
2173 return pclose (stream); 2810 return pclose (stream);
2174# endif
2175} 2811}
2176 2812
2177/* 2813/*
2178 * simulate attached vt100 printer 2814 * simulate attached vt100 printer
2179 */ 2815 */
2180void 2816void
2181rxvt_term::process_print_pipe () 2817rxvt_term::process_print_pipe ()
2182{ 2818{
2183 int done; 2819 int done;
2184 FILE *fd; 2820 FILE *fd;
2185 2821
2186 if ((fd = popen_printer ()) == NULL) 2822 if ((fd = popen_printer ()) == NULL)
2187 return; 2823 return;
2188 2824
2189 /* 2825 /*
2190 * 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
2191 * is received. 2827 * is received.
2192 */ 2828 */
2193 for (done = 0; !done;) 2829 for (done = 0; !done;)
2194 { 2830 {
2195 unsigned char buf[8]; 2831 unsigned char buf[8];
2196 unsigned char ch; 2832 unicode_t ch;
2197 unsigned int i, len; 2833 unsigned int i, len;
2198 2834
2199 if ((ch = cmd_getc ()) != C0_ESC) 2835 if ((ch = cmd_getc ()) != C0_ESC)
2200 { 2836 {
2201 if (putc(ch, fd) == EOF) 2837 if (putc (ch, fd) == EOF)
2202 break; /* done = 1 */ 2838 break; /* done = 1 */
2203 } 2839 }
2204 else 2840 else
2205 { 2841 {
2206 len = 0; 2842 len = 0;
… …
2217 { 2853 {
2218 if ((buf[len++] = cmd_getc ()) == 'i') 2854 if ((buf[len++] = cmd_getc ()) == 'i')
2219 break; /* done = 1 */ 2855 break; /* done = 1 */
2220 } 2856 }
2221 } 2857 }
2858
2222 for (i = 0; i < len; i++) 2859 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF) 2860 if (putc (buf[i], fd) == EOF)
2224 { 2861 {
2225 done = 1; 2862 done = 1;
2226 break; 2863 break;
2227 } 2864 }
2228 } 2865 }
2229 } 2866 }
2867
2230 pclose_printer (fd); 2868 pclose_printer (fd);
2231} 2869}
2232#endif /* PRINTPIPE */ 2870#endif /* PRINTPIPE */
2233/*}}} */ 2871/*}}} */
2234 2872
2235/* *INDENT-OFF* */ 2873/* *INDENT-OFF* */
2236enum { 2874enum {
2237 C1_40 = 0x40, 2875 C1_40 = 0x40,
2238 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,
2239 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,
2240 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,
2241 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,
2242}; 2880};
2243/* *INDENT-ON* */ 2881/* *INDENT-ON* */
2244 2882
2245/*{{{ process non-printing single characters */ 2883/*{{{ process non-printing single characters */
2246void 2884void
2247rxvt_term::process_nonprinting (unsigned char ch) 2885rxvt_term::process_nonprinting (unicode_t ch)
2248{ 2886{
2249 switch (ch) 2887 switch (ch)
2250 { 2888 {
2889 case C0_ESC:
2890 process_escape_seq ();
2891 break;
2251 case C0_ENQ: /* terminal Status */ 2892 case C0_ENQ: /* terminal Status */
2252 if (rs[Rs_answerbackstring]) 2893 if (rs[Rs_answerbackstring])
2253 tt_write(
2254 (const unsigned char *)rs[Rs_answerbackstring], 2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2255 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2256 else 2896 else
2257 tt_write((unsigned char *)VT100_ANS, 2897 tt_write ((unsigned char *)VT100_ANS,
2258 (unsigned int)STRLEN(VT100_ANS)); 2898 (unsigned int)strlen (VT100_ANS));
2259 break; 2899 break;
2260 case C0_BEL: /* bell */ 2900 case C0_BEL: /* bell */
2261 scr_bell (); 2901 scr_bell ();
2262 break; 2902 break;
2263 case C0_BS: /* backspace */ 2903 case C0_BS: /* backspace */
… …
2278 scr_charset_choose (1); 2918 scr_charset_choose (1);
2279 break; 2919 break;
2280 case C0_SI: /* shift in - acs */ 2920 case C0_SI: /* shift in - acs */
2281 scr_charset_choose (0); 2921 scr_charset_choose (0);
2282 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
2283 } 2936 }
2284} 2937}
2285/*}}} */ 2938/*}}} */
2286 2939
2287 2940
2288/*{{{ process VT52 escape sequences */ 2941/*{{{ process VT52 escape sequences */
2289void 2942void
2290rxvt_term::process_escape_vt52 (unsigned char ch) 2943rxvt_term::process_escape_vt52 (unicode_t ch)
2291{ 2944{
2292 int row, col; 2945 int row, col;
2293 2946
2294 switch (ch) 2947 switch (ch)
2295 { 2948 {
… …
2325 row = cmd_getc () - ' '; 2978 row = cmd_getc () - ' ';
2326 col = cmd_getc () - ' '; 2979 col = cmd_getc () - ' ';
2327 scr_gotorc (row, col, 0); 2980 scr_gotorc (row, col, 0);
2328 break; 2981 break;
2329 case 'Z': /* identify the terminal type */ 2982 case 'Z': /* identify the terminal type */
2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2983 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2331 break; 2984 break;
2332 case '<': /* turn off VT52 mode */ 2985 case '<': /* turn off VT52 mode */
2333 PrivMode(0, PrivMode_vt52); 2986 PrivMode (0, PrivMode_vt52);
2334 break; 2987 break;
2335 case 'F': /* use special graphics character set */ 2988 case 'F': /* use special graphics character set */
2336 case 'G': /* use regular character set */ 2989 case 'G': /* use regular character set */
2337 /* unimplemented */ 2990 /* unimplemented */
2338 break; 2991 break;
… …
2347 3000
2348/*{{{ process escape sequences */ 3001/*{{{ process escape sequences */
2349void 3002void
2350rxvt_term::process_escape_seq () 3003rxvt_term::process_escape_seq ()
2351{ 3004{
2352 unsigned char ch = cmd_getc (); 3005 unicode_t ch = cmd_getc ();
2353 3006
2354 if (PrivateModes & PrivMode_vt52) 3007 if (priv_modes & PrivMode_vt52)
2355 { 3008 {
2356 process_escape_vt52 (ch); 3009 process_escape_vt52 (ch);
2357 return; 3010 return;
2358 } 3011 }
2359 3012
… …
2374 scr_charset_set (2, (unsigned int)cmd_getc ()); 3027 scr_charset_set (2, (unsigned int)cmd_getc ());
2375 break; 3028 break;
2376 case '+': 3029 case '+':
2377 scr_charset_set (3, (unsigned int)cmd_getc ()); 3030 scr_charset_set (3, (unsigned int)cmd_getc ());
2378 break; 3031 break;
2379#ifdef MULTICHAR_SET 3032#if ENABLE_FRILLS
2380 case '$':
2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2382 break;
2383#endif
2384#ifndef NO_FRILLS
2385 case '6': 3033 case '6':
2386 scr_backindex (); 3034 scr_backindex ();
2387 break; 3035 break;
2388#endif 3036#endif
2389 case '7': 3037 case '7':
2390 scr_cursor (SAVE); 3038 scr_cursor (SAVE);
2391 break; 3039 break;
2392 case '8': 3040 case '8':
2393 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
2394 break; 3042 break;
2395#ifndef NO_FRILLS 3043#if ENABLE_FRILLS
2396 case '9': 3044 case '9':
2397 scr_forwardindex (); 3045 scr_forwardindex ();
2398 break; 3046 break;
2399#endif 3047#endif
2400 case '=': 3048 case '=':
2401 case '>': 3049 case '>':
2402 PrivMode((ch == '='), PrivMode_aplKP); 3050 PrivMode ((ch == '='), PrivMode_aplKP);
2403 break; 3051 break;
2404 3052
2405 case C1_40: 3053 case C1_40:
2406 cmd_getc (); 3054 cmd_getc ();
2407 break; 3055 break;
… …
2410 break; 3058 break;
2411 3059
2412 /* 8.3.87: NEXT LINE */ 3060 /* 8.3.87: NEXT LINE */
2413 case C1_NEL: /* ESC E */ 3061 case C1_NEL: /* ESC E */
2414 { 3062 {
2415 uint32_t nlcr[] = { '\n', '\r' }; 3063 unicode_t nlcr[] = { C0_LF, C0_CR };
2416 scr_add_lines (nlcr, 1, 2); 3064 scr_add_lines (nlcr, 1, 2);
2417 } 3065 }
2418 break; 3066 break;
2419 3067
2420 /* kidnapped escape sequence: Should be 8.3.48 */ 3068 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2431 case C1_RI: /* ESC M */ 3079 case C1_RI: /* ESC M */
2432 scr_index (DN); 3080 scr_index (DN);
2433 break; 3081 break;
2434 3082
2435 /* 8.3.142: SINGLE-SHIFT TWO */ 3083 /* 8.3.142: SINGLE-SHIFT TWO */
2436 /*case C1_SS2: scr_single_shift (2); break; */ 3084 /*case C1_SS2: scr_single_shift (2); break; */
2437 3085
2438 /* 8.3.143: SINGLE-SHIFT THREE */ 3086 /* 8.3.143: SINGLE-SHIFT THREE */
2439 /*case C1_SS3: scr_single_shift (3); break; */ 3087 /*case C1_SS3: scr_single_shift (3); break; */
2440 3088
2441 /* 8.3.27: DEVICE CONTROL STRING */ 3089 /* 8.3.27: DEVICE CONTROL STRING */
2442 case C1_DCS: /* ESC P */ 3090 case C1_DCS: /* ESC P */
2443 process_dcs_seq (); 3091 process_dcs_seq ();
2444 break; 3092 break;
2445 3093
2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2447 case C1_SCI: /* ESC Z */ 3095 case C1_SCI: /* ESC Z */
2448 tt_write((const unsigned char *)ESCZ_ANSWER, 3096 tt_write ((const unsigned char *)ESCZ_ANSWER,
2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2450 break; /* steal obsolete ESC [ c */ 3098 break; /* steal obsolete ESC [ c */
2451 3099
2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2453 case C1_CSI: /* ESC [ */ 3101 case C1_CSI: /* ESC [ */
2454 process_csi_seq (); 3102 process_csi_seq ();
… …
2459 process_osc_seq (); 3107 process_osc_seq ();
2460 break; 3108 break;
2461 3109
2462 /* 8.3.106: RESET TO INITIAL STATE */ 3110 /* 8.3.106: RESET TO INITIAL STATE */
2463 case 'c': 3111 case 'c':
3112 mbstate.reset ();
2464 scr_poweron (); 3113 scr_poweron ();
2465 scrollbar_show (1); 3114 scrollbar_show (1);
2466 break; 3115 break;
2467 3116
2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3117 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2480 3129
2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3130/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2482/* *INDENT-OFF* */ 3131/* *INDENT-OFF* */
2483enum { 3132enum {
2484 CSI_ICH = 0x40, 3133 CSI_ICH = 0x40,
2485 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,
2486 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 ,
2487 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,
2488 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,
2489 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,
2490 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,
… …
2494 3143
2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 3144#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 3145 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 3146 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2498#define get_byte_array_bit(array, bit) \ 3147#define get_byte_array_bit(array, bit) \
2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 3148 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2500 3149
2501const unsigned char csi_defaults[] = 3150const unsigned char csi_defaults[] =
2502 { 3151 {
2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 3152 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 3153 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2505 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, */
2506 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, [, \, ], ^, _, */
2507 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, */
2508 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, */
2509 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, */
2510 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, {, |, }, ~, */
2511 }; 3160 };
2512/* *INDENT-ON* */ 3161/* *INDENT-ON* */
2513 3162
2514void 3163void
2515rxvt_term::process_csi_seq () 3164rxvt_term::process_csi_seq ()
2516{ 3165{
2517 unsigned char ch, priv, i; 3166 unicode_t ch, priv, i;
2518 unsigned int nargs, p; 3167 unsigned int nargs, p;
2519 int n, ndef; 3168 int n, ndef;
2520 int arg[ESC_ARGS]; 3169 int arg[ESC_ARGS];
2521 3170
2522 for (nargs = ESC_ARGS; nargs > 0;) 3171 for (nargs = ESC_ARGS; nargs > 0;)
2523 arg[--nargs] = 0; 3172 arg[--nargs] = 0;
2524 3173
2525 priv = 0; 3174 priv = 0;
… …
2527 if (ch >= '<' && ch <= '?') 3176 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */ 3177 { /* '<' '=' '>' '?' */
2529 priv = ch; 3178 priv = ch;
2530 ch = cmd_getc (); 3179 ch = cmd_getc ();
2531 } 3180 }
3181
2532 /* read any numerical arguments */ 3182 /* read any numerical arguments */
2533 for (n = -1; ch < CSI_ICH; ) 3183 for (n = -1; ch < CSI_ICH; )
2534 { 3184 {
2535 if (isdigit(ch)) 3185 if (isdigit (ch))
2536 { 3186 {
2537 if (n < 0) 3187 if (n < 0)
2538 n = ch - '0'; 3188 n = ch - '0';
2539 else 3189 else
2540 n = n * 10 + ch - '0'; 3190 n = n * 10 + ch - '0';
… …
2543 { 3193 {
2544 if (nargs < ESC_ARGS) 3194 if (nargs < ESC_ARGS)
2545 arg[nargs++] = n; 3195 arg[nargs++] = n;
2546 n = -1; 3196 n = -1;
2547 } 3197 }
2548 else if (ch == '\b') 3198 else if (IS_CONTROL (ch))
2549 {
2550 scr_backspace ();
2551 }
2552 else if (ch == C0_ESC)
2553 {
2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch); 3199 process_nonprinting (ch);
2560 } 3200
2561 ch = cmd_getc (); 3201 ch = cmd_getc ();
2562 } 3202 }
2563 3203
2564 if (ch > CSI_7F) 3204 if (ch > CSI_7F)
2565 return; 3205 return;
2566 3206
2567 if (nargs < ESC_ARGS) 3207 if (nargs < ESC_ARGS)
2568 arg[nargs++] = n; 3208 arg[nargs++] = n;
2569 3209
2570 i = ch - CSI_ICH; 3210 i = ch - CSI_ICH;
2571 ndef = get_byte_array_bit(csi_defaults, i); 3211 ndef = get_byte_array_bit (csi_defaults, i);
2572 for (p = 0; p < nargs; p++) 3212 for (p = 0; p < nargs; p++)
2573 if (arg[p] == -1) 3213 if (arg[p] == -1)
2574 arg[p] = ndef; 3214 arg[p] = ndef;
2575 3215
2576#ifdef DEBUG_CMD 3216#ifdef DEBUG_CMD
2577 fprintf(stderr, "CSI "); 3217 fprintf (stderr, "CSI ");
2578 for (p = 0; p < nargs; p++) 3218 for (p = 0; p < nargs; p++)
2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 3219 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2580 fprintf(stderr, "%c\n", ch); 3220 fprintf (stderr, "%c\n", ch);
2581#endif 3221#endif
2582 3222
2583 /* 3223 /*
2584 * private mode handling 3224 * private mode handling
2585 */ 3225 */
… …
2587 { 3227 {
2588 switch (priv) 3228 switch (priv)
2589 { 3229 {
2590 case '>': 3230 case '>':
2591 if (ch == CSI_DA) /* secondary device attributes */ 3231 if (ch == CSI_DA) /* secondary device attributes */
2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 3232 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2593 break; 3233 break;
2594 case '?': 3234 case '?':
2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3235 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2596 process_terminal_mode (ch, priv, nargs, arg); 3236 process_terminal_mode (ch, priv, nargs, arg);
2597 break; 3237 break;
… …
2600 } 3240 }
2601 3241
2602 switch (ch) 3242 switch (ch)
2603 { 3243 {
2604 /* 3244 /*
2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 3245 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2606 */ 3246 */
2607#ifdef PRINTPIPE 3247#ifdef PRINTPIPE
2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 3248 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2609 switch (arg[0]) 3249 switch (arg[0])
2610 { 3250 {
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2708 break; 3348 break;
2709 3349
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 tt_write((const unsigned char *)VT100_ANS, 3351 tt_write ((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 3352 (unsigned int) (sizeof (VT100_ANS) - 1));
2713 break; 3353 break;
2714 3354
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 process_sgr_mode (nargs, arg); 3356 process_sgr_mode (nargs, arg);
2717 break; 3357 break;
2718 3358
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3359 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) 3360 switch (arg[0])
2721 { 3361 {
2722 case 5: /* DSR requested */ 3362 case 5: /* DSR requested */
2723 tt_printf("\033[0n"); 3363 tt_printf ("\033[0n");
2724 break; 3364 break;
2725 case 6: /* CPR requested */ 3365 case 6: /* CPR requested */
2726 scr_report_position (); 3366 scr_report_position ();
2727 break; 3367 break;
2728#if defined (ENABLE_DISPLAY_ANSWER)
2729 case 7: /* unofficial extension */ 3368 case 7: /* unofficial extension */
3369 if (options & Opt_insecure)
2730 tt_printf("%-.250s\n", rs[Rs_display_name]); 3370 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2731 break; 3371 break;
2732#endif
2733 case 8: /* unofficial extension */ 3372 case 8: /* unofficial extension */
2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2735 break; 3374 break;
2736 } 3375 }
2737 break; 3376 break;
2738 3377
2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3378 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2772 break; 3411 break;
2773 3412
2774 case CSI_RM: /* 8.3.107: RESET MODE */ 3413 case CSI_RM: /* 8.3.107: RESET MODE */
2775 if (arg[0] == 4) 3414 if (arg[0] == 4)
2776 scr_insert_mode (0); 3415 scr_insert_mode (0);
3416 else if (arg[0] == 20)
3417 priv_modes &= ~PrivMode_LFNL;
2777 break; 3418 break;
2778 3419
2779 case CSI_SM: /* 8.3.126: SET MODE */ 3420 case CSI_SM: /* 8.3.126: SET MODE */
2780 if (arg[0] == 4) 3421 if (arg[0] == 4)
2781 scr_insert_mode (1); 3422 scr_insert_mode (1);
3423 else if (arg[0] == 20)
3424 priv_modes |= PrivMode_LFNL;
2782 break; 3425 break;
2783 3426
2784 /* 3427 /*
2785 * PRIVATE USE beyond this point. All CSI_7? sequences here 3428 * PRIVATE USE beyond this point. All CSI_7? sequences here
2786 */ 3429 */
… …
2798 break; 3441 break;
2799 case CSI_75: 3442 case CSI_75:
2800 scr_cursor (RESTORE); 3443 scr_cursor (RESTORE);
2801 break; 3444 break;
2802 3445
2803#ifndef NO_FRILLS 3446#if ENABLE_FRILLS
2804 case CSI_74: 3447 case CSI_74:
2805 process_window_ops (arg, nargs); 3448 process_window_ops (arg, nargs);
2806 break; 3449 break;
2807#endif 3450#endif
2808 3451
2809 case CSI_78: /* DECREQTPARM */ 3452 case CSI_78: /* DECREQTPARM */
2810 if (arg[0] == 0 || arg[0] == 1) 3453 if (arg[0] == 0 || arg[0] == 1)
2811 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);
2812 /* FALLTHROUGH */ 3455 break;
2813 3456
2814 default: 3457 default:
2815 break; 3458 break;
2816 } 3459 }
2817} 3460}
2818/*}}} */ 3461/*}}} */
2819 3462
2820#ifndef NO_FRILLS 3463#if ENABLE_FRILLS
2821/* ARGSUSED */ 3464/* ARGSUSED */
2822void 3465void
2823rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3466rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2824{ 3467{
2825 int x, y; 3468 int x, y;
2826#if 0
2827 char *s;
2828#endif
2829 XWindowAttributes wattr; 3469 XWindowAttributes wattr;
2830 Window wdummy; 3470 Window wdummy;
3471 dDisp;
2831 3472
2832 if (nargs == 0) 3473 if (nargs == 0)
2833 return; 3474 return;
3475
2834 switch (args[0]) 3476 switch (args[0])
2835 { 3477 {
2836 /* 3478 /*
2837 * commands 3479 * commands
2838 */ 3480 */
2839 case 1: /* deiconify window */ 3481 case 1: /* deiconify window */
2840 XMapWindow(display->display, TermWin.parent[0]); 3482 XMapWindow (disp, TermWin.parent[0]);
2841 break; 3483 break;
2842 case 2: /* iconify window */ 3484 case 2: /* iconify window */
2843 XIconifyWindow(display->display, TermWin.parent[0], 3485 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2844 DefaultScreen(display->display));
2845 break; 3486 break;
2846 case 3: /* set position (pixels) */ 3487 case 3: /* set position (pixels) */
2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2848 break; 3489 break;
2849 case 4: /* set size (pixels) */ 3490 case 4: /* set size (pixels) */
2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2851 break; 3492 break;
2852 case 5: /* raise window */ 3493 case 5: /* raise window */
2853 XRaiseWindow(display->display, TermWin.parent[0]); 3494 XRaiseWindow (disp, TermWin.parent[0]);
2854 break; 3495 break;
2855 case 6: /* lower window */ 3496 case 6: /* lower window */
2856 XLowerWindow(display->display, TermWin.parent[0]); 3497 XLowerWindow (disp, TermWin.parent[0]);
2857 break; 3498 break;
2858 case 7: /* refresh window */ 3499 case 7: /* refresh window */
2859 scr_touch (true); 3500 scr_touch (true);
2860 break; 3501 break;
2861 case 8: /* set size (chars) */ 3502 case 8: /* set size (chars) */
2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2863 (unsigned int)(args[1] * TermWin.fheight)); 3504 (unsigned int) (args[1] * TermWin.fheight));
2864 break; 3505 break;
3506
3507 //case 9: NYI, TODO, restore maximized window or maximize window
2865 default: 3508 default:
2866 if (args[0] >= 24) /* set height (chars) */ 3509 if (args[0] >= 24) /* set height (chars) */
2867 set_widthheight ((unsigned int)TermWin.width, 3510 set_widthheight ((unsigned int)TermWin.width,
2868 (unsigned int)(args[1] * TermWin.fheight)); 3511 (unsigned int) (args[1] * TermWin.fheight));
2869 break; 3512 break;
3513
3514
2870 /* 3515 /*
2871 * reports - some output format copied from XTerm 3516 * reports - some output format copied from XTerm
2872 */ 3517 */
2873 case 11: /* report window state */ 3518 case 11: /* report window state */
2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2876 break; 3521 break;
2877 case 13: /* report window position */ 3522 case 13: /* report window position */
2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2880 -wattr.border_width, -wattr.border_width, 3525 -wattr.border_width, -wattr.border_width,
2881 &x, &y, &wdummy); 3526 &x, &y, &wdummy);
2882 tt_printf("\033[3;%d;%dt", x, y); 3527 tt_printf ("\033[3;%d;%dt", x, y);
2883 break; 3528 break;
2884 case 14: /* report window size (pixels) */ 3529 case 14: /* report window size (pixels) */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2887 break; 3532 break;
2888 case 18: /* report window size (chars) */ 3533 case 18: /* report text area size (chars) */
2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2890 break; 3535 break;
2891#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;
2892 case 20: /* report icon label */ 3539 case 20: /* report icon label */
3540 {
3541 char *s;
2893 XGetIconName(display->display, TermWin.parent[0], &s); 3542 XGetIconName (disp, TermWin.parent[0], &s);
2894 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 }
2895 break; 3546 break;
2896 case 21: /* report window title */ 3547 case 21: /* report window title */
3548 {
3549 char *s;
2897 XFetchName(display->display, TermWin.parent[0], &s); 3550 XFetchName (disp, TermWin.parent[0], &s);
2898 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 }
2899 break; 3554 break;
2900#endif
2901
2902 } 3555 }
2903} 3556}
2904#endif 3557#endif
2905 3558
2906/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2907/* 3560/*
2908 * get input up until STRING TERMINATOR (or BEL) 3561 * get input up until STRING TERMINATOR (or BEL)
2909 * ends_how is terminator used. returned input must be free()d 3562 * ends_how is terminator used. returned input must be free()'d
2910 */ 3563 */
2911unsigned char * 3564unsigned char *
2912rxvt_term::get_to_st (unsigned char *ends_how) 3565rxvt_term::get_to_st (unicode_t &ends_how)
2913{ 3566{
2914 int seen_esc = 0; /* seen escape? */ 3567 unicode_t ch;
3568 bool seen_esc = false;
2915 unsigned int n = 0; 3569 unsigned int n = 0;
2916 unsigned char *s; 3570 wchar_t string[STRING_MAX];
2917 unsigned char ch, string[STRING_MAX];
2918 3571
2919 for (; (ch = cmd_getc ());) 3572 while ((ch = cmd_getc ()) != NOCHAR)
2920 { 3573 {
2921 if (ch == C0_BEL 3574 if (seen_esc)
2922 || ch == CHAR_ST 3575 {
2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3576 if (ch == 0x5c) /* 7bit ST */
2924 break; 3577 break;
3578 else
3579 return NULL;
3580 }
2925 if (ch == C0_ESC) 3581 else if (ch == C0_ESC)
2926 { 3582 {
2927 seen_esc = 1; 3583 seen_esc = true;
2928 continue; 3584 continue;
2929 } 3585 }
2930 else if (ch == '\t') 3586 else if (ch == C0_BEL || ch == CHAR_ST)
2931 ch = ' '; /* translate '\t' to space */ 3587 break;
2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3588 else if (ch < 0x20)
2933 return NULL; /* other control character - exit */ 3589 return NULL; /* other control character - exit */
3590
3591 seen_esc = false;
3592
2934 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
2935 string[n++] = ch; 3600 string[n++] = ch;
2936 seen_esc = 0;
2937 } 3601 }
3602
2938 string[n++] = '\0'; 3603 string[n++] = '\0';
2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3604
2940 return NULL;
2941 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3605 ends_how = (ch == 0x5c ? C0_ESC : ch);
2942 STRNCPY(s, string, n); 3606
2943 return s; 3607 return (unsigned char *)rxvt_wcstombs (string);
2944} 3608}
2945 3609
2946/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
2947/* 3611/*
2948 * 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)'
2949 */ 3613 */
2950void 3614void
2951rxvt_term::process_dcs_seq () 3615rxvt_term::process_dcs_seq ()
2952{ 3616{
2953 unsigned char eh, *s; 3617 unsigned char *s;
3618 unicode_t eh;
3619
2954 /* 3620 /*
2955 * Not handled yet 3621 * Not handled yet
2956 */ 3622 */
2957 s = get_to_st (&eh); 3623 s = get_to_st (eh);
2958 if (s) 3624 if (s)
2959 free(s); 3625 free (s);
3626
2960 return; 3627 return;
2961} 3628}
2962 3629
2963/*----------------------------------------------------------------------*/ 3630/*----------------------------------------------------------------------*/
2964/* 3631/*
2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3632 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2966 */ 3633 */
2967void 3634void
2968rxvt_term::process_osc_seq () 3635rxvt_term::process_osc_seq ()
2969{ 3636{
2970 unsigned char ch, eh, *s; 3637 unicode_t ch, eh;
2971 int arg; 3638 int arg;
2972 3639
2973 ch = cmd_getc (); 3640 ch = cmd_getc ();
2974 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3641 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2975 arg = arg * 10 + (ch - '0'); 3642 arg = arg * 10 + (ch - '0');
2976 3643
2977 if (ch == ';') 3644 if (ch == ';')
2978 { 3645 {
2979 s = get_to_st (&eh); 3646 unsigned char *s = get_to_st (eh);
3647
2980 if (s) 3648 if (s)
2981 { 3649 {
2982 /*
2983 * rxvt_menubar_dispatch() violates the constness of the string,
2984 * so do it here
2985 */
2986 if (arg == XTerm_Menu)
2987#if 0 /* XXX: currently disabled due to security concerns */
2988 menubar_dispatch ((char *)s);
2989#else
2990 (void)0;
2991#endif
2992 else
2993 xterm_seq (arg, (char *)s, eh); 3650 process_xterm_seq (arg, (char *)s, eh);
2994 free(s); 3651 free (s);
2995 } 3652 }
3653 }
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])
2996 } 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);
2997} 3667}
3668
2998/* 3669/*
2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3000 * 0 = change iconName/title 3671 * 0 = change iconName/title
3001 * 1 = change iconName 3672 * 1 = change iconName
3002 * 2 = change title 3673 * 2 = change title
3003 * 4 = change color 3674 * 4 = change color
3675 * 10 = change fg color
3676 * 11 = change bg color
3004 * 12 = change text color 3677 * 12 = change text color
3005 * 13 = change mouse foreground color 3678 * 13 = change mouse foreground color
3006 * 17 = change highlight character colour 3679 * 17 = change highlight character colour
3007 * 18 = change bold character color 3680 * 18 = change bold character color
3008 * 19 = change underlined character color 3681 * 19 = change underlined character color
3009 * 46 = change logfile (not implemented) 3682 * 46 = change logfile (not implemented)
3010 * 50 = change font 3683 * 50 = change font
3011 * 3684 *
3012 * rxvt extensions: 3685 * rxvt extensions:
3013 * 10 = menu (may change in future)
3014 * 20 = bg pixmap 3686 * 20 = bg pixmap
3015 * 39 = change default fg color 3687 * 39 = change default fg color
3016 * 49 = change default bg color 3688 * 49 = change default bg color
3017 * 55 = dump scrollback buffer and all of screen 3689 * 55 = dump scrollback buffer and all of screen
3690 * 701 = change locale
3691 * 702 = find font
3692 * 703 = menu
3018 */ 3693 */
3019void 3694void
3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3695rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3021{ 3696{
3022 int changed = 0; 3697 int changed = 0;
3023 int color; 3698 int color;
3024 char *buf, *name; 3699 char *buf, *name;
3700 bool query = str[0] == '?' && !str[1];
3701 int saveop = op;
3702 dDisp;
3025 3703
3026 assert(str != NULL); 3704 assert (str != NULL);
3027 switch (op) 3705 switch (op)
3028 { 3706 {
3029 case XTerm_name: 3707 case XTerm_name:
3030 set_title (str); 3708 set_title (str);
3031 /* FALLTHROUGH */ 3709 /* FALLTHROUGH */
3032 case XTerm_iconName: 3710 case XTerm_iconName:
3033 set_iconName (str); 3711 set_icon_name (str);
3034 break; 3712 break;
3035 case XTerm_title: 3713 case XTerm_title:
3036 set_title (str); 3714 set_title (str);
3037 break; 3715 break;
3716 case XTerm_property:
3717 if (str[0] == '?')
3718 {
3719 Atom prop = display->atom (str + 1);
3720 Atom actual_type;
3721 int actual_format;
3722 unsigned long nitems;
3723 unsigned long bytes_after;
3724 unsigned char *value = 0;
3725 const char *str = "";
3726
3727 if (prop
3728 && XGetWindowProperty (disp, TermWin.parent[0],
3729 prop, 0, 1<<16, 0, AnyPropertyType,
3730 &actual_type, &actual_format,
3731 &nitems, &bytes_after, &value) == Success
3732 && actual_type != None
3733 && actual_format == 8)
3734 str = (const char *)(value);
3735
3736 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3737
3738 XFree (value);
3739 }
3740 else
3741 {
3742 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3743
3744 if (eq)
3745 {
3746 *eq = 0;
3747 set_utf8_property (display->atom (str), eq + 1);
3748 }
3749 else
3750 XDeleteProperty (disp, TermWin.parent[0],
3751 display->atom (str));
3752 }
3753 break;
3754
3038 case XTerm_Color: 3755 case XTerm_Color:
3039 for (buf = (char *)str; buf && *buf;) 3756 for (buf = (char *)str; buf && *buf;)
3040 { 3757 {
3041 if ((name = STRCHR(buf, ';')) == NULL) 3758 if ((name = strchr (buf, ';')) == NULL)
3042 break; 3759 break;
3760
3043 *name++ = '\0'; 3761 *name++ = '\0';
3044 color = atoi(buf); 3762 color = atoi (buf);
3763
3045 if (color < 0 || color >= TOTAL_COLORS) 3764 if (color < 0 || color >= TOTAL_COLORS)
3046 break; 3765 break;
3766
3047 if ((buf = STRCHR(name, ';')) != NULL) 3767 if ((buf = strchr (name, ';')) != NULL)
3048 *buf++ = '\0'; 3768 *buf++ = '\0';
3769
3770 if (name[0] == '?' && !name[1])
3771 {
3772 unsigned short r, g, b;
3773 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3774 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3775 }
3776 else
3049 set_window_color (color + minCOLOR, name); 3777 set_window_color (color + minCOLOR, name);
3050 } 3778 }
3779 break;
3780 case XTerm_Color00:
3781 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3782 break;
3783 case XTerm_Color01:
3784 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3051 break; 3785 break;
3052#ifndef NO_CURSORCOLOR 3786#ifndef NO_CURSORCOLOR
3053 case XTerm_Color_cursor: 3787 case XTerm_Color_cursor:
3054 set_window_color (Color_cursor, str); 3788 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3055 break; 3789 break;
3056#endif 3790#endif
3057 case XTerm_Color_pointer: 3791 case XTerm_Color_pointer_fg:
3058 set_window_color (Color_pointer, str); 3792 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3793 break;
3794 case XTerm_Color_pointer_bg:
3795 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3059 break; 3796 break;
3060#ifndef NO_BOLD_UNDERLINE_REVERSE 3797#ifndef NO_BOLD_UNDERLINE_REVERSE
3061 case XTerm_Color_BD: 3798 case XTerm_Color_BD:
3062 set_window_color (Color_BD, str); 3799 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800 break;
3801 case XTerm_Color_IT:
3802 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3063 break; 3803 break;
3064 case XTerm_Color_UL: 3804 case XTerm_Color_UL:
3065 set_window_color (Color_UL, str); 3805 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3066 break; 3806 break;
3067 case XTerm_Color_RV: 3807 case XTerm_Color_RV:
3068 set_window_color (Color_RV, str); 3808 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3069 break; 3809 break;
3070#endif 3810#endif
3071 3811#if TRANSPARENT && TINTING
3072 case XTerm_Menu: 3812 case XTerm_Color_tint:
3073 /* 3813 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3074 * rxvt_menubar_dispatch() violates the constness of the string, 3814 check_our_parents ();
3075 * so DON'T do it here 3815 if (am_transparent)
3076 */ 3816 want_full_refresh = want_refresh = 1;
3077 break; 3817 break;
3818#endif
3819
3078 case XTerm_Pixmap: 3820 case XTerm_Pixmap:
3079 if (*str != ';') 3821 if (*str != ';')
3080 { 3822 {
3081#if XPM_BACKGROUND 3823#if XPM_BACKGROUND
3082 scale_pixmap (""); /* reset to default scaling */ 3824 scale_pixmap (""); /* reset to default scaling */
3083 set_bgPixmap (str); /* change pixmap */ 3825 set_bgPixmap (str); /* change pixmap */
3084#endif 3826#endif
3085 scr_touch (true); 3827 scr_touch (true);
3086 } 3828 }
3087 while ((str = STRCHR(str, ';')) != NULL) 3829 while ((str = strchr (str, ';')) != NULL)
3088 { 3830 {
3089 str++; 3831 str++;
3090#if XPM_BACKGROUND 3832#if XPM_BACKGROUND
3091 changed += scale_pixmap (str); 3833 changed += scale_pixmap (str);
3092#endif 3834#endif
3093
3094 } 3835 }
3836
3095 if (changed) 3837 if (changed)
3096 { 3838 {
3097#ifdef XPM_BACKGROUND 3839#ifdef XPM_BACKGROUND
3098 resize_pixmap (); 3840 resize_pixmap ();
3099#endif 3841#endif
… …
3105 set_window_color (Color_fg, str); 3847 set_window_color (Color_fg, str);
3106 break; 3848 break;
3107 case XTerm_restoreBG: 3849 case XTerm_restoreBG:
3108 set_window_color (Color_bg, str); 3850 set_window_color (Color_bg, str);
3109 break; 3851 break;
3852
3110 case XTerm_logfile: 3853 case XTerm_logfile:
3854 // TODO, when secure mode?
3111 break; 3855 break;
3856
3112 case XTerm_font: 3857 case XTerm_font:
3113 change_font (0, str); 3858 op = URxvt_font;
3859 case URxvt_font:
3860#if ENABLE_STYLES
3861 case URxvt_boldFont:
3862 case URxvt_italicFont:
3863 case URxvt_boldItalicFont:
3864#endif
3865 if (query)
3866 tt_printf ("\33]%d;%-.250s%c", saveop,
3867 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3868 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3869 resp);
3870 else
3871 {
3872 const char *&res = rs[Rs_font + (op - URxvt_font)];
3873
3874 res = strdup (str);
3875 allocated.push_back ((void *)res);
3876 set_fonts ();
3877 }
3878 break;
3879
3880#if ENABLE_FRILLS
3881 case XTerm_locale:
3882 if (query)
3883 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3884 else
3885 {
3886 set_locale (str);
3887 pty.set_utf8_mode (enc_utf8);
3888 init_xlocale ();
3889 }
3890 break;
3891#endif
3892
3893#ifdef MENUBAR
3894 case XTerm_Menu:
3895 if (options & Opt_insecure)
3896 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3897 break;
3898#endif
3115#if 0 3899#if 0
3116 case XTerm_dumpscreen: /* no error notices */ 3900 case XTerm_dumpscreen: /* no error notices */
3117 { 3901 {
3118 int fd; 3902 int fd;
3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3903 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3120 { 3904 {
3121 scr_dump (fd); 3905 scr_dump (fd);
3122 close(fd); 3906 close (fd);
3123 } 3907 }
3124 } 3908 }
3125 break; 3909 break;
3126#endif 3910#endif
3127
3128 } 3911 }
3129} 3912}
3130/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
3131 3914
3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3915/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3140 * so no need for fancy checking 3923 * so no need for fancy checking
3141 */ 3924 */
3142int 3925int
3143rxvt_term::privcases (int mode, unsigned long bit) 3926rxvt_term::privcases (int mode, unsigned long bit)
3144{ 3927{
3145 int state; 3928 int state;
3146 3929
3147 if (mode == 's') 3930 if (mode == 's')
3148 { 3931 {
3149 SavedModes |= (PrivateModes & bit); 3932 SavedModes |= (priv_modes & bit);
3150 return -1; 3933 return -1;
3151 } 3934 }
3152 else 3935 else
3153 { 3936 {
3154 if (mode == 'r') 3937 if (mode == 'r')
3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3938 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3156 else 3939 else
3157 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3940 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3158 PrivMode(state, bit); 3941 PrivMode (state, bit);
3159 } 3942 }
3943
3160 return state; 3944 return state;
3161} 3945}
3162 3946
3163/* we're not using priv _yet_ */ 3947/* we're not using priv _yet_ */
3164void 3948void
3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3166{ 3950{
3167 unsigned int i, j; 3951 unsigned int i, j;
3168 int state; 3952 int state;
3953
3169 static const struct 3954 static const struct
3170 { 3955 {
3171 const int argval; 3956 const int argval;
3172 const unsigned long bit; 3957 const unsigned long bit;
3173 } 3958 }
3959
3174 argtopriv[] = { 3960 argtopriv[] = {
3175 { 1, PrivMode_aplCUR }, 3961 { 1, PrivMode_aplCUR },
3176 { 2, PrivMode_vt52 }, 3962 { 2, PrivMode_vt52 },
3177 { 3, PrivMode_132 }, 3963 { 3, PrivMode_132 },
3178 { 4, PrivMode_smoothScroll }, 3964 { 4, PrivMode_smoothScroll },
3179 { 5, PrivMode_rVideo }, 3965 { 5, PrivMode_rVideo },
3180 { 6, PrivMode_relOrigin }, 3966 { 6, PrivMode_relOrigin },
3181 { 7, PrivMode_Autowrap }, 3967 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode
3182 { 9, PrivMode_MouseX10 }, 3969 { 9, PrivMode_MouseX10 },
3183#ifdef menuBar_esc 3970#ifdef menuBar_esc
3184 { menuBar_esc, PrivMode_menuBar }, 3971 { menuBar_esc, PrivMode_menuBar },
3185#endif 3972#endif
3973 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor },
3186#ifdef scrollBar_esc 3975#ifdef scrollBar_esc
3187 { scrollBar_esc, PrivMode_scrollBar }, 3976 { scrollBar_esc, PrivMode_scrollBar },
3188#endif 3977#endif
3189 { 25, PrivMode_VisibleCursor },
3190 { 35, PrivMode_ShiftKeys }, 3978 { 35, PrivMode_ShiftKeys }, // rxvt extension
3191 { 40, PrivMode_132OK }, 3979 { 40, PrivMode_132OK },
3980 // 41 xterm more fixes NYI
3981 // 45 margin bell NYI
3982 // 46 start logging
3192 { 47, PrivMode_Screen }, 3983 { 47, PrivMode_Screen },
3193 { 66, PrivMode_aplKP }, 3984 { 66, PrivMode_aplKP },
3194#ifndef NO_BACKSPACE_KEY 3985#ifndef NO_BACKSPACE_KEY
3195 { 67, PrivMode_BackSpace }, 3986 { 67, PrivMode_BackSpace },
3196#endif 3987#endif
3197 { 1000, PrivMode_MouseX11 }, 3988 { 1000, PrivMode_MouseX11 },
3989 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3990 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3991 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3198 { 1010, PrivMode_TtyOutputInh }, 3992 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3199 { 1011, PrivMode_Keypress }, 3993 { 1011, PrivMode_Keypress }, // rxvt extension
3994 // 1035 enable modifiers for alt, numlock NYI
3995 // 1036 send ESC for meta keys NYI
3996 // 1037 send DEL for keypad delete NYI
3200 { 1047, PrivMode_Screen }, 3997 { 1047, PrivMode_Screen },
3998 // 1048 save and restore cursor
3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3999 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4000 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3202 }; 4001 };
3203 4002
3204 if (nargs == 0) 4003 if (nargs == 0)
3205 return; 4004 return;
3206 4005
… …
3213 for (i = 0; i < nargs; i++) 4012 for (i = 0; i < nargs; i++)
3214 { 4013 {
3215 state = -1; 4014 state = -1;
3216 4015
3217 /* basic handling */ 4016 /* basic handling */
3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 4017 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3219 if (argtopriv[j].argval == arg[i]) 4018 if (argtopriv[j].argval == arg[i])
3220 { 4019 {
3221 state = privcases (mode, argtopriv[j].bit); 4020 state = privcases (mode, argtopriv[j].bit);
3222 break; 4021 break;
3223 } 4022 }
3224 4023
3225 /* extra handling for values with state unkept */ 4024 /* extra handling for values with state unkept */
3226 if (state == -1)
3227 switch (arg[i]) 4025 switch (arg[i])
3228 { 4026 {
3229 case 1048: /* alternative cursor save */ 4027 case 1048: /* alternative cursor save */
4028 case 1049:
4029 if (options & Opt_secondaryScreen)
3230 if (mode == 0) 4030 if (mode == 0)
3231 scr_cursor (RESTORE); 4031 scr_cursor (RESTORE);
3232 else if (mode == 1) 4032 else if (mode == 1)
3233 scr_cursor (SAVE); 4033 scr_cursor (SAVE);
3234 /* FALLTHROUGH */
3235 default:
3236 continue; /* for(;i;) */
3237 }
3238
3239 /* extra handling for values with valid 0 or 1 state */
3240 switch (arg[i])
3241 {
3242 /* case 1: - application cursor keys */
3243 case 2: /* VT52 mode */
3244 /* oddball mode. should be set regardless of set/reset
3245 * parameter. Return from VT52 mode with an ESC < from
3246 * within VT52 mode
3247 */
3248 PrivMode(1, PrivMode_vt52);
3249 break; 4034 break;
4035 }
4036
4037 if (state >= 0)
4038 /* extra handling for values with valid 0 or 1 state */
4039 switch (arg[i])
4040 {
4041 /* case 1: - application cursor keys */
4042 case 2: /* VT52 mode */
4043 /* oddball mode. should be set regardless of set/reset
4044 * parameter. Return from VT52 mode with an ESC < from
4045 * within VT52 mode
4046 */
4047 PrivMode (1, PrivMode_vt52);
4048 break;
3250 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
3251 if (PrivateModes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 4051 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3253 (unsigned int)TermWin.height);
3254 break; 4052 break;
3255 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
3256 if (state) 4054 if (state)
3257 Options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
3258 else 4056 else
3259 Options |= Opt_jumpScroll; 4057 options |= Opt_jumpScroll;
3260 break; 4058 break;
3261 case 5: /* reverse video */ 4059 case 5: /* reverse video */
3262 scr_rvideo_mode (state); 4060 scr_rvideo_mode (state);
3263 break; 4061 break;
3264 case 6: /* relative/absolute origins */ 4062 case 6: /* relative/absolute origins */
3265 scr_relative_origin (state); 4063 scr_relative_origin (state);
3266 break; 4064 break;
3267 case 7: /* autowrap */ 4065 case 7: /* autowrap */
3268 scr_autowrap (state); 4066 scr_autowrap (state);
3269 break; 4067 break;
3270 /* case 8: - auto repeat, can't do on a per window basis */ 4068 /* case 8: - auto repeat, can't do on a per window basis */
3271 case 9: /* X10 mouse reporting */ 4069 case 9: /* X10 mouse reporting */
3272 if (state) /* orthogonal */ 4070 if (state) /* orthogonal */
3273 PrivateModes &= ~(PrivMode_MouseX11); 4071 priv_modes &= ~PrivMode_MouseX11;
3274 break; 4072 break;
3275#ifdef menuBar_esc 4073#ifdef menuBar_esc
3276 case menuBar_esc: 4074 case menuBar_esc:
3277#ifdef MENUBAR 4075#ifdef MENUBAR
3278 map_menuBar (state); 4076 map_menuBar (state);
3279#endif 4077#endif
3280 break; 4078 break;
3281#endif 4079#endif
3282#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
3283 case scrollBar_esc: 4081 case scrollBar_esc:
3284 if (scrollbar_mapping (state)) 4082 if (scrollbar_mapping (state))
3285 { 4083 {
3286 resize_all_windows (0, 0, 0); 4084 resize_all_windows (0, 0, 0);
3287 scr_touch (true); 4085 scr_touch (true);
3288 } 4086 }
3289 break; 4087 break;
3290#endif 4088#endif
3291 case 25: /* visible/invisible cursor */ 4089 case 25: /* visible/invisible cursor */
3292 scr_cursor_visible (state); 4090 scr_cursor_visible (state);
3293 break; 4091 break;
3294 /* case 35: - shift keys */ 4092 /* case 35: - shift keys */
3295 /* case 40: - 80 <--> 132 mode */ 4093 /* case 40: - 80 <--> 132 mode */
3296 case 47: /* secondary screen */ 4094 case 47: /* secondary screen */
3297 scr_change_screen (state); 4095 scr_change_screen (state);
3298 break; 4096 break;
3299 /* case 66: - application key pad */ 4097 /* case 66: - application key pad */
3300 /* case 67: - backspace key */ 4098 /* case 67: - backspace key */
3301 case 1000: /* X11 mouse reporting */ 4099 case 1000: /* X11 mouse reporting */
3302 if (state) /* orthogonal */ 4100 if (state) /* orthogonal */
3303 PrivateModes &= ~(PrivMode_MouseX10); 4101 priv_modes &= ~PrivMode_MouseX10;
3304 break; 4102 break;
3305#if 0 4103#if 0
3306 case 1001: 4104 case 1001:
3307 break; /* X11 mouse highlighting */ 4105 break; /* X11 mouse highlighting */
3308#endif 4106#endif
3309 case 1010: /* scroll to bottom on TTY output inhibit */ 4107 case 1010: /* scroll to bottom on TTY output inhibit */
3310 if (state) 4108 if (state)
3311 Options &= ~Opt_scrollTtyOutput; 4109 options &= ~Opt_scrollTtyOutput;
3312 else 4110 else
3313 Options |= Opt_scrollTtyOutput; 4111 options |= Opt_scrollTtyOutput;
3314 break; 4112 break;
3315 case 1011: /* scroll to bottom on key press */ 4113 case 1011: /* scroll to bottom on key press */
3316 if (state) 4114 if (state)
3317 Options |= Opt_scrollTtyKeypress; 4115 options |= Opt_scrollTtyKeypress;
3318 else 4116 else
3319 Options &= ~Opt_scrollTtyKeypress; 4117 options &= ~Opt_scrollTtyKeypress;
3320 break; 4118 break;
3321 case 1047: /* secondary screen w/ clearing */ 4119 case 1047: /* secondary screen w/ clearing last */
3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4120 if (options & Opt_secondaryScreen)
3323 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3324 scr_erase_screen (2); 4122 scr_erase_screen (2);
3325 scr_change_screen (state); 4123 scr_change_screen (state);
3326 /* FALLTHROUGH */
3327 default:
3328 break; 4124 break;
4125 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen)
4128 if (current_screen != PRIMARY)
4129 scr_erase_screen (2);
4130 break;
4131 default:
4132 break;
3329 } 4133 }
3330 } 4134 }
3331} 4135}
3332/*}}} */ 4136/*}}} */
3333 4137
3334/*{{{ process sgr sequences */ 4138/*{{{ process sgr sequences */
3335void 4139void
3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4140rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3337{ 4141{
3338 unsigned int i; 4142 unsigned int i;
3339 short rendset; 4143 short rendset;
3340 int rendstyle; 4144 int rendstyle;
3341 4145
3342 if (nargs == 0) 4146 if (nargs == 0)
3343 { 4147 {
3344 scr_rendition (0, ~RS_None); 4148 scr_rendition (0, ~RS_None);
3345 return; 4149 return;
3346 } 4150 }
4151
3347 for (i = 0; i < nargs; i++) 4152 for (i = 0; i < nargs; i++)
3348 { 4153 {
3349 rendset = -1; 4154 rendset = -1;
3350 switch (arg[i]) 4155 switch (arg[i])
3351 { 4156 {
… …
3353 rendset = 0, rendstyle = ~RS_None; 4158 rendset = 0, rendstyle = ~RS_None;
3354 break; 4159 break;
3355 case 1: 4160 case 1:
3356 rendset = 1, rendstyle = RS_Bold; 4161 rendset = 1, rendstyle = RS_Bold;
3357 break; 4162 break;
4163 //case 2: // low intensity
4164 case 3:
4165 rendset = 1, rendstyle = RS_Italic;
4166 break;
3358 case 4: 4167 case 4:
3359 rendset = 1, rendstyle = RS_Uline; 4168 rendset = 1, rendstyle = RS_Uline;
3360 break; 4169 break;
3361 case 5: 4170 case 5: // slowly blinking
4171 case 6: // rapidly blinking
3362 rendset = 1, rendstyle = RS_Blink; 4172 rendset = 1, rendstyle = RS_Blink;
3363 break; 4173 break;
4174 //case 6: // scoansi light background
3364 case 7: 4175 case 7:
3365 rendset = 1, rendstyle = RS_RVid; 4176 rendset = 1, rendstyle = RS_RVid;
3366 break; 4177 break;
3367 case 22: 4178 case 8:
4179 // invisible. NYI
4180 break;
4181 //case 9: // crossed out
4182 //case 10: // scoansi acs off, primary font
4183 //case 11: // scoansi acs on, first alt font
4184 //case 12: // scoansi acs on, |0x80, second alt font
4185 //...
4186 //case 19: // ninth alt font
4187 //case 20: // gothic
4188 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3368 rendset = 0, rendstyle = RS_Bold; 4189 rendset = 0, rendstyle = RS_Bold;
4190 break;
4191 case 22: // normal intensity
4192 rendset = 0, rendstyle = RS_Bold;
4193 break;
4194 case 23: // disable italic
4195 rendset = 0, rendstyle = RS_Italic;
3369 break; 4196 break;
3370 case 24: 4197 case 24:
3371 rendset = 0, rendstyle = RS_Uline; 4198 rendset = 0, rendstyle = RS_Uline;
3372 break; 4199 break;
3373 case 25: 4200 case 25:
3374 rendset = 0, rendstyle = RS_Blink; 4201 rendset = 0, rendstyle = RS_Blink;
3375 break; 4202 break;
4203 case 26: // variable spacing (iso 8613)
4204 rendset = 0, rendstyle = RS_Blink;
4205 break;
3376 case 27: 4206 case 27:
3377 rendset = 0, rendstyle = RS_RVid; 4207 rendset = 0, rendstyle = RS_RVid;
3378 break; 4208 break;
4209 //case 28: // visible. NYI
4210 //case 29: // not crossed-out
3379 } 4211 }
4212
3380 if (rendset != -1) 4213 if (rendset != -1)
3381 { 4214 {
3382 scr_rendition (rendset, rendstyle); 4215 scr_rendition (rendset, rendstyle);
3383 continue; /* for(;i;) */ 4216 continue; /* for (;i;) */
3384 } 4217 }
3385 4218
3386 switch (arg[i]) 4219 switch (arg[i])
3387 { 4220 {
3388 case 30: 4221 case 30:
… …
3391 case 33: 4224 case 33:
3392 case 34: 4225 case 34:
3393 case 35: 4226 case 35:
3394 case 36: 4227 case 36:
3395 case 37: 4228 case 37:
3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 4229 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3397 Color_fg);
3398 break; 4230 break;
3399#ifdef TTY_256COLOR 4231 case 38: // set fg color, ISO 8613-6
3400 case 38:
3401 if (nargs > i + 2 && arg[i + 1] == 5) 4232 if (nargs > i + 2 && arg[i + 1] == 5)
3402 { 4233 {
3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4234 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3404 Color_fg);
3405 i += 2; 4235 i += 2;
3406 } 4236 }
3407 break; 4237 break;
3408#endif
3409 case 39: /* default fg */ 4238 case 39: /* default fg */
3410 scr_color (Color_fg, Color_fg); 4239 scr_color (Color_fg, Color_fg);
3411 break; 4240 break;
3412 4241
3413 case 40: 4242 case 40:
… …
3416 case 43: 4245 case 43:
3417 case 44: 4246 case 44:
3418 case 45: 4247 case 45:
3419 case 46: 4248 case 46:
3420 case 47: 4249 case 47:
3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 4250 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3422 Color_bg);
3423 break; 4251 break;
3424#ifdef TTY_256COLOR 4252 case 48: // set bg color, ISO 8613-6
3425 case 48:
3426 if (nargs > i + 2 && arg[i + 1] == 5) 4253 if (nargs > i + 2 && arg[i + 1] == 5)
3427 { 4254 {
3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4255 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3429 Color_bg);
3430 i += 2; 4256 i += 2;
3431 } 4257 }
3432 break; 4258 break;
3433#endif
3434 case 49: /* default bg */ 4259 case 49: /* default bg */
3435 scr_color (Color_bg, Color_bg); 4260 scr_color (Color_bg, Color_bg);
3436 break; 4261 break;
4262
4263 //case 50: // not variable spacing
3437 4264
3438#ifndef NO_BRIGHTCOLOR 4265#ifndef NO_BRIGHTCOLOR
3439 case 90: 4266 case 90:
3440 case 91: /* set bright fg color */ 4267 case 91: /* set bright fg color */
3441 case 92: 4268 case 92:
3442 case 93: 4269 case 93:
3443 case 94: 4270 case 94:
3444 case 95: 4271 case 95:
3445 case 96: 4272 case 96:
3446 case 97: 4273 case 97:
3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3448 Color_fg);
3449 break; 4275 break;
3450 case 100: 4276 case 100:
3451 case 101: /* set bright bg color */ 4277 case 101: /* set bright bg color */
3452 case 102: 4278 case 102:
3453 case 103: 4279 case 103:
3454 case 104: 4280 case 104:
3455 case 105: 4281 case 105:
3456 case 106: 4282 case 106:
3457 case 107: 4283 case 107:
3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3459 Color_bg);
3460 break; 4285 break;
3461#endif 4286#endif
3462 4287
3463 } 4288 }
3464 } 4289 }
3465} 4290}
3466/*}}} */ 4291/*}}} */
3467 4292
3468/*{{{ process Rob Nation's own graphics mode sequences */ 4293/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3469void 4294void
3470rxvt_term::process_graphics () 4295rxvt_term::process_graphics ()
3471{ 4296{
3472 unsigned char ch, cmd = cmd_getc (); 4297 unicode_t ch, cmd = cmd_getc ();
3473 4298
3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q') 4299 if (cmd == 'Q')
3476 { /* query graphics */ 4300 { /* query graphics */
3477 tt_printf("\033G0\n"); /* no graphics */ 4301 tt_printf ("\033G0\012"); /* no graphics */
3478 return; 4302 return;
3479 } 4303 }
3480 /* swallow other graphics sequences until terminating ':' */ 4304 /* swallow other graphics sequences until terminating ':' */
3481 do 4305 do
3482 ch = cmd_getc (); 4306 ch = cmd_getc ();
3483 while (ch != ':'); 4307 while (ch != ':');
3484#else
3485 unsigned int nargs;
3486 int args[NGRX_PTS];
3487 unsigned char *text = NULL;
3488
3489 if (cmd == 'Q')
3490 { /* query graphics */
3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3492 return;
3493 }
3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3496 int neg;
3497
3498 ch = cmd_getc ();
3499 neg = (ch == '-');
3500 if (neg || ch == '+')
3501 ch = cmd_getc ();
3502
3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3505 if (neg)
3506 args[nargs] = -args[nargs];
3507
3508 nargs++;
3509 args[nargs] = 0;
3510 if (ch != ';')
3511 break;
3512 }
3513
3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3516 int i, len = args[4];
3517
3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3519
3520 if (text != NULL)
3521 {
3522 for (i = 0; i < len; i++)
3523 text[i] = cmd_getc ();
3524 text[len] = '\0';
3525 }
3526 }
3527 Gr_do_graphics (cmd, nargs, args, text);
3528#endif
3529} 4308}
3530/*}}} */ 4309/*}}} */
3531 4310
3532/* ------------------------------------------------------------------------- */ 4311/* ------------------------------------------------------------------------- */
3533 4312
3534/* 4313/*
3535 * Send printf() formatted output to the command. 4314 * Send printf () formatted output to the command.
3536 * Only use for small amounts of data. 4315 * Only use for small amounts of data.
3537 */ 4316 */
3538void 4317void
3539rxvt_term::tt_printf (const char *fmt,...) 4318rxvt_term::tt_printf (const char *fmt,...)
3540{ 4319{
… …
3542 unsigned char buf[256]; 4321 unsigned char buf[256];
3543 4322
3544 va_start (arg_ptr, fmt); 4323 va_start (arg_ptr, fmt);
3545 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3546 va_end (arg_ptr); 4325 va_end (arg_ptr);
3547 tt_write (buf, STRLEN (buf)); 4326 tt_write (buf, strlen (buf));
3548} 4327}
3549 4328
3550/* ---------------------------------------------------------------------- */ 4329/* ---------------------------------------------------------------------- */
3551/* Write data to the pty as typed by the user, pasted with the mouse, 4330/* Write data to the pty as typed by the user, pasted with the mouse,
3552 * or generated by us in response to a query ESC sequence. 4331 * or generated by us in response to a query ESC sequence.
3553 */ 4332 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334
3554void 4335void
3555rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4336rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3556{ 4337{
3557 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4338 if (v_buflen == 0)
4339 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3558 4341
3559 if (len) 4342 if ((unsigned int)written == len)
4343 return;
4344
4345 data += written;
4346 len -= written;
3560 { 4347 }
4348
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4350
4351 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len;
4353
4354 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355}
4356
4357void rxvt_term::pty_write ()
4358{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360
4361 if (written > 0)
4362 {
4363 v_buflen -= written;
4364
3561 if (v_buflen == 0) 4365 if (v_buflen == 0)
3562 { 4366 {
3563 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3564
3565 if ((unsigned int)written == len)
3566 return;
3567
3568 data += written;
3569 len -= written;
3570 }
3571
3572
3573 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3574
3575 memcpy (v_buffer + v_buflen, data, len);
3576 v_buflen += len;
3577 }
3578
3579 for (;;)
3580 {
3581 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3582
3583 if (written > 0)
3584 {
3585 v_buflen -= written;
3586
3587 if (v_buflen == 0)
3588 {
3589 free (v_buffer); 4367 free (v_buffer);
3590 v_buffer = 0; 4368 v_buffer = 0;
3591 v_buflen = 0; 4369 v_buflen = 0;
3592 4370
3593 pty_ev.set (EVENT_READ); 4371 pty_ev.set (EVENT_READ);
3594 return;
3595 }
3596
3597 memmove (v_buffer, v_buffer + written, v_buflen);
3598 }
3599 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3600 // original code just ignores this...
3601 destroy ();
3602 else
3603 {
3604 pty_ev.set (EVENT_READ | EVENT_WRITE);
3605 return; 4372 return;
3606 } 4373 }
4374
4375 memmove (v_buffer, v_buffer + written, v_buflen);
3607 } 4376 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this...
4379 destroy ();
3608} 4380}
3609 4381
3610/*----------------------- end-of-file (C source) -----------------------*/ 4382/*----------------------- end-of-file (C source) -----------------------*/
3611 4383

Diff Legend

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