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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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