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

Diff Legend

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