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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

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