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

Diff Legend

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