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

Diff Legend

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