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.116 by root, Wed Aug 4 03:29:28 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 ();
680
681 flush_ev.stop ();
759} 682}
760 683
761void 684void
762rxvt_term::check_cb (check_watcher &w) 685rxvt_term::check_cb (check_watcher &w)
763{ 686{
764 SET_R (this); 687 SET_R (this);
765 SET_LOCALE (locale); 688 SET_LOCALE (locale);
766 689
690 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694}
695
696void
697rxvt_term::flush_cb (time_watcher &w)
698{
699 SET_R (this);
700 SET_LOCALE (locale);
701
702 refresh_limit = 1;
703 refresh_count = 0;
767 flush (); 704 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} 705}
813 706
814#ifdef CURSOR_BLINK 707#ifdef CURSOR_BLINK
815void 708void
816rxvt_term::cursor_blink_cb (time_watcher &w) 709rxvt_term::cursor_blink_cb (time_watcher &w)
… …
833 w.start (w.at + TEXT_BLINK_INTERVAL); 726 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 727 }
835} 728}
836#endif 729#endif
837 730
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
838void 732void
839rxvt_term::x_cb (io_watcher &w, short revents) 733rxvt_term::cont_scroll_cb (time_watcher &w)
840{ 734{
841 SET_R (this); 735 if ((scrollbar_isUp() || scrollbar_isDn()) &&
842 SET_LOCALE (locale); 736 scr_page (scrollbar_isUp() ? UP : DN, 1))
843 737 {
844 process_x_events (); 738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 }
845} 742}
743#endif
744
745#ifdef SELECTION_SCROLLING
746void
747rxvt_term::sel_scroll_cb (time_watcher &w)
748{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 }
756}
757#endif
758
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void
761rxvt_term::slip_wheel_cb (time_watcher &w)
762{
763 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 }
771}
772#endif
846 773
847bool 774bool
848rxvt_term::pty_fill () 775rxvt_term::pty_fill ()
849{ 776{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 777 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778
779 if (CBUFSIZ == n)
780 {
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
782 n = 0;
783 }
851 784
852 memmove (cmdbuf_base, cmdbuf_ptr, n); 785 memmove (cmdbuf_base, cmdbuf_ptr, n);
853 cmdbuf_ptr = cmdbuf_base; 786 cmdbuf_ptr = cmdbuf_base;
854 cmdbuf_endp = cmdbuf_ptr + n; 787 cmdbuf_endp = cmdbuf_ptr + n;
855 788
856 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
857 790
858 if (n > 0) 791 if (n > 0)
859 { 792 {
860 cmdbuf_endp += n; 793 cmdbuf_endp += n;
861 return true; 794 return true;
862 } 795 }
863 else if (n < 0 && errno != EAGAIN) 796 else if (n < 0 && errno != EAGAIN)
864 destroy (); 797 destroy ();
865 798
866 return false; 799 return false;
867} 800}
868 801
869void 802void
870rxvt_term::pty_cb (io_watcher &w, short revents) 803rxvt_term::pty_cb (io_watcher &w, short revents)
… …
873 SET_LOCALE (locale); 806 SET_LOCALE (locale);
874 807
875 if (revents & EVENT_WRITE) 808 if (revents & EVENT_WRITE)
876 tt_write (0, 0); 809 tt_write (0, 0);
877 else if (revents & EVENT_READ) 810 else if (revents & EVENT_READ)
878 {
879 bool flag = true;
880
881 // loop, but don't allow a single term to monopolize us 811 // 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 ()) 812 while (pty_fill ())
884 { 813 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; 814 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} 815}
985 816
986// read the next character, currently handles UTF-8 817void
987// will probably handle all sorts of other stuff in the future 818rxvt_term::pointer_unblank ()
988uint32_t
989rxvt_term::next_char ()
990{ 819{
991 while (cmdbuf_ptr < cmdbuf_endp) 820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
992 { 821 recolour_cursor ();
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++;
995 822
996 wchar_t wc; 823#ifdef POINTER_BLANK
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 824 hidden_pointer = 0;
998 825
999 if (len == (size_t)-2) 826 if (Options & Opt_pointerBlank)
1000 return NOCHAR; 827 pointer_ev.start (NOW + pointerBlankDelay);
1001 828#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} 829}
1034 830
1035#ifdef POINTER_BLANK 831#ifdef POINTER_BLANK
1036void 832void
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 () 833rxvt_term::pointer_blank ()
1050{ 834{
1051 if (!(Options & Opt_pointerBlank)) 835 if (! (Options & Opt_pointerBlank))
1052 return; 836 return;
1053 837
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 838 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 839 XFlush (display->display);
1056 840
1057 hidden_pointer = 1; 841 hidden_pointer = 1;
1058} 842}
1059 843
1060void 844void
… …
1066 pointer_blank (); 850 pointer_blank ();
1067} 851}
1068#endif 852#endif
1069 853
1070void 854void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 855rxvt_term::mouse_report (XButtonEvent &ev)
1072{ 856{
1073 int button_number, key_state = 0; 857 int button_number, key_state = 0;
1074 int x, y; 858 int x, y;
1075 859
1076 x = ev->x; 860 x = ev.x;
1077 y = ev->y; 861 y = ev.y;
1078 pixel_position (&x, &y); 862 pixel_position (&x, &y);
1079 863
1080 if (MEvent.button == AnyButton) 864 if (MEvent.button == AnyButton)
1081 { 865 {
1082 button_number = 3; 866 button_number = 3;
… …
1116#endif 900#endif
1117 901
1118 } 902 }
1119 903
1120#ifdef DEBUG_MOUSEREPORT 904#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 905 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 906 if (key_state & 16)
1123 fputc('C', stderr); 907 fputc ('C', stderr);
1124 if (key_state & 4) 908 if (key_state & 4)
1125 fputc('S', stderr); 909 fputc ('S', stderr);
1126 if (key_state & 8) 910 if (key_state & 8)
1127 fputc('A', stderr); 911 fputc ('A', stderr);
1128 if (key_state & 32) 912 if (key_state & 32)
1129 fputc('2', stderr); 913 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 914 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 915 button_number,
1132 x + 1, 916 x + 1,
1133 y + 1); 917 y + 1);
1134#else 918#else
1135 tt_printf("\033[M%c%c%c", 919 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 920 (32 + button_number + key_state),
1137 (32 + x + 1), 921 (32 + x + 1),
1138 (32 + y + 1)); 922 (32 + y + 1));
1139#endif 923#endif
1140} 924}
1141 925
1142#ifdef USING_W11LIB 926#ifdef USING_W11LIB
1143void 927void
1144rxvt_W11_process_x_event(XEvent *ev) 928rxvt_W11_process_x_event (XEvent *ev)
1145{ 929{
1146 rxvt_t *r = rxvt_get_r(); 930 rxvt_t *r = rxvt_get_r ();
1147 931
1148 process_x_event (ev); 932 x_cb (*ev);
1149} 933}
1150#endif 934#endif
1151 935
1152/*{{{ process an X event */ 936/*{{{ process an X event */
1153void 937void
1154rxvt_term::process_x_event (XEvent *ev) 938rxvt_term::x_cb (XEvent &ev)
1155{ 939{
940 SET_R (this);
941 SET_LOCALE (locale);
942
943#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 }
954#endif
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
1156 Window unused_root, unused_child; 975 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 976 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 977 unsigned int unused_mask;
1159 978
1160#ifdef DEBUG_X 979#ifdef DEBUG_X
… …
1199#endif 1018#endif
1200 1019
1201#ifdef DEBUG_X 1020#ifdef DEBUG_X
1202 struct timeval tp; 1021 struct timeval tp;
1203 struct tm *ltt; 1022 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1023 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1024 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)); 1025 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 1026#endif
1208 1027
1209 switch (ev->type) 1028 switch (ev.type)
1210 { 1029 {
1211 case KeyPress: 1030 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1031 lookup_key (ev.xkey);
1213 break; 1032 break;
1214 1033
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1035 case KeyRelease:
1217 { 1036 {
1218 if (!(ev->xkey.state & ControlMask)) 1037 if (!(ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1038 slip_wheel_ev.stop ();
1220 else 1039 else
1221 { 1040 {
1222 KeySym ks; 1041 KeySym ks;
1223 1042
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1044 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1045 mouse_slip_wheel_speed = 0;
1227 } 1046 }
1228 break; 1047 break;
1229 } 1048 }
1230#endif 1049#endif
1231 1050
1232 case ButtonPress: 1051 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1052 button_press (ev.xbutton);
1234 break; 1053 break;
1235 1054
1236 case ButtonRelease: 1055 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1056 button_release (ev.xbutton);
1238 break; 1057 break;
1239 1058
1240 case ClientMessage: 1059 case ClientMessage:
1241 if (ev->xclient.format == 32 1060 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1062 destroy ();
1244#ifdef OFFIX_DND 1063#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1064 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1066 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1067 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1068 || ev.xclient.data.l[0] == DndLink))
1250 { 1069 {
1251 /* Get Dnd data */ 1070 /* Get Dnd data */
1252 Atom ActualType; 1071 Atom ActualType;
1253 int ActualFormat; 1072 int ActualFormat;
1254 unsigned char *data; 1073 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1074 unsigned long Size, RemainingBytes;
1256 1075
1257 XGetWindowProperty(Xdisplay, Xroot, 1076 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1077 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1078 0L, 1000000L,
1260 False, AnyPropertyType, 1079 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1080 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1081 &Size, &RemainingBytes,
1263 &data); 1082 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1083 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1084 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1085 8, PropModeReplace,
1267 data, STRLEN(data)); 1086 data, STRLEN (data));
1087 XFree (data);
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1088 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1090 }
1271#endif /* OFFIX_DND */ 1091#endif /* OFFIX_DND */
1272 break; 1092 break;
1273 1093
1274 case MappingNotify: 1094 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1095 XRefreshKeyboardMapping (&ev.xmapping);
1276 break; 1096 break;
1277 1097
1278 /* 1098 /*
1279 * XXX: this is not the _current_ arrangement 1099 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1100 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1104 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1105 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1106 * which ought to make things real slow!
1287 */ 1107 */
1288 case VisibilityNotify: 1108 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1109 switch (ev.xvisibility.state)
1290 { 1110 {
1291 case VisibilityUnobscured: 1111 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1112 refresh_type = FAST_REFRESH;
1293 break; 1113 break;
1294 case VisibilityPartiallyObscured: 1114 case VisibilityPartiallyObscured:
… …
1305 { 1125 {
1306 TermWin.focus = 1; 1126 TermWin.focus = 1;
1307 want_refresh = 1; 1127 want_refresh = 1;
1308#ifdef USE_XIM 1128#ifdef USE_XIM
1309 if (Input_Context != NULL) 1129 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1130 XSetICFocus (Input_Context);
1311#endif 1131#endif
1312#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1133 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 {
1139 PixColors = PixColorsFocused;
1140 set_colorfgbg ();
1141 scr_clear ();
1142 scr_touch (true);
1143 }
1315#endif 1144#endif
1316 1145
1317 } 1146 }
1318 break; 1147 break;
1319 1148
… …
1322 { 1151 {
1323 TermWin.focus = 0; 1152 TermWin.focus = 0;
1324 want_refresh = 1; 1153 want_refresh = 1;
1325#ifdef USE_XIM 1154#ifdef USE_XIM
1326 if (Input_Context != NULL) 1155 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1156 XUnsetICFocus (Input_Context);
1328#endif 1157#endif
1329#ifdef CURSOR_BLINK 1158#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1159 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1160 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1161 hidden_cursor = 0;
1333#endif 1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1334 1172
1335 } 1173 }
1336 break; 1174 break;
1337 1175
1338 case ConfigureNotify: 1176 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1177 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1178 {
1341 int height, width; 1179 int height, width;
1342 1180
1343 do 1181 do
1344 { /* Wrap lots of configures into one */ 1182 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1183 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1184 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1186 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1188
1351 if (szHint.width != width || szHint.height != height) 1189 if (szHint.width != width || szHint.height != height)
1352 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1); 1190 resize_all_windows (width, height, 1);
1355 } 1191
1356#ifdef DEBUG_SIZE
1357 else
1358 {
1359 D_SIZE((stderr, "Size: Not resizing"));
1360 }
1361#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1193 if (Options & Opt_transparent)
1364 { 1194 {
1365 check_our_parents (); 1195 check_our_parents ();
1366 if (am_transparent) 1196 if (am_transparent)
1367 want_full_refresh = 1; 1197 want_full_refresh = 1;
1368 } 1198 }
1369#endif 1199#endif
1370
1371 } 1200 }
1372 break; 1201 break;
1373 1202
1374 case SelectionClear: 1203 case SelectionClear:
1375 selection_clear (); 1204 selection_clear ();
1376 break; 1205 break;
1377 1206
1378 case SelectionNotify: 1207 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1208 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1209 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1210 ev.xselection.property, True);
1382 break; 1211 break;
1383 1212
1384 case SelectionRequest: 1213 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1214 selection_send (ev.xselectionrequest);
1386 break; 1215 break;
1387 1216
1388 case UnmapNotify: 1217 case UnmapNotify:
1389 TermWin.mapped = 0; 1218 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1219#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1226#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1228#endif
1400 break; 1229 break;
1401 1230
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 1231#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: 1232 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1233 rootwin_cb (ev);
1423 { 1234 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1235#endif /* TRANSPARENT */
1428 break;
1429 1236
1430 case GraphicsExpose: 1237 case GraphicsExpose:
1431 case Expose: 1238 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1239 if (ev.xany.window == TermWin.vt)
1433 { 1240 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1241 do
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1242 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1243 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1438 // don't understand this, so commented it out 1245
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1249 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1250 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1251
1442 // ev->xexpose.width, TermWin.height, False); 1252 scr_refresh (refresh_type);
1443#endif
1444 want_refresh = 1;
1445 } 1253 }
1446 else 1254 else
1447 { 1255 {
1448 XEvent unused_xevent; 1256 XEvent unused_event;
1449 1257
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1451 Expose, 1259 ;
1452 &unused_xevent)) ; 1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1261 ;
1454 GraphicsExpose, 1262
1455 &unused_xevent)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1263 if (isScrollbarWindow (ev.xany.window))
1457 { 1264 {
1458 scrollBar.setIdle(); 1265 scrollBar.setIdle ();
1459 scrollbar_show (0); 1266 scrollbar_show (0);
1460 } 1267 }
1461#ifdef MENUBAR 1268#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1270 menubar_expose ();
1464#endif 1271#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468 1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1276#endif
1469 } 1277 }
1470 break; 1278 break;
1471 1279
1472 case MotionNotify: 1280 case MotionNotify:
1473#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1282 if (hidden_pointer)
1475 pointer_unblank (); 1283 pointer_unblank ();
1476#endif 1284#endif
1477#if MENUBAR 1285#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1286 if (isMenuBarWindow (ev.xany.window))
1479 { 1287 {
1480 menubar_control (&(ev->xbutton)); 1288 menubar_control (ev.xbutton);
1481 break; 1289 break;
1482 } 1290 }
1483#endif 1291#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1293 break;
1486 1294
1487 if (ev->xany.window == TermWin.vt) 1295 if (ev.xany.window == TermWin.vt)
1488 { 1296 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1298 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1300 ;
1301
1493 XQueryPointer(Xdisplay, TermWin.vt, 1302 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1303 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1304 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1305 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1306 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1307#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1308 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1310 {
1502#endif 1311#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1313 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1314#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1315 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1317 {
1509 int dist; 1318 int dist;
1510
1511 pending_scroll_selection=1;
1512 1319
1513 /* don't clobber the current delay if we are 1320 /* don't clobber the current delay if we are
1514 * already in the middle of scrolling. 1321 * already in the middle of scrolling.
1515 */ 1322 */
1516 if (scroll_selection_delay<=0) 1323 if (!sel_scroll_ev.active)
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1518 1325
1519 /* save the event params so we can highlight 1326 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1327 * the selection in the pending-scroll loop
1521 */ 1328 */
1522 selection_save_x=ev->xbutton.x; 1329 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1330 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1331 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1332 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1333
1527 /* calc number of lines to scroll */ 1334 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1335 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1336 {
1530 scroll_selection_dir = UP; 1337 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1338 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1339 }
1533 else 1340 else
1534 { 1341 {
1535 scroll_selection_dir = DN; 1342 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1343 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1344 (TermWin.int_bwidth + TermWin.height);
1538 } 1345 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1346 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1347 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1348 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1349 SELECTION_SCROLL_MAX_LINES);
1543 } 1350 }
1544 else 1351 else
1545 { 1352 {
1546 /* we are within the text window, so we 1353 /* we are within the text window, so we
1547 * shouldn't be scrolling 1354 * shouldn't be scrolling
1548 */ 1355 */
1549 pending_scroll_selection = 0; 1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop();
1550 } 1358 }
1551#endif 1359#endif
1552#ifdef MOUSE_THRESHOLD 1360#ifdef MOUSE_THRESHOLD
1553 1361
1554 } 1362 }
1555#endif 1363#endif
1556 1364
1557 } 1365 }
1558 } 1366 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1368 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1370 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1371 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1372 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1373 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1374 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1375 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1377 scrollbar_size ());
1570 scr_refresh (refresh_type); 1378 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1379 refresh_limit = 0;
1572 scrollbar_show (1); 1380 scrollbar_show (1);
1573 } 1381 }
1574 break; 1382 break;
1575 } 1383 }
1576} 1384}
1577 1385
1578void 1386void
1387rxvt_term::rootwin_cb (XEvent &ev)
1388{
1389 SET_R (this);
1390 SET_LOCALE (locale);
1391
1392 switch (ev.type)
1393 {
1394 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /*
1405 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on.
1407 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return;
1413 }
1414
1415 /* FALLTHROUGH */
1416 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1;
1419 break;
1420#endif
1421 }
1422}
1423
1424void
1579rxvt_term::button_press (XButtonEvent *ev) 1425rxvt_term::button_press (XButtonEvent &ev)
1580{ 1426{
1581 int reportmode = 0, clickintime; 1427 int reportmode = 0, clickintime;
1582 1428
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1430 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1431 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1432 /*
1587 * VT window processing of button press 1433 * VT window processing of button press
1588 */ 1434 */
1589 if (ev->window == TermWin.vt) 1435 if (ev.window == TermWin.vt)
1590 { 1436 {
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; 1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1438 if (reportmode)
1439 {
1440 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime)
1600 { 1445 {
1601 /* mouse report from vt window */ 1446 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1447 MEvent.clicks++;
1603 MEvent.state = ev->state; 1448 if (MEvent.clicks > 1)
1604#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1449 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1450 /* only report double clicks */
1612 MEvent.clicks = 2; 1451 MEvent.clicks = 2;
1613 mouse_report (ev); 1452 mouse_report (ev);
1614 1453
1615 /* don't report the release */ 1454 /* don't report the release */
1616 MEvent.clicks = 0; 1455 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1456 MEvent.button = AnyButton;
1618 }
1619 } 1457 }
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 } 1458 }
1633 else 1459 else
1634 { 1460 {
1635 if (ev->button != MEvent.button) 1461 /* different button, or time expired */
1636 MEvent.clicks = 0; 1462 MEvent.clicks = 1;
1463 MEvent.button = ev.button;
1464 mouse_report (ev);
1465 }
1466#else
1467 MEvent.button = ev.button;
1468 mouse_report (ev);
1469#endif /* MOUSE_REPORT_DOUBLECLICK */
1470
1471 }
1472 else
1473 {
1474 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0;
1637 switch (ev->button) 1476 switch (ev.button)
1638 { 1477 {
1639 case Button1: 1478 case Button1:
1640 /* allow shift+left click to extend selection */ 1479 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1481 {
1643 if (MEvent.button == Button1 && clickintime) 1482 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1483 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1484 else
1649 { 1485 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 } 1486 }
1657 1487 else
1658 MEvent.button = Button1;
1659 break; 1488 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1489 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1490 MEvent.clicks++;
1664 else 1491 else
1492 MEvent.clicks = 1;
1493
1494 selection_click (MEvent.clicks, ev.x, ev.y);
1495 }
1496
1497 MEvent.button = Button1;
1498 break;
1499
1500 case Button3:
1501 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y);
1503 else
1665 selection_extend (ev->x, ev->y, 1); 1504 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1505 MEvent.button = Button3;
1667 break; 1506 break;
1668 }
1669 } 1507 }
1508 }
1670 MEvent.time = ev->time; 1509 MEvent.time = ev.time;
1671 return; 1510 return;
1672 }
1673 } 1511 }
1674 1512
1675 /* 1513 /*
1676 * Scrollbar window processing of button press 1514 * Scrollbar window processing of button press
1677 */ 1515 */
1678 if (isScrollbarWindow(ev->window)) 1516 if (isScrollbarWindow (ev.window))
1679 { 1517 {
1680 scrollBar.setIdle (); 1518 scrollBar.setIdle ();
1681 /* 1519 /*
1682 * Rxvt-style scrollbar: 1520 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1521 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1533 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1534 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1535 * click on scrollbar - send pageup/down
1698 */ 1536 */
1699 if ((scrollBar.style == R_SB_NEXT 1537 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1538 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1539 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1540 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1541 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1542 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1543 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1544 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1545 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1546 tt_printf ("\033[B");
1709 else 1547 else
1710 switch (ev->button) 1548 switch (ev.button)
1711 { 1549 {
1712 case Button2: 1550 case Button2:
1713 tt_printf("\014"); 1551 tt_printf ("\014");
1714 break; 1552 break;
1715 case Button1: 1553 case Button1:
1716 tt_printf("\033[6~"); 1554 tt_printf ("\033[6~");
1717 break; 1555 break;
1718 case Button3: 1556 case Button3:
1719 tt_printf("\033[5~"); 1557 tt_printf ("\033[5~");
1720 break; 1558 break;
1721 } 1559 }
1722 } 1560 }
1723 else 1561 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1562#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1564 {
1727 char upordown = 0; 1565 char upordown = 0;
1728 1566
1729 if (scrollBar.style == R_SB_NEXT) 1567 if (scrollBar.style == R_SB_NEXT)
1730 { 1568 {
1731 if (scrollbarnext_upButton(ev->y)) 1569 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1570 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1571 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1572 upordown = 1; /* down */
1735 } 1573 }
1736 else if (scrollBar.style == R_SB_RXVT) 1574 else if (scrollBar.style == R_SB_RXVT)
1737 { 1575 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1576 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1577 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1578 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1579 upordown = 1; /* down */
1742 } 1580 }
1743 if (upordown) 1581 if (upordown)
1744 { 1582 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1746 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1747#endif 1585#endif
1748 if (scr_page (upordown < 0 ? UP : DN, 1)) 1586 if (scr_page (upordown < 0 ? UP : DN, 1))
1749 { 1587 {
1750 if (upordown < 0) 1588 if (upordown < 0)
1751 scrollBar.setUp (); 1589 scrollBar.setUp ();
1752 else 1590 else
1753 scrollBar.setDn (); 1591 scrollBar.setDn ();
1754 } 1592 }
1755 } 1593 }
1756 else 1594 else
1757 switch (ev->button) 1595 switch (ev.button)
1758 { 1596 {
1759 case Button2: 1597 case Button2:
1760 switch (scrollbar_align) 1598 switch (scrollbar_align)
1761 { 1599 {
1762 case R_SB_ALIGN_TOP: 1600 case R_SB_ALIGN_TOP:
… …
1768 case R_SB_ALIGN_BOTTOM: 1606 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1607 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1608 break;
1771 } 1609 }
1772 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1611 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1612 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1613 scr_move_to ( scrollbar_position (ev.y) - csrO,
1776 scrollbar_size()); 1614 scrollbar_size ());
1777 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1778 break; 1616 break;
1779 1617
1780 case Button1: 1618 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1620 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1621 /* FALLTHROUGH */
1784 1622
1785 case Button3: 1623 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1624 if (scrollBar.style != R_SB_XTERM)
1787 { 1625 {
1788 if (scrollbar_above_slider(ev->y)) 1626 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1627# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1628 scr_page (UP, TermWin.nrow - 1);
1791# else 1629# else
1792 scr_page (UP, TermWin.nrow / 4); 1630 scr_page (UP, TermWin.nrow / 4);
1793# endif 1631# endif
1794 else if (scrollbar_below_slider(ev->y)) 1632 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1633# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1634 scr_page (DN, TermWin.nrow - 1);
1797# else 1635# else
1798 scr_page (DN, TermWin.nrow / 4); 1636 scr_page (DN, TermWin.nrow / 4);
1799# endif 1637# endif
1800 else 1638 else
1801 scrollBar.setMotion (); 1639 scrollBar.setMotion ();
1802 } 1640 }
1803 else 1641 else
1804 { 1642 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1644 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1645 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1646 / scrollbar_size ()));
1809 } 1647 }
1810 break; 1648 break;
1811 } 1649 }
1812 } 1650 }
1813 return; 1651 return;
1814 } 1652 }
1815#if MENUBAR 1653#if MENUBAR
1816 /* 1654 /*
1817 * Menubar window processing of button press 1655 * Menubar window processing of button press
1818 */ 1656 */
1819 if (isMenuBarWindow(ev->window)) 1657 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1658 menubar_control (ev);
1821#endif 1659#endif
1822} 1660}
1823 1661
1824void 1662void
1825rxvt_term::button_release (XButtonEvent *ev) 1663rxvt_term::button_release (XButtonEvent &ev)
1826{ 1664{
1827 int reportmode = 0; 1665 int reportmode = 0;
1828 1666
1829 csrO = 0; /* reset csr Offset */ 1667 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1668 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1669 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1670
1833 if (scrollbar_isUpDn()) 1671 if (scrollbar_isUpDn ())
1834 { 1672 {
1835 scrollBar.setIdle (); 1673 scrollBar.setIdle ();
1836 scrollbar_show (0); 1674 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1676 refresh_type &= ~SMOOTH_REFRESH;
1839#endif 1677#endif
1840 1678
1841 } 1679 }
1842#ifdef SELECTION_SCROLLING 1680#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop();
1844#endif 1683#endif
1845 if (ev->window == TermWin.vt) 1684 if (ev.window == TermWin.vt)
1846 { 1685 {
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) 1686 if (reportmode)
1687 {
1688 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4)
1691 return;
1692#ifdef MOUSE_REPORT_DOUBLECLICK
1693 /* only report the release of 'slow' single clicks */
1694 if (MEvent.button != AnyButton
1695 && (ev.button != MEvent.button
1696 || (ev.time - MEvent.time
1697 > MULTICLICK_TIME / 2)))
1855 { 1698 {
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; 1699 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 1700 MEvent.button = AnyButton;
1873 mouse_report (ev); 1701 mouse_report (ev);
1702 }
1703#else /* MOUSE_REPORT_DOUBLECLICK */
1704 MEvent.button = AnyButton;
1705 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1706#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 1707 return;
1876 } 1708 }
1877 /* 1709 /*
1878 * dumb hack to compensate for the failure of click-and-drag 1710 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1711 * when overriding mouse reporting
1880 */ 1712 */
1881 if (PrivateModes & PrivMode_mouse_report 1713 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1714 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1715 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1716 selection_extend (ev.x, ev.y, 0);
1885 1717
1886 switch (ev->button) 1718 switch (ev.button)
1719 {
1720 case Button1:
1721 case Button3:
1722 selection_make (ev.time);
1723 break;
1724 case Button2:
1725 selection_request (ev.time, ev.x, ev.y);
1726 break;
1727#ifdef MOUSE_WHEEL
1728 case Button4:
1729 case Button5:
1887 { 1730 {
1888 case Button1: 1731 int i;
1889 case Button3: 1732 page_dirn v;
1890 selection_make (ev->time); 1733
1734 v = ev.button == Button4 ? UP : DN;
1735
1736 if (ev.state & ShiftMask)
1891 break; 1737 i = 1;
1892 case Button2: 1738 else if (Options & Opt_mouseWheelScrollPage)
1893 selection_request (ev->time, ev->x, ev->y); 1739 i = TermWin.nrow - 1;
1740 else
1894 break; 1741 i = 5;
1742
1895#ifdef MOUSE_WHEEL 1743# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 1744 if (ev.state & ControlMask)
1897 case Button5:
1898 { 1745 {
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); 1746 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1749
1750 if (slip_wheel_ev.at < NOW)
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752
1753 slip_wheel_ev.start ();
1914 } 1754 }
1755 else
1756 {
1915# endif 1757# endif
1916# ifdef JUMP_MOUSE_WHEEL 1758# ifdef JUMP_MOUSE_WHEEL
1917 scr_page (v, i); 1759 scr_page (v, i);
1918 scr_refresh (SMOOTH_REFRESH); 1760 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 1761 scrollbar_show (1);
… …
1923 scr_page (v, 1); 1765 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH); 1766 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1); 1767 scrollbar_show (1);
1926 } 1768 }
1927# endif 1769# endif
1928 1770# ifdef MOUSE_SLIP_WHEELING
1929 } 1771 }
1930 break;
1931#endif 1772#endif
1932
1933 } 1773 }
1774 break;
1775#endif
1934 } 1776 }
1935 } 1777 }
1936#ifdef MENUBAR 1778#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1779 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1780 menubar_control (ev);
1939#endif 1781#endif
1940} 1782}
1941 1783
1942
1943#ifdef TRANSPARENT 1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1948 }
1949 break;
1950 }
1951 case 16:
1952 {
1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
2011
2012 free (lookup);
2013}
2014#endif
2015
1944/* 2016/*
1945 * Check our parents are still who we think they are. 2017 * Check our parents are still who we think they are.
1946 * Do transparency updates if required 2018 * Do transparency updates if required
1947 */ 2019 */
1948int 2020int
1949rxvt_term::check_our_parents () 2021rxvt_term::check_our_parents ()
1950{ 2022{
1951 int i, pchanged, aformat, have_pixmap, rootdepth; 2023 int i, pchanged, aformat, have_pixmap, rootdepth;
1952 unsigned long nitems, bytes_after; 2024 unsigned long nitems, bytes_after;
1953 Atom atype; 2025 Atom atype;
1954 unsigned char *prop = NULL; 2026 unsigned char *prop = NULL;
1955 Window root, oldp, *list; 2027 Window root, oldp, *list;
1956 Pixmap rootpixmap = None; 2028 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 2029 XWindowAttributes wattr, wrootattr;
1958 2030
1959 pchanged = 0; 2031 pchanged = 0;
1960 2032
1961 if (!(Options & Opt_transparent)) 2033 if (!(Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 2034 return pchanged; /* Don't try any more */
1963 2035
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 2037 rootdepth = wrootattr.depth;
1966 2038
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
1968 if (rootdepth != wattr.depth) 2041 if (rootdepth != wattr.depth)
1969 { 2042 {
1970 if (am_transparent) 2043 if (am_transparent)
1971 { 2044 {
1972 pchanged = 1; 2045 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1974 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 2047 am_transparent = am_pixmap_trans = 0;
1976 } 2048 }
2049
1977 return pchanged; /* Don't try any more */ 2050 return pchanged; /* Don't try any more */
1978 } 2051 }
1979 2052
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 2053 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 2054 XSync (display->display, False);
1982 2055
1983 /* 2056 /*
1984 * Make the frame window set by the window manager have 2057 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 2058 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 2059 * windows for each client, so we have to take care about that.
1987 */ 2060 */
1988 i = (xa[XA_XROOTPMAPID] != 0 2061 i = (xa[XA_XROOTPMAPID]
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 2064 &nitems, &bytes_after, &prop) == Success);
2065
1992 if (!i || prop == NULL) 2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
1993 have_pixmap = 0; 2077 have_pixmap = 0;
1994 else 2078 else
1995 { 2079 {
1996 have_pixmap = 1; 2080 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2081 rootpixmap = *(Pixmap *)prop;
1998 XFree(prop); 2082 XFree (prop);
1999 } 2083 }
2084
2000 if (have_pixmap) 2085 if (have_pixmap)
2001 { 2086 {
2002 /* 2087 /*
2003 * Copy Xroot pixmap transparency 2088 * Copy display->root pixmap transparency
2004 */ 2089 */
2005 int sx, sy, nx, ny; 2090 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2091 unsigned int nw, nh;
2007 Window cr; 2092 Window cr;
2008 XImage *image; 2093 XImage *image;
2009 GC gc; 2094 GC gc;
2010 XGCValues gcvalue; 2095 XGCValues gcvalue;
2011 2096
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2098 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2099 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2100 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2101 nx = ny = 0;
2102
2017 if (sx < 0) 2103 if (sx < 0)
2018 { 2104 {
2019 nw += sx; 2105 nw += sx;
2020 nx = -sx; 2106 nx = -sx;
2021 sx = 0; 2107 sx = 0;
2022 } 2108 }
2109
2023 if (sy < 0) 2110 if (sy < 0)
2024 { 2111 {
2025 nh += sy; 2112 nh += sy;
2026 ny = -sy; 2113 ny = -sy;
2027 sy = 0; 2114 sy = 0;
2028 } 2115 }
2116
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 2119 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 ZPixmap); 2121
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2123 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2124 allowedxerror = 0;
2125
2037 if (image == NULL) 2126 if (image == NULL)
2038 { 2127 {
2039 if (am_transparent && am_pixmap_trans) 2128 if (am_transparent && am_pixmap_trans)
2040 { 2129 {
2041 pchanged = 1; 2130 pchanged = 1;
2042 if (TermWin.pixmap != None) 2131 if (TermWin.pixmap != None)
2043 { 2132 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2133 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 2134 TermWin.pixmap = None;
2046 } 2135 }
2047 } 2136 }
2137
2048 am_pixmap_trans = 0; 2138 am_pixmap_trans = 0;
2049 } 2139 }
2050 else 2140 else
2051 { 2141 {
2052 if (TermWin.pixmap != None) 2142 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2158 szHint.width, szHint.height, image->depth);
2057 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2161 nx, ny, image->width, image->height);
2062 XFreeGC(Xdisplay, gc); 2162 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 2163 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2065 TermWin.pixmap); 2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2066 if (!am_transparent || !am_pixmap_trans) 2167 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2168 pchanged = 1;
2169
2068 am_transparent = am_pixmap_trans = 1; 2170 am_transparent = am_pixmap_trans = 1;
2069 } 2171 }
2070 } 2172 }
2173
2071 if (!am_pixmap_trans) 2174 if (!am_pixmap_trans)
2072 { 2175 {
2073 unsigned int n; 2176 unsigned int n;
2074 /* 2177 /*
2075 * InheritPixmap transparency 2178 * InheritPixmap transparency
2076 */ 2179 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2079 i++)
2080 { 2182 {
2081 oldp = TermWin.parent[i]; 2183 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2185 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2186 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2086 if (TermWin.parent[i] == Xroot) 2189 if (TermWin.parent[i] == display->root)
2087 { 2190 {
2088 if (oldp != None) 2191 if (oldp != None)
2089 pchanged = 1; 2192 pchanged = 1;
2193
2090 break; 2194 break;
2091 } 2195 }
2196
2092 if (oldp != TermWin.parent[i]) 2197 if (oldp != TermWin.parent[i])
2093 pchanged = 1; 2198 pchanged = 1;
2094 } 2199 }
2200
2095 n = 0; 2201 n = 0;
2202
2096 if (pchanged) 2203 if (pchanged)
2097 { 2204 {
2098 for (; n < (unsigned int)i; n++) 2205 for (; n < (unsigned int)i; n++)
2099 { 2206 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2207 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")); 2208 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) 2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2210 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2212 break;
2106 } 2213 }
2107 } 2214 }
2108 } 2215 }
2109 if (n > (int)(sizeof(TermWin.parent) 2216
2110 / sizeof(TermWin.parent[0]))) 2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2111 { 2218 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2219 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2114 PixColors[Color_fg]); 2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt,
2116 PixColors[Color_bg]);
2117 am_transparent = 0; 2222 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2223 /* XXX: also turn off Opt_transparent? */
2119 } 2224 }
2120 else 2225 else
2121 { 2226 {
2227#if WAIT_FOR_WM
2122 /* wait (an arbitrary period) for the WM to do its thing 2228 /* wait (an arbitrary period) for the WM to do its thing
2123 * needed for fvwm2.2.2 (and before?) */ 2229 * 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); 2230 sleep (1);
2132# endif 2231#endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2136 ParentRelative); 2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2138 ParentRelative);
2139 am_transparent = 1; 2240 am_transparent = 1;
2140 } 2241 }
2242
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2244 TermWin.parent[i] = None;
2143 } 2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
2144 return pchanged; 2256 return pchanged;
2145} 2257}
2146#endif 2258#endif
2147 2259
2148/*}}} */ 2260/*}}} */
2261
2262bool
2263rxvt_term::cmd_parse ()
2264{
2265 bool flag = false;
2266 unicode_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here
2268
2269 for (;;)
2270 {
2271 if (ch == NOCHAR)
2272 {
2273 seq_begin = cmdbuf_ptr;
2274 ch = next_char ();
2275 }
2276
2277 if (ch == NOCHAR) // TODO: improve
2278 break;
2279
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 {
2282 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false;
2285 int nlines = 0;
2286 unicode_t *str = buf;
2287
2288 *str++ = ch;
2289
2290 for (;;)
2291 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break;
2297
2298 *str++ = ch;
2299
2300 if (ch == C0_LF)
2301 {
2302 nlines++;
2303 refresh_count++;
2304
2305 if (! (Options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 {
2308 refreshnow = true;
2309 ch = NOCHAR;
2310 break;
2311 }
2312
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1)
2315 {
2316 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0;
2318 str = buf;
2319 }
2320 }
2321
2322 if (str >= buf + UBUFSIZ)
2323 {
2324 ch = NOCHAR;
2325 break;
2326 }
2327 }
2328
2329 scr_add_lines (buf, nlines, str - buf);
2330
2331 /*
2332 * If there have been a lot of new lines, then update the screen
2333 * What the heck I'll cheat and only refresh less than every page-full.
2334 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling.
2336 */
2337 if (refreshnow)
2338 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++;
2341 else
2342 {
2343 flag = true;
2344 scr_refresh (refresh_type);
2345 }
2346 }
2347
2348 }
2349 else
2350 {
2351 try
2352 {
2353 process_nonprinting (ch);
2354 }
2355 catch (const class out_of_input &o)
2356 {
2357 // we ran out of input, retry later
2358 cmdbuf_ptr = seq_begin;
2359 break;
2360 }
2361
2362 ch = NOCHAR;
2363 }
2364 }
2365
2366 return flag;
2367}
2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2378// read the next character
2379unicode_t
2380rxvt_term::next_char ()
2381{
2382 while (cmdbuf_ptr < cmdbuf_endp)
2383 {
2384 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++;
2387
2388 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390
2391 if (len == (size_t)-2)
2392 {
2393 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp;
2395 break;
2396 }
2397
2398 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400
2401 // assume wchar == unicode
2402 cmdbuf_ptr += len;
2403 return wc;
2404 }
2405
2406 return NOCHAR;
2407}
2408
2409/* rxvt_cmd_getc () - Return next input character */
2410/*
2411 * Return the next input character after first passing any keyboard input
2412 * to the command.
2413 */
2414unicode_t
2415rxvt_term::cmd_getc ()
2416{
2417 unicode_t c = next_char ();
2418
2419 if (c == NOCHAR)
2420 throw out_of_input;
2421
2422 return c;
2423}
2424
2425unicode_t
2426rxvt_term::cmd_get8 ()
2427{
2428 unicode_t c = next_octet ();
2429
2430 if (c == NOCHAR)
2431 throw out_of_input;
2432
2433 return c;
2434}
2149 2435
2150/*{{{ print pipe */ 2436/*{{{ print pipe */
2151/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2153FILE * 2439FILE *
2154rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2155{ 2441{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2443
2158 if (stream == NULL) 2444 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2446
2160 return stream; 2447 return stream;
2161} 2448}
2162 2449
2163int 2450int
2164rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2165{ 2452{
2166 fflush (stream); 2453 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); 2454 return pclose (stream);
2173# endif
2174} 2455}
2175 2456
2176/* 2457/*
2177 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2178 */ 2459 */
2179void 2460void
2180rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2181{ 2462{
2182 int done; 2463 int done;
2183 FILE *fd; 2464 FILE *fd;
2184 2465
2185 if ((fd = popen_printer ()) == NULL) 2466 if ((fd = popen_printer ()) == NULL)
2186 return; 2467 return;
2187 2468
2188 /* 2469 /*
2189 * Send all input to the printer until either ESC[4i or ESC[?4i 2470 * Send all input to the printer until either ESC[4i or ESC[?4i
2190 * is received. 2471 * is received.
2191 */ 2472 */
2192 for (done = 0; !done;) 2473 for (done = 0; !done;)
2193 { 2474 {
2194 unsigned char buf[8]; 2475 unsigned char buf[8];
2195 unsigned char ch; 2476 unicode_t ch;
2196 unsigned int i, len; 2477 unsigned int i, len;
2197 2478
2198 if ((ch = cmd_getc ()) != C0_ESC) 2479 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2480 {
2200 if (putc(ch, fd) == EOF) 2481 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2482 break; /* done = 1 */
2202 } 2483 }
2203 else 2484 else
2204 { 2485 {
2205 len = 0; 2486 len = 0;
… …
2216 { 2497 {
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2499 break; /* done = 1 */
2219 } 2500 }
2220 } 2501 }
2502
2221 for (i = 0; i < len; i++) 2503 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2504 if (putc (buf[i], fd) == EOF)
2223 { 2505 {
2224 done = 1; 2506 done = 1;
2225 break; 2507 break;
2226 } 2508 }
2227 } 2509 }
2228 } 2510 }
2511
2229 pclose_printer (fd); 2512 pclose_printer (fd);
2230} 2513}
2231#endif /* PRINTPIPE */ 2514#endif /* PRINTPIPE */
2232/*}}} */ 2515/*}}} */
2233 2516
2234/* *INDENT-OFF* */ 2517/* *INDENT-OFF* */
2235enum { 2518enum {
2236 C1_40 = 0x40, 2519 C1_40 = 0x40,
2237 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 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, 2521 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, 2522 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 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2241}; 2524};
2242/* *INDENT-ON* */ 2525/* *INDENT-ON* */
2243 2526
2244/*{{{ process non-printing single characters */ 2527/*{{{ process non-printing single characters */
2245void 2528void
2246rxvt_term::process_nonprinting (unsigned char ch) 2529rxvt_term::process_nonprinting (unicode_t ch)
2247{ 2530{
2248 switch (ch) 2531 switch (ch)
2249 { 2532 {
2533 case C0_ESC:
2534 process_escape_seq ();
2535 break;
2250 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2252 tt_write(
2253 (const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2540 else
2256 tt_write((unsigned char *)VT100_ANS, 2541 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2542 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2543 break;
2259 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2260 scr_bell (); 2545 scr_bell ();
2261 break; 2546 break;
2262 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2277 scr_charset_choose (1); 2562 scr_charset_choose (1);
2278 break; 2563 break;
2279 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2280 scr_charset_choose (0); 2565 scr_charset_choose (0);
2281 break; 2566 break;
2567
2568#ifdef EIGHT_BIT_CONTROLS
2569 // 8-bit controls
2570 case 0x90: /* DCS */
2571 process_dcs_seq ();
2572 break;
2573 case 0x9b: /* CSI */
2574 process_csi_seq ();
2575 break;
2576 case 0x9d: /* CSI */
2577 process_osc_seq ();
2578 break;
2579#endif
2282 } 2580 }
2283} 2581}
2284/*}}} */ 2582/*}}} */
2285 2583
2286 2584
2287/*{{{ process VT52 escape sequences */ 2585/*{{{ process VT52 escape sequences */
2288void 2586void
2289rxvt_term::process_escape_vt52 (unsigned char ch) 2587rxvt_term::process_escape_vt52 (unicode_t ch)
2290{ 2588{
2291 int row, col; 2589 int row, col;
2292 2590
2293 switch (ch) 2591 switch (ch)
2294 { 2592 {
… …
2324 row = cmd_getc () - ' '; 2622 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2623 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2624 scr_gotorc (row, col, 0);
2327 break; 2625 break;
2328 case 'Z': /* identify the terminal type */ 2626 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2627 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2628 break;
2331 case '<': /* turn off VT52 mode */ 2629 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2630 PrivMode (0, PrivMode_vt52);
2333 break; 2631 break;
2334 case 'F': /* use special graphics character set */ 2632 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2633 case 'G': /* use regular character set */
2336 /* unimplemented */ 2634 /* unimplemented */
2337 break; 2635 break;
… …
2346 2644
2347/*{{{ process escape sequences */ 2645/*{{{ process escape sequences */
2348void 2646void
2349rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2350{ 2648{
2351 unsigned char ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2352 2650
2353 if (PrivateModes & PrivMode_vt52) 2651 if (PrivateModes & PrivMode_vt52)
2354 { 2652 {
2355 process_escape_vt52 (ch); 2653 process_escape_vt52 (ch);
2356 return; 2654 return;
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 2672 break;
2375 case '+': 2673 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 2675 break;
2378#ifdef MULTICHAR_SET
2379 case '$':
2380 scr_charset_set (-2, (unsigned int)cmd_getc ());
2381 break;
2382#endif
2383#ifndef NO_FRILLS 2676#ifndef NO_FRILLS
2384 case '6': 2677 case '6':
2385 scr_backindex (); 2678 scr_backindex ();
2386 break; 2679 break;
2387#endif 2680#endif
… …
2396 scr_forwardindex (); 2689 scr_forwardindex ();
2397 break; 2690 break;
2398#endif 2691#endif
2399 case '=': 2692 case '=':
2400 case '>': 2693 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2694 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2695 break;
2403 2696
2404 case C1_40: 2697 case C1_40:
2405 cmd_getc (); 2698 cmd_getc ();
2406 break; 2699 break;
… …
2409 break; 2702 break;
2410 2703
2411 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2412 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2413 { 2706 {
2414 uint32_t nlcr[] = { '\n', '\r' }; 2707 unicode_t nlcr[] = { C0_LF, C0_CR };
2415 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, 1, 2);
2416 } 2709 }
2417 break; 2710 break;
2418 2711
2419 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2430 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2431 scr_index (DN); 2724 scr_index (DN);
2432 break; 2725 break;
2433 2726
2434 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2435 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2436 2729
2437 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2438 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2439 2732
2440 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2441 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2442 process_dcs_seq (); 2735 process_dcs_seq ();
2443 break; 2736 break;
2444 2737
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2740 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2450 2743
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2746 process_csi_seq ();
… …
2458 process_osc_seq (); 2751 process_osc_seq ();
2459 break; 2752 break;
2460 2753
2461 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE */
2462 case 'c': 2755 case 'c':
2756 mbstate.reset ();
2463 scr_poweron (); 2757 scr_poweron ();
2464 scrollbar_show (1); 2758 scrollbar_show (1);
2465 break; 2759 break;
2466 2760
2467 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2479 2773
2480/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2481/* *INDENT-OFF* */ 2775/* *INDENT-OFF* */
2482enum { 2776enum {
2483 CSI_ICH = 0x40, 2777 CSI_ICH = 0x40,
2484 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2778 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 , 2779 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, 2780 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, 2781 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, 2782 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, 2783 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2493 2787
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2788#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2789 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2790 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2791#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2792 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2793
2500const unsigned char csi_defaults[] = 2794const unsigned char csi_defaults[] =
2501 { 2795 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2796 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, */ 2797 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, */ 2798 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, [, \, ], ^, _, */ 2799 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, */ 2800 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, */ 2801 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, */ 2802 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, {, |, }, ~, */ 2803 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2510 }; 2804 };
2511/* *INDENT-ON* */ 2805/* *INDENT-ON* */
2512 2806
2513void 2807void
2514rxvt_term::process_csi_seq () 2808rxvt_term::process_csi_seq ()
2515{ 2809{
2516 unsigned char ch, priv, i; 2810 unicode_t ch, priv, i;
2517 unsigned int nargs, p; 2811 unsigned int nargs, p;
2518 int n, ndef; 2812 int n, ndef;
2519 int arg[ESC_ARGS]; 2813 int arg[ESC_ARGS];
2520 2814
2521 for (nargs = ESC_ARGS; nargs > 0;) 2815 for (nargs = ESC_ARGS; nargs > 0;)
2522 arg[--nargs] = 0; 2816 arg[--nargs] = 0;
2523 2817
2524 priv = 0; 2818 priv = 0;
… …
2526 if (ch >= '<' && ch <= '?') 2820 if (ch >= '<' && ch <= '?')
2527 { /* '<' '=' '>' '?' */ 2821 { /* '<' '=' '>' '?' */
2528 priv = ch; 2822 priv = ch;
2529 ch = cmd_getc (); 2823 ch = cmd_getc ();
2530 } 2824 }
2825
2531 /* read any numerical arguments */ 2826 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2827 for (n = -1; ch < CSI_ICH; )
2533 { 2828 {
2534 if (isdigit(ch)) 2829 if (isdigit (ch))
2535 { 2830 {
2536 if (n < 0) 2831 if (n < 0)
2537 n = ch - '0'; 2832 n = ch - '0';
2538 else 2833 else
2539 n = n * 10 + ch - '0'; 2834 n = n * 10 + ch - '0';
… …
2542 { 2837 {
2543 if (nargs < ESC_ARGS) 2838 if (nargs < ESC_ARGS)
2544 arg[nargs++] = n; 2839 arg[nargs++] = n;
2545 n = -1; 2840 n = -1;
2546 } 2841 }
2547 else if (ch == '\b') 2842 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); 2843 process_nonprinting (ch);
2559 } 2844
2560 ch = cmd_getc (); 2845 ch = cmd_getc ();
2561 } 2846 }
2562 2847
2563 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2564 return; 2849 return;
2565 2850
2566 if (nargs < ESC_ARGS) 2851 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2852 arg[nargs++] = n;
2568 2853
2569 i = ch - CSI_ICH; 2854 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2855 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2856 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2857 if (arg[p] == -1)
2573 arg[p] = ndef; 2858 arg[p] = ndef;
2574 2859
2575#ifdef DEBUG_CMD 2860#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2861 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2862 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2864 fprintf (stderr, "%c\n", ch);
2580#endif 2865#endif
2581 2866
2582 /* 2867 /*
2583 * private mode handling 2868 * private mode handling
2584 */ 2869 */
… …
2586 { 2871 {
2587 switch (priv) 2872 switch (priv)
2588 { 2873 {
2589 case '>': 2874 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2875 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2877 break;
2593 case '?': 2878 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2881 break;
… …
2599 } 2884 }
2600 2885
2601 switch (ch) 2886 switch (ch)
2602 { 2887 {
2603 /* 2888 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2889 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2890 */
2606#ifdef PRINTPIPE 2891#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2892 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2893 switch (arg[0])
2609 { 2894 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2992 break;
2708 2993
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2995 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2997 break;
2713 2998
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
2716 break; 3001 break;
2717 3002
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3003 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 3004 switch (arg[0])
2720 { 3005 {
2721 case 5: /* DSR requested */ 3006 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 3007 tt_printf ("\033[0n");
2723 break; 3008 break;
2724 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2725 scr_report_position (); 3010 scr_report_position ();
2726 break; 3011 break;
2727#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure)
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 3015 break;
2731#endif
2732 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 3018 break;
2735 } 3019 }
2736 break; 3020 break;
2737 3021
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2805 break; 3089 break;
2806#endif 3090#endif
2807 3091
2808 case CSI_78: /* DECREQTPARM */ 3092 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 3093 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3094 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 3095 break;
2812 3096
2813 default: 3097 default:
2814 break; 3098 break;
2815 } 3099 }
2816} 3100}
… …
2819#ifndef NO_FRILLS 3103#ifndef NO_FRILLS
2820/* ARGSUSED */ 3104/* ARGSUSED */
2821void 3105void
2822rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3106rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2823{ 3107{
2824 int x, y; 3108 int x, y;
2825#if 0
2826 char *s;
2827#endif
2828 XWindowAttributes wattr; 3109 XWindowAttributes wattr;
2829 Window wdummy; 3110 Window wdummy;
2830 3111
2831 if (nargs == 0) 3112 if (nargs == 0)
2832 return; 3113 return;
3114
2833 switch (args[0]) 3115 switch (args[0])
2834 { 3116 {
2835 /* 3117 /*
2836 * commands 3118 * commands
2837 */ 3119 */
2838 case 1: /* deiconify window */ 3120 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 3121 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 3122 break;
2841 case 2: /* iconify window */ 3123 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 3124 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 3125 DefaultScreen (display->display));
2844 break; 3126 break;
2845 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 3129 break;
2848 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 3132 break;
2851 case 5: /* raise window */ 3133 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3134 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 3135 break;
2854 case 6: /* lower window */ 3136 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 3137 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 3138 break;
2857 case 7: /* refresh window */ 3139 case 7: /* refresh window */
2858 scr_touch (true); 3140 scr_touch (true);
2859 break; 3141 break;
2860 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 3145 break;
3146
3147 //case 9: NYI, TODO, restore maximized window or maximize window
2864 default: 3148 default:
2865 if (args[0] >= 24) /* set height (chars) */ 3149 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 3150 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 3151 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 3152 break;
3153
3154
2869 /* 3155 /*
2870 * reports - some output format copied from XTerm 3156 * reports - some output format copied from XTerm
2871 */ 3157 */
2872 case 11: /* report window state */ 3158 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 3161 break;
2876 case 13: /* report window position */ 3162 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 3165 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 3166 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 3167 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 3168 break;
2883 case 14: /* report window size (pixels) */ 3169 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 3172 break;
2887 case 18: /* report window size (chars) */ 3173 case 18: /* report text area size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 3175 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 3176 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break;
2891 case 20: /* report icon label */ 3179 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 {
3182 char *s;
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3183 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3185 }
2894 break; 3186 break;
2895 case 21: /* report window title */ 3187 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 {
3190 char *s;
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 3191 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3193 }
2898 break; 3194 break;
2899#endif
2900
2901 } 3195 }
2902} 3196}
2903#endif 3197#endif
2904 3198
2905/*----------------------------------------------------------------------*/ 3199/*----------------------------------------------------------------------*/
2906/* 3200/*
2907 * get input up until STRING TERMINATOR (or BEL) 3201 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 3202 * ends_how is terminator used. returned input must be free()'d
2909 */ 3203 */
2910unsigned char * 3204unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 3205rxvt_term::get_to_st (unicode_t &ends_how)
2912{ 3206{
2913 int seen_esc = 0; /* seen escape? */ 3207 unicode_t prev = 0, ch;
2914 unsigned int n = 0; 3208 unsigned int n = 0;
2915 unsigned char *s; 3209 unsigned char *s;
2916 unsigned char ch, string[STRING_MAX]; 3210 unsigned char string[STRING_MAX];
2917 3211
2918 for (; (ch = cmd_getc ());) 3212 while ((ch = cmd_getc ()) != NOCHAR)
2919 { 3213 {
2920 if (ch == C0_BEL
2921 || ch == CHAR_ST
2922 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2923 break;
2924 if (ch == C0_ESC) 3214 if (prev == C0_ESC)
2925 {
2926 seen_esc = 1;
2927 continue;
2928 } 3215 {
2929 else if (ch == '\t') 3216 if (ch == 0x5c) /* 7bit ST */
2930 ch = ' '; /* translate '\t' to space */ 3217 break;
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3218 else
3219 return NULL;
3220 }
3221 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break;
3223 else if (ch < 0x20)
2932 return NULL; /* other control character - exit */ 3224 return NULL; /* other control character - exit */
3225
2933 if (n < sizeof(string) - 1) 3226 if (n >= sizeof (string) - 1)
3227 // stop at some sane length
3228 return NULL;
3229
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
2934 string[n++] = ch; 3236 string[n++] = prev = ch;
2935 seen_esc = 0;
2936 } 3237 }
3238
2937 string[n++] = '\0'; 3239 string[n++] = '\0';
3240
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 3242 return NULL;
3243
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3244 ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 3245 STRNCPY (s, string, n);
2942 return s; 3246 return s;
2943} 3247}
2944 3248
2945/*----------------------------------------------------------------------*/ 3249/*----------------------------------------------------------------------*/
2946/* 3250/*
2947 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2948 */ 3252 */
2949void 3253void
2950rxvt_term::process_dcs_seq () 3254rxvt_term::process_dcs_seq ()
2951{ 3255{
2952 unsigned char eh, *s; 3256 unsigned char *s;
3257 unicode_t eh;
3258
2953 /* 3259 /*
2954 * Not handled yet 3260 * Not handled yet
2955 */ 3261 */
2956 s = get_to_st (&eh); 3262 s = get_to_st (eh);
2957 if (s) 3263 if (s)
2958 free(s); 3264 free (s);
3265
2959 return; 3266 return;
2960} 3267}
2961 3268
2962/*----------------------------------------------------------------------*/ 3269/*----------------------------------------------------------------------*/
2963/* 3270/*
2964 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2965 */ 3272 */
2966void 3273void
2967rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
2968{ 3275{
2969 unsigned char ch, eh, *s; 3276 unicode_t ch, eh;
2970 int arg; 3277 int arg;
2971 3278
2972 ch = cmd_getc (); 3279 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
2975 3282
2976 if (ch == ';') 3283 if (ch == ';')
2977 { 3284 {
2978 s = get_to_st (&eh); 3285 unsigned char *s = get_to_st (eh);
3286
2979 if (s) 3287 if (s)
2980 { 3288 {
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); 3289 process_xterm_seq (arg, (char *)s, eh);
2993 free(s); 3290 free (s);
3291 }
3292 }
3293}
3294
3295void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{
3298 if (str[0] == '?' && !str[1])
3299 {
3300 if (Options & Opt_insecure)
2994 } 3301 {
3302 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
2995 } 3306 }
3307 else
3308 set_window_color (color, str);
2996} 3309}
3310
2997/* 3311/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2999 * 0 = change iconName/title 3313 * 0 = change iconName/title
3000 * 1 = change iconName 3314 * 1 = change iconName
3001 * 2 = change title 3315 * 2 = change title
3002 * 4 = change color 3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3003 * 12 = change text color 3319 * 12 = change text color
3004 * 13 = change mouse foreground color 3320 * 13 = change mouse foreground color
3005 * 17 = change highlight character colour 3321 * 17 = change highlight character colour
3006 * 18 = change bold character color 3322 * 18 = change bold character color
3007 * 19 = change underlined character color 3323 * 19 = change underlined character color
3008 * 46 = change logfile (not implemented) 3324 * 46 = change logfile (not implemented)
3009 * 50 = change font 3325 * 50 = change font
3010 * 3326 *
3011 * rxvt extensions: 3327 * rxvt extensions:
3012 * 10 = menu (may change in future)
3013 * 20 = bg pixmap 3328 * 20 = bg pixmap
3014 * 39 = change default fg color 3329 * 39 = change default fg color
3015 * 49 = change default bg color 3330 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3017 */ 3335 */
3018void 3336void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3020{ 3338{
3021 int changed = 0; 3339 int changed = 0;
3022 int color; 3340 int color;
3023 char *buf, *name; 3341 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1];
3024 3343
3025 assert(str != NULL); 3344 assert (str != NULL);
3026 switch (op) 3345 switch (op)
3027 { 3346 {
3028 case XTerm_name: 3347 case XTerm_name:
3029 set_title (str); 3348 set_title (str);
3030 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
3031 case XTerm_iconName: 3350 case XTerm_iconName:
3032 set_iconName (str); 3351 set_icon_name (str);
3033 break; 3352 break;
3034 case XTerm_title: 3353 case XTerm_title:
3035 set_title (str); 3354 set_title (str);
3036 break; 3355 break;
3356 case XTerm_property:
3357 if (str[0] == '?')
3358 {
3359 Atom prop = XInternAtom (display->display, str + 1, True);
3360 Atom actual_type;
3361 int actual_format;
3362 unsigned long nitems;
3363 unsigned long bytes_after;
3364 unsigned char *value = 0;
3365 const char *str = "";
3366
3367 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None
3373 && actual_format == 8)
3374 str = (const char *)(value);
3375
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3377
3378 XFree (value);
3379 }
3380 else
3381 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383
3384 if (eq)
3385 {
3386 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0],
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 }
3392 else
3393 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str));
3395 }
3396 break;
3397
3037 case XTerm_Color: 3398 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3399 for (buf = (char *)str; buf && *buf;)
3039 { 3400 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3401 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 3402 break;
3403
3042 *name++ = '\0'; 3404 *name++ = '\0';
3043 color = atoi(buf); 3405 color = atoi (buf);
3406
3044 if (color < 0 || color >= TOTAL_COLORS) 3407 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3408 break;
3409
3046 if ((buf = STRCHR(name, ';')) != NULL) 3410 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 3411 *buf++ = '\0';
3412
3413 if (name[0] == '?' && !name[1])
3414 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 }
3422 else
3048 set_window_color (color + minCOLOR, name); 3423 set_window_color (color + minCOLOR, name);
3049 } 3424 }
3425 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3050 break; 3431 break;
3051#ifndef NO_CURSORCOLOR 3432#ifndef NO_CURSORCOLOR
3052 case XTerm_Color_cursor: 3433 case XTerm_Color_cursor:
3053 set_window_color (Color_cursor, str); 3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3054 break; 3435 break;
3055#endif 3436#endif
3056 case XTerm_Color_pointer: 3437 case XTerm_Color_pointer_fg:
3057 set_window_color (Color_pointer, str); 3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3058 break; 3442 break;
3059#ifndef NO_BOLD_UNDERLINE_REVERSE 3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3060 case XTerm_Color_BD: 3444 case XTerm_Color_BD:
3061 set_window_color (Color_BD, str); 3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3062 break; 3446 break;
3063 case XTerm_Color_UL: 3447 case XTerm_Color_UL:
3064 set_window_color (Color_UL, str); 3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3065 break; 3449 break;
3066 case XTerm_Color_RV: 3450 case XTerm_Color_RV:
3067 set_window_color (Color_RV, str); 3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3068 break; 3452 break;
3069#endif 3453#endif
3070 3454
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: 3455 case XTerm_Pixmap:
3078 if (*str != ';') 3456 if (*str != ';')
3079 { 3457 {
3080#if XPM_BACKGROUND 3458#if XPM_BACKGROUND
3081 scale_pixmap (""); /* reset to default scaling */ 3459 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3460 set_bgPixmap (str); /* change pixmap */
3083#endif 3461#endif
3084 scr_touch (true); 3462 scr_touch (true);
3085 } 3463 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3464 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3465 {
3088 str++; 3466 str++;
3089#if XPM_BACKGROUND 3467#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3468 changed += scale_pixmap (str);
3091#endif 3469#endif
… …
3104 set_window_color (Color_fg, str); 3482 set_window_color (Color_fg, str);
3105 break; 3483 break;
3106 case XTerm_restoreBG: 3484 case XTerm_restoreBG:
3107 set_window_color (Color_bg, str); 3485 set_window_color (Color_bg, str);
3108 break; 3486 break;
3487
3109 case XTerm_logfile: 3488 case XTerm_logfile:
3489 // TODO, when secure mode?
3110 break; 3490 break;
3491
3111 case XTerm_font: 3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3112 change_font (0, str); 3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3113 break; 3536 break;
3537#endif
3114#if 0 3538#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3539 case XTerm_dumpscreen: /* no error notices */
3116 { 3540 {
3117 int fd; 3541 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3543 {
3120 scr_dump (fd); 3544 scr_dump (fd);
3121 close(fd); 3545 close (fd);
3122 } 3546 }
3123 } 3547 }
3124 break; 3548 break;
3125#endif 3549#endif
3126
3127 } 3550 }
3128} 3551}
3129/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
3130 3553
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3554/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3562 * so no need for fancy checking
3140 */ 3563 */
3141int 3564int
3142rxvt_term::privcases (int mode, unsigned long bit) 3565rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3566{
3144 int state; 3567 int state;
3145 3568
3146 if (mode == 's') 3569 if (mode == 's')
3147 { 3570 {
3148 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (PrivateModes & bit);
3149 return -1; 3572 return -1;
… …
3151 else 3574 else
3152 { 3575 {
3153 if (mode == 'r') 3576 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3578 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3580 PrivMode (state, bit);
3158 } 3581 }
3582
3159 return state; 3583 return state;
3160} 3584}
3161 3585
3162/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3163void 3587void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3589{
3166 unsigned int i, j; 3590 unsigned int i, j;
3167 int state; 3591 int state;
3592
3168 static const struct 3593 static const struct
3169 { 3594 {
3170 const int argval; 3595 const int argval;
3171 const unsigned long bit; 3596 const unsigned long bit;
3172 } 3597 }
3598
3173 argtopriv[] = { 3599 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3600 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3601 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3602 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3603 { 4, PrivMode_smoothScroll },
… …
3183 { menuBar_esc, PrivMode_menuBar }, 3609 { menuBar_esc, PrivMode_menuBar },
3184#endif 3610#endif
3185#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 3613#endif
3614 // 18, 19 printing-related
3188 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3189 { 35, PrivMode_ShiftKeys }, 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 3618 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI
3621 // 46 start logging
3191 { 47, PrivMode_Screen }, 3622 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 3623 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace },
3195#endif 3626#endif
3196 { 1000, PrivMode_MouseX11 }, 3627 { 1000, PrivMode_MouseX11 },
3628 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3629 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3630 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3197 { 1010, PrivMode_TtyOutputInh }, 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 3632 { 1011, PrivMode_Keypress }, // rxvt extension
3633 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 3640 };
3202 3641
3203 if (nargs == 0) 3642 if (nargs == 0)
3204 return; 3643 return;
3205 3644
… …
3212 for (i = 0; i < nargs; i++) 3651 for (i = 0; i < nargs; i++)
3213 { 3652 {
3214 state = -1; 3653 state = -1;
3215 3654
3216 /* basic handling */ 3655 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3657 if (argtopriv[j].argval == arg[i])
3219 { 3658 {
3220 state = privcases (mode, argtopriv[j].bit); 3659 state = privcases (mode, argtopriv[j].bit);
3221 break; 3660 break;
3222 } 3661 }
3223 3662
3224 /* extra handling for values with state unkept */ 3663 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 3664 switch (arg[i])
3227 { 3665 {
3228 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3667 if (Options & Opt_secondaryScreen)
3229 if (mode == 0) 3668 if (mode == 0)
3230 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3231 else if (mode == 1) 3670 else if (mode == 1)
3232 scr_cursor (SAVE); 3671 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; 3672 break;
3673 }
3674
3675 if (state >= 0)
3676 /* extra handling for values with valid 0 or 1 state */
3677 switch (arg[i])
3678 {
3679 /* case 1: - application cursor keys */
3680 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode
3684 */
3685 PrivMode (1, PrivMode_vt52);
3686 break;
3249 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3688 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3252 (unsigned int)TermWin.height);
3253 break; 3690 break;
3254 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3255 if (state) 3692 if (state)
3256 Options &= ~Opt_jumpScroll; 3693 Options &= ~Opt_jumpScroll;
3257 else 3694 else
3258 Options |= Opt_jumpScroll; 3695 Options |= Opt_jumpScroll;
3259 break; 3696 break;
3260 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3262 break; 3699 break;
3263 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 3701 scr_relative_origin (state);
3265 break; 3702 break;
3266 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3267 scr_autowrap (state); 3704 scr_autowrap (state);
3268 break; 3705 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3709 PrivateModes &= ~PrivMode_MouseX11;
3273 break; 3710 break;
3274#ifdef menuBar_esc 3711#ifdef menuBar_esc
3275 case menuBar_esc: 3712 case menuBar_esc:
3276#ifdef MENUBAR 3713#ifdef MENUBAR
3277 map_menuBar (state); 3714 map_menuBar (state);
3278#endif 3715#endif
3279 break; 3716 break;
3280#endif 3717#endif
3281#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3282 case scrollBar_esc: 3719 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 3720 if (scrollbar_mapping (state))
3284 { 3721 {
3285 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 3723 scr_touch (true);
3287 } 3724 }
3288 break; 3725 break;
3289#endif 3726#endif
3290 case 25: /* visible/invisible cursor */ 3727 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 3728 scr_cursor_visible (state);
3292 break; 3729 break;
3293 /* case 35: - shift keys */ 3730 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 3731 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 3732 case 47: /* secondary screen */
3296 scr_change_screen (state); 3733 scr_change_screen (state);
3297 break; 3734 break;
3298 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3739 PrivateModes &= ~PrivMode_MouseX10;
3303 break; 3740 break;
3304#if 0 3741#if 0
3305 case 1001: 3742 case 1001:
3306 break; /* X11 mouse highlighting */ 3743 break; /* X11 mouse highlighting */
3307#endif 3744#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state) 3746 if (state)
3310 Options &= ~Opt_scrollTtyOutput; 3747 Options &= ~Opt_scrollTtyOutput;
3311 else 3748 else
3312 Options |= Opt_scrollTtyOutput; 3749 Options |= Opt_scrollTtyOutput;
3313 break; 3750 break;
3314 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
3315 if (state) 3752 if (state)
3316 Options |= Opt_scrollTtyKeypress; 3753 Options |= Opt_scrollTtyKeypress;
3317 else 3754 else
3318 Options &= ~Opt_scrollTtyKeypress; 3755 Options &= ~Opt_scrollTtyKeypress;
3319 break; 3756 break;
3320 case 1047: /* secondary screen w/ clearing */ 3757 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3758 if (Options & Opt_secondaryScreen)
3322 if (current_screen != PRIMARY) 3759 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 3760 scr_erase_screen (2);
3324 scr_change_screen (state); 3761 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 3762 break;
3763 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY)
3767 scr_erase_screen (2);
3768 break;
3769 default:
3770 break;
3328 } 3771 }
3329 } 3772 }
3330} 3773}
3331/*}}} */ 3774/*}}} */
3332 3775
3333/*{{{ process sgr sequences */ 3776/*{{{ process sgr sequences */
3334void 3777void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3778rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 3779{
3337 unsigned int i; 3780 unsigned int i;
3338 short rendset; 3781 short rendset;
3339 int rendstyle; 3782 int rendstyle;
3340 3783
3341 if (nargs == 0) 3784 if (nargs == 0)
3342 { 3785 {
3343 scr_rendition (0, ~RS_None); 3786 scr_rendition (0, ~RS_None);
3344 return; 3787 return;
3345 } 3788 }
3789
3346 for (i = 0; i < nargs; i++) 3790 for (i = 0; i < nargs; i++)
3347 { 3791 {
3348 rendset = -1; 3792 rendset = -1;
3349 switch (arg[i]) 3793 switch (arg[i])
3350 { 3794 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 3796 rendset = 0, rendstyle = ~RS_None;
3353 break; 3797 break;
3354 case 1: 3798 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 3799 rendset = 1, rendstyle = RS_Bold;
3356 break; 3800 break;
3801 //case 2: // faint or second colour
3357 case 4: 3802 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 3803 rendset = 1, rendstyle = RS_Uline;
3359 break; 3804 break;
3360 case 5: 3805 case 5: // slowly blinking
3806 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 3807 rendset = 1, rendstyle = RS_Blink;
3362 break; 3808 break;
3809 //case 6: // scoansi light background
3363 case 7: 3810 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 3811 rendset = 1, rendstyle = RS_RVid;
3812 break;
3813 case 8:
3814 // invisible. NYI
3815 break;
3816 //case 9: // crossed out
3817 //case 10: // scoansi acs off, primary font
3818 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font
3820 //...
3821 //case 19: // ninth alt font
3822 //case 20: // gothic
3823 case 21: // disable bold, faint
3824 rendset = 0, rendstyle = RS_Bold;
3365 break; 3825 break;
3366 case 22: 3826 case 22:
3367 rendset = 0, rendstyle = RS_Bold; 3827 rendset = 0, rendstyle = RS_Bold;
3368 break; 3828 break;
3829 //case 23: disable italic
3369 case 24: 3830 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3371 break; 3832 break;
3372 case 25: 3833 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3374 break; 3835 break;
3375 case 27: 3836 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 3837 rendset = 0, rendstyle = RS_RVid;
3377 break; 3838 break;
3839 //case 28: // visible. NYI
3840 //case 29: // not crossed-out
3378 } 3841 }
3842
3379 if (rendset != -1) 3843 if (rendset != -1)
3380 { 3844 {
3381 scr_rendition (rendset, rendstyle); 3845 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3846 continue; /* for (;i;) */
3383 } 3847 }
3384 3848
3385 switch (arg[i]) 3849 switch (arg[i])
3386 { 3850 {
3387 case 30: 3851 case 30:
… …
3390 case 33: 3854 case 33:
3391 case 34: 3855 case 34:
3392 case 35: 3856 case 35:
3393 case 36: 3857 case 36:
3394 case 37: 3858 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 3860 break;
3398#ifdef TTY_256COLOR 3861#ifdef TTY_256COLOR
3399 case 38: 3862 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3863 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3864 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 3866 i += 2;
3405 } 3867 }
3406 break; 3868 break;
3407#endif 3869#endif
3408 case 39: /* default fg */ 3870 case 39: /* default fg */
… …
3415 case 43: 3877 case 43:
3416 case 44: 3878 case 44:
3417 case 45: 3879 case 45:
3418 case 46: 3880 case 46:
3419 case 47: 3881 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 3883 break;
3423#ifdef TTY_256COLOR 3884#ifdef TTY_256COLOR
3424 case 48: 3885 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3886 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3887 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 3889 i += 2;
3430 } 3890 }
3431 break; 3891 break;
3432#endif 3892#endif
3433 case 49: /* default bg */ 3893 case 49: /* default bg */
… …
3441 case 93: 3901 case 93:
3442 case 94: 3902 case 94:
3443 case 95: 3903 case 95:
3444 case 96: 3904 case 96:
3445 case 97: 3905 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3907 Color_fg);
3448 break; 3908 break;
3449 case 100: 3909 case 100:
3450 case 101: /* set bright bg color */ 3910 case 101: /* set bright bg color */
3451 case 102: 3911 case 102:
3452 case 103: 3912 case 103:
3453 case 104: 3913 case 104:
3454 case 105: 3914 case 105:
3455 case 106: 3915 case 106:
3456 case 107: 3916 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3918 Color_bg);
3459 break; 3919 break;
3460#endif 3920#endif
3461 3921
3462 } 3922 }
3463 } 3923 }
3464} 3924}
3465/*}}} */ 3925/*}}} */
3466 3926
3467/*{{{ process Rob Nation's own graphics mode sequences */ 3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 3928void
3469rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3470{ 3930{
3471 unsigned char ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3472 3932
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3933 if (cmd == 'Q')
3475 { /* query graphics */ 3934 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3935 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3936 return;
3478 } 3937 }
3479 /* swallow other graphics sequences until terminating ':' */ 3938 /* swallow other graphics sequences until terminating ':' */
3480 do 3939 do
3481 ch = cmd_getc (); 3940 ch = cmd_getc ();
3482 while (ch != ':'); 3941 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} 3942}
3529/*}}} */ 3943/*}}} */
3530 3944
3531/* ------------------------------------------------------------------------- */ 3945/* ------------------------------------------------------------------------- */
3532 3946
3533/* 3947/*
3534 * Send printf() formatted output to the command. 3948 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3949 * Only use for small amounts of data.
3536 */ 3950 */
3537void 3951void
3538rxvt_term::tt_printf (const char *fmt,...) 3952rxvt_term::tt_printf (const char *fmt,...)
3539{ 3953{

Diff Legend

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