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

Diff Legend

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