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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.81 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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