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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

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

Diff Legend

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