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

Diff Legend

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