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.171 by root, Wed Dec 1 02:12:18 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 1225
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
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,
… …
1248 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1249 &data); 1338 &data);
1250 XChangeProperty (display->display, display->root, 1339 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1340 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1341 8, PropModeReplace,
1253 data, STRLEN (data)); 1342 data, strlen (data));
1343 XFree (data);
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1344 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1346 }
1257#endif /* OFFIX_DND */ 1347#endif /* OFFIX_DND */
1258 break; 1348 break;
1259 1349
1260 case MappingNotify: 1350 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1351 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1352 break;
1263 1353
1264 /* 1354 /*
1265 * XXX: this is not the _current_ arrangement 1355 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1356 * Here's my conclusion:
… …
1291 { 1381 {
1292 TermWin.focus = 1; 1382 TermWin.focus = 1;
1293 want_refresh = 1; 1383 want_refresh = 1;
1294#ifdef USE_XIM 1384#ifdef USE_XIM
1295 if (Input_Context != NULL) 1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1296 XSetICFocus (Input_Context); 1388 XSetICFocus (Input_Context);
1389 }
1297#endif 1390#endif
1298#ifdef CURSOR_BLINK 1391#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink) 1392 if (options & Opt_cursorBlink)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1301#endif 1401#endif
1302 1402
1303 } 1403 }
1304 break; 1404 break;
1305 1405
1306 case FocusOut: 1406 case FocusOut:
1307 if (TermWin.focus) 1407 if (TermWin.focus)
1308 { 1408 {
1309 TermWin.focus = 0; 1409 TermWin.focus = 0;
1310 want_refresh = 1; 1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1311#ifdef USE_XIM 1418#ifdef USE_XIM
1312 if (Input_Context != NULL) 1419 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context); 1420 XUnsetICFocus (Input_Context);
1314#endif 1421#endif
1315#ifdef CURSOR_BLINK 1422#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink) 1423 if (options & Opt_cursorBlink)
1317 cursor_blink_ev.stop (); 1424 cursor_blink_ev.stop ();
1318 hidden_cursor = 0; 1425 hidden_cursor = 0;
1319#endif 1426#endif
1320 1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1321 } 1434 }
1322 break; 1435 break;
1323 1436
1324 case ConfigureNotify: 1437 case ConfigureNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == TermWin.parent[0])
… …
1334 } 1447 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336 1449
1337 if (szHint.width != width || szHint.height != height) 1450 if (szHint.width != width || szHint.height != height)
1338 { 1451 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1452 seen_resize = 1;
1340 resize_all_windows (width, height, 1); 1453 resize_all_windows (width, height, 1);
1341 } 1454 }
1342#ifdef DEBUG_SIZE 1455
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent) 1457 if (options & Opt_transparent)
1350 { 1458 {
1351 check_our_parents (); 1459 check_our_parents ();
1352 if (am_transparent) 1460 if (am_transparent)
1353 want_full_refresh = 1; 1461 want_refresh = want_full_refresh = 1;
1354 } 1462 }
1355#endif 1463#endif
1356
1357 } 1464 }
1358 break; 1465 break;
1359 1466
1467 case PropertyNotify:
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break;
1473
1360 case SelectionClear: 1474 case SelectionClear:
1361 display->set_selection_owner (0); 1475 selection_clear ();
1362 break; 1476 break;
1363 1477
1364 case SelectionNotify: 1478 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1480 selection_paste (ev.xselection.requestor,
… …
1393 1507
1394 case GraphicsExpose: 1508 case GraphicsExpose:
1395 case Expose: 1509 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1510 if (ev.xany.window == TermWin.vt)
1397 { 1511 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1512 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1516
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1522
1406 // ev.xexpose.width, TermWin.height, False); 1523 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1524 }
1410 else 1525 else
1411 { 1526 {
1412 XEvent unused_event; 1527 XEvent unused_event;
1413 1528
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1415 Expose, 1530 ;
1416 &unused_event)) ;
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1418 GraphicsExpose, 1532 ;
1419 &unused_event)) ; 1533
1420 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1421 { 1535 {
1422 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1423 scrollbar_show (0); 1537 scrollbar_show (0);
1424 } 1538 }
1425#ifdef MENUBAR 1539#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1541 menubar_expose ();
1428#endif 1542#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1433 } 1548 }
1434 break; 1549 break;
1435 1550
1436 case MotionNotify: 1551 case MotionNotify:
1437#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1554 pointer_unblank ();
1440#endif 1555#endif
1441#if MENUBAR 1556#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1557 if (isMenuBarWindow (ev.xany.window))
1443 { 1558 {
1444 menubar_control (& (ev.xbutton)); 1559 menubar_control (ev.xbutton);
1445 break; 1560 break;
1446 } 1561 }
1447#endif 1562#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1564 break;
1450 1565
1451 if (ev.xany.window == TermWin.vt) 1566 if (ev.xany.window == TermWin.vt)
1452 { 1567 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1568 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1569 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1456 ; 1571 ;
1457 1572
1458 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (display->display, TermWin.vt,
1459 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1577 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1581 {
1467#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1470#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < TermWin.int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1473 { 1597 {
1474 int dist; 1598 int dist;
1475 1599
1476 pending_scroll_selection=1;
1477
1478 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
1480 */ 1602 */
1481 if (scroll_selection_delay<=0) 1603 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1605
1484 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1486 */ 1608 */
1487 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1612
1492 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < TermWin.int_bwidth)
1494 { 1615 {
1495 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = TermWin.int_bwidth - ev.xbutton.y;
1497 } 1618 }
1498 else 1619 else
1499 { 1620 {
1500 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y -
1502 (TermWin.int_bwidth + TermWin.height); 1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1503 } 1623 }
1624
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1506 MIN_IT (scroll_selection_lines, 1628 MIN_IT (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1508 } 1630 }
1509 else 1631 else
1510 { 1632 {
1511 /* we are within the text window, so we 1633 /* we are within the text window, so we
1512 * shouldn't be scrolling 1634 * shouldn't be scrolling
1513 */ 1635 */
1514 pending_scroll_selection = 0; 1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop();
1515 } 1638 }
1516#endif 1639#endif
1517#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1518
1519 } 1641 }
1520#endif 1642#endif
1521
1522 } 1643 }
1523 } 1644 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1646 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1527 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1528 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (display->display, scrollBar.win,
1529 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1655 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1657 scrollbar_size ());
1535 scr_refresh (refresh_type); 1658 scr_refresh (refresh_type);
1536 refresh_limit = 0; 1659 refresh_limit = 0;
… …
1538 } 1661 }
1539 break; 1662 break;
1540 } 1663 }
1541} 1664}
1542 1665
1666#if TRANSPARENT
1543void 1667void
1544rxvt_term::rootwin_cb (XEvent &ev) 1668rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1669{
1546 SET_R (this); 1670 SET_R (this);
1547 SET_LOCALE (locale); 1671 SET_LOCALE (locale);
1548 1672
1549 switch (ev.type) 1673 switch (ev.type)
1550 { 1674 {
1551 case PropertyNotify: 1675 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 /* 1676 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1677 * 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. 1678 * use the property to determine the pixmap. We use it later on.
1564 */ 1679 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1680 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1682
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1684 return;
1570 }
1571 1685
1572 /* FALLTHROUGH */ 1686 /* FALLTHROUGH */
1573 case ReparentNotify: 1687 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1689 want_refresh = want_full_refresh = 1;
1577 break; 1690 break;
1578#endif
1579 } 1691 }
1580} 1692}
1693#endif
1581 1694
1582void 1695void
1583rxvt_term::button_press (const XButtonEvent &ev) 1696rxvt_term::button_press (XButtonEvent &ev)
1584{ 1697{
1585 int reportmode = 0, clickintime; 1698 int reportmode = 0, clickintime;
1586 1699
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1701 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1702 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703
1590 /* 1704 /*
1591 * VT window processing of button press 1705 * VT window processing of button press
1592 */ 1706 */
1593 if (ev.window == TermWin.vt) 1707 if (ev.window == TermWin.vt)
1594 { 1708 {
1595#if RXVT_GRAPHICS 1709#if ISO_14755
1596 if (ev.subwindow != None) 1710 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1712 {
1599#endif 1713 iso14755_54 (ev.x, ev.y);
1600 1714 return;
1601 { 1715 }
1716#endif
1717
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1718 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1719
1603 if (reportmode) 1720 if (reportmode)
1721 {
1722 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state;
1725#ifdef MOUSE_REPORT_DOUBLECLICK
1726 if (ev.button == MEvent.button && clickintime)
1604 { 1727 {
1605 /* mouse report from vt window */ 1728 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1729 MEvent.clicks++;
1607 MEvent.state = ev.state; 1730 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1731 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1732 /* only report double clicks */
1616 MEvent.clicks = 2; 1733 MEvent.clicks = 2;
1617 mouse_report (ev); 1734 mouse_report (ev);
1618 1735
1619 /* don't report the release */ 1736 /* don't report the release */
1620 MEvent.clicks = 0; 1737 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1738 MEvent.button = AnyButton;
1622 }
1623 } 1739 }
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 } 1740 }
1637 else 1741 else
1638 { 1742 {
1743 /* different button, or time expired */
1744 MEvent.clicks = 1;
1745 MEvent.button = ev.button;
1746 mouse_report (ev);
1747 }
1748#else
1749 MEvent.button = ev.button;
1750 mouse_report (ev);
1751#endif /* MOUSE_REPORT_DOUBLECLICK */
1752
1753 }
1754 else
1755 {
1639 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1758
1641 switch (ev.button) 1759 switch (ev.button)
1642 { 1760 {
1643 case Button1: 1761 case Button1:
1762 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */
1764#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask);
1766#else
1767 selection.rect = false;
1768#endif
1769
1644 /* allow shift+left click to extend selection */ 1770 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1646 { 1772 {
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) 1773 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1774 selection_rotate (ev.x, ev.y);
1668 else 1775 else
1669 selection_extend (ev.x, ev.y, 1); 1776 selection_extend (ev.x, ev.y, 1);
1777 }
1778 else
1779 {
1780 if (MEvent.button == Button1 && clickintime)
1781 MEvent.clicks++;
1782 else
1783 MEvent.clicks = 1;
1784
1785 selection_click (MEvent.clicks, ev.x, ev.y);
1786 }
1787
1788 MEvent.button = Button1;
1789 break;
1790
1791 case Button3:
1792 if (MEvent.button == Button3 && clickintime)
1793 selection_rotate (ev.x, ev.y);
1794 else
1795 selection_extend (ev.x, ev.y, 1);
1796
1670 MEvent.button = Button3; 1797 MEvent.button = Button3;
1671 break; 1798 break;
1672 }
1673 } 1799 }
1800 }
1801
1674 MEvent.time = ev.time; 1802 MEvent.time = ev.time;
1675 return; 1803 return;
1676 }
1677 } 1804 }
1678 1805
1679 /* 1806 /*
1680 * Scrollbar window processing of button press 1807 * Scrollbar window processing of button press
1681 */ 1808 */
… …
1745 upordown = 1; /* down */ 1872 upordown = 1; /* down */
1746 } 1873 }
1747 if (upordown) 1874 if (upordown)
1748 { 1875 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1878#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1879 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1880 {
1754 if (upordown < 0) 1881 if (upordown < 0)
1755 scrollBar.setUp (); 1882 scrollBar.setUp ();
… …
1771 break; 1898 break;
1772 case R_SB_ALIGN_BOTTOM: 1899 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1900 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1901 break;
1775 } 1902 }
1903
1776 if (scrollBar.style == R_SB_XTERM 1904 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1905 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1906 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1907 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1908
1781 scrollBar.setMotion (); 1909 scrollBar.setMotion ();
1782 break; 1910 break;
1783 1911
1784 case Button1: 1912 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1913 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1809 scr_page ((ev.button == Button1 ? DN : UP), 1937 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 1938 (TermWin.nrow
1811 * scrollbar_position (ev.y) 1939 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 1940 / scrollbar_size ()));
1813 } 1941 }
1942
1814 break; 1943 break;
1815 } 1944 }
1816 } 1945 }
1817 return; 1946 return;
1818 } 1947 }
… …
1824 menubar_control (ev); 1953 menubar_control (ev);
1825#endif 1954#endif
1826} 1955}
1827 1956
1828void 1957void
1829rxvt_term::button_release (const XButtonEvent &ev) 1958rxvt_term::button_release (XButtonEvent &ev)
1830{ 1959{
1831 int reportmode = 0; 1960 int reportmode = 0;
1832 1961
1833 csrO = 0; /* reset csr Offset */ 1962 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1963 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1964 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 1965
1837 if (scrollbar_isUpDn ()) 1966 if (scrollbar_isUpDn ())
1838 { 1967 {
1839 scrollBar.setIdle (); 1968 scrollBar.setIdle ();
1840 scrollbar_show (0); 1969 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 1971 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 1972#endif
1844
1845 } 1973 }
1974
1846#ifdef SELECTION_SCROLLING 1975#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop();
1848#endif 1978#endif
1979
1849 if (ev.window == TermWin.vt) 1980 if (ev.window == TermWin.vt)
1850 { 1981 {
1851#ifdef RXVT_GRAPHICS 1982#if ISO_14755
1852 if (ev.subwindow != None) 1983 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 1985 return;
1855#endif 1986#endif
1856
1857 {
1858 if (reportmode) 1987 if (reportmode)
1988 {
1989 /* mouse report from vt window */
1990 /* don't report release of wheel "buttons" */
1991 if (ev.button >= 4)
1992 return;
1993#ifdef MOUSE_REPORT_DOUBLECLICK
1994 /* only report the release of 'slow' single clicks */
1995 if (MEvent.button != AnyButton
1996 && (ev.button != MEvent.button
1997 || (ev.time - MEvent.time
1998 > MULTICLICK_TIME / 2)))
1859 { 1999 {
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; 2000 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2001 MEvent.button = AnyButton;
1877 mouse_report (ev); 2002 mouse_report (ev);
2003 }
2004#else /* MOUSE_REPORT_DOUBLECLICK */
2005 MEvent.button = AnyButton;
2006 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2007#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2008 return;
1880 } 2009 }
2010
1881 /* 2011 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2012 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2013 * when overriding mouse reporting
1884 */ 2014 */
1885 if (PrivateModes & PrivMode_mouse_report 2015 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2016 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2017 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2018 selection_extend (ev.x, ev.y, 0);
1889 2019
1890 switch (ev.button) 2020 switch (ev.button)
2021 {
2022 case Button1:
2023 case Button3:
2024 selection_make (ev.time);
2025 break;
2026 case Button2:
2027 selection_request (ev.time, ev.x, ev.y);
2028 break;
2029#ifdef MOUSE_WHEEL
2030 case Button4:
2031 case Button5:
1891 { 2032 {
1892 case Button1: 2033 int i;
1893 case Button3: 2034 page_dirn v;
1894 selection_make (ev.time); 2035
2036 v = ev.button == Button4 ? UP : DN;
2037
2038 if (ev.state & ShiftMask)
1895 break; 2039 i = 1;
1896 case Button2: 2040 else if (options & Opt_mouseWheelScrollPage)
1897 selection_request (ev.time, ev.x, ev.y); 2041 i = TermWin.nrow - 1;
2042 else
1898 break; 2043 i = 5;
2044
1899#ifdef MOUSE_WHEEL 2045# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2046 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2047 {
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); 2048 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2051
2052 if (slip_wheel_ev.at < NOW)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054
2055 slip_wheel_ev.start ();
1918 } 2056 }
2057 else
2058 {
1919# endif 2059# endif
1920# ifdef JUMP_MOUSE_WHEEL 2060# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2061 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2062 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2063 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2067 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2068 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2069 scrollbar_show (1);
1930 } 2070 }
1931# endif 2071# endif
1932 2072# ifdef MOUSE_SLIP_WHEELING
1933 } 2073 }
1934 break;
1935#endif 2074#endif
1936
1937 } 2075 }
2076 break;
2077#endif
1938 } 2078 }
1939 } 2079 }
1940#ifdef MENUBAR 2080#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2081 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2082 menubar_control (ev);
1943#endif 2083#endif
1944} 2084}
1945 2085
1946
1947#ifdef TRANSPARENT 2086#ifdef TRANSPARENT
2087#if TINTING
2088/* taken from aterm-0.4.2 */
2089
2090typedef uint32_t RUINT32T;
2091
2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2093{
2094 int sh_r, sh_g, sh_b;
2095 RUINT32T mask_r, mask_g, mask_b;
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
2100
2101 Visual* visual = display->visual;
2102
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104
2105 /* for convenience */
2106 mask_r = visual->red_mask;
2107 mask_g = visual->green_mask;
2108 mask_b = visual->blue_mask;
2109
2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2183 } else {
2184 if (shade < 0) shade = 0;
2185 if (shade > 100) shade = 100;
2186
2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2188
2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2192 }
2193
2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2196 {
2197 unsigned int tmp;
2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2250 }
2251 break;
2252 }
2253 case 16:
2254 {
2255 unsigned short *p1, *pf, *p, *pl;
2256 p1 = (unsigned short *) srcImage->data;
2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2258 while (p1 < pf)
2259 {
2260 p = p1;
2261 pl = p1 + srcImage->width;
2262 for (; p < pl; p++)
2263 {
2264 *p = lookup_r[(*p & 0xf800)>>11] |
2265 lookup_g[(*p & 0x07e0)>> 5] |
2266 lookup_b[(*p & 0x001f)];
2267 }
2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2288 }
2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2296
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xff0000)>>16] |
2304 lookup_g[(*p & 0x00ff00)>> 8] |
2305 lookup_b[(*p & 0x0000ff)] |
2306 (*p & ~0xffffff);
2307 }
2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2309 }
2310 break;
2311 }
2312 }
2313
2314 free (lookup);
2315}
2316#endif
2317
1948/* 2318/*
1949 * Check our parents are still who we think they are. 2319 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2320 * Do transparency updates if required
1951 */ 2321 */
1952int 2322int
1953rxvt_term::check_our_parents () 2323rxvt_term::check_our_parents ()
1954{ 2324{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2325 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2326 unsigned long nitems, bytes_after;
1957 Atom atype; 2327 Atom atype;
1958 unsigned char *prop = NULL; 2328 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2329 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2330 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2331 XWindowAttributes wattr, wrootattr;
1962 2332
1963 pchanged = 0; 2333 pchanged = 0;
1964 2334
1965 if (! (Options & Opt_transparent)) 2335 if (!(options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2336 return pchanged; /* Don't try any more */
1967 2337
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2339 rootdepth = wrootattr.depth;
1970 2340
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2342
1972 if (rootdepth != wattr.depth) 2343 if (rootdepth != wattr.depth)
1973 { 2344 {
1974 if (am_transparent) 2345 if (am_transparent)
1975 { 2346 {
1976 pchanged = 1; 2347 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2349 am_transparent = am_pixmap_trans = 0;
1980 } 2350 }
2351
1981 return pchanged; /* Don't try any more */ 2352 return pchanged; /* Don't try any more */
1982 } 2353 }
1983 2354
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2355 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2356 XSync (display->display, False);
… …
1987 /* 2358 /*
1988 * Make the frame window set by the window manager have 2359 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2360 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2361 * windows for each client, so we have to take care about that.
1991 */ 2362 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2363 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2366 &nitems, &bytes_after, &prop) == Success);
2367
1996 if (!i || prop == NULL) 2368 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success);
2373
2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
1997 have_pixmap = 0; 2379 have_pixmap = 0;
1998 else 2380 else
1999 { 2381 {
2000 have_pixmap = 1; 2382 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2383 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2384 XFree (prop);
2003 } 2385 }
2386
2004 if (have_pixmap) 2387 if (have_pixmap)
2005 { 2388 {
2006 /* 2389 /*
2007 * Copy display->root pixmap transparency 2390 * Copy display->root pixmap transparency
2008 */ 2391 */
2009 int sx, sy, nx, ny; 2392 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2393 unsigned int nw, nh;
2011 Window cr; 2394 Window cr;
2012 XImage *image; 2395 XImage *image;
2013 GC gc; 2396 GC gc;
2014 XGCValues gcvalue; 2397 XGCValues gcvalue;
2015 2398
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2400 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2401 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2402 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2403 nx = ny = 0;
2404
2021 if (sx < 0) 2405 if (sx < 0)
2022 { 2406 {
2023 nw += sx; 2407 nw += sx;
2024 nx = -sx; 2408 nx = -sx;
2025 sx = 0; 2409 sx = 0;
2026 } 2410 }
2411
2027 if (sy < 0) 2412 if (sy < 0)
2028 { 2413 {
2029 nh += sy; 2414 nh += sy;
2030 ny = -sy; 2415 ny = -sy;
2031 sy = 0; 2416 sy = 0;
2032 } 2417 }
2418
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2421 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2423
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2425 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2426 allowedxerror = 0;
2427
2041 if (image == NULL) 2428 if (image == NULL)
2042 { 2429 {
2043 if (am_transparent && am_pixmap_trans) 2430 if (am_transparent && am_pixmap_trans)
2044 { 2431 {
2045 pchanged = 1; 2432 pchanged = 1;
… …
2047 { 2434 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2436 TermWin.pixmap = None;
2050 } 2437 }
2051 } 2438 }
2439
2052 am_pixmap_trans = 0; 2440 am_pixmap_trans = 0;
2053 } 2441 }
2054 else 2442 else
2055 { 2443 {
2056 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2445 XFreePixmap (display->display, TermWin.pixmap);
2446
2447#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint))
2449 {
2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2452
2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2454
2455 ShadeXImage (display, image, shade, rm, gm, bm);
2456 }
2457#endif
2458
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2460 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2463 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2464 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2465 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2069 TermWin.pixmap); 2467 XClearWindow (display->display, TermWin.parent[0]);
2468
2070 if (!am_transparent || !am_pixmap_trans) 2469 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2470 pchanged = 1;
2471
2072 am_transparent = am_pixmap_trans = 1; 2472 am_transparent = am_pixmap_trans = 1;
2073 } 2473 }
2074 } 2474 }
2475
2075 if (!am_pixmap_trans) 2476 if (!am_pixmap_trans)
2076 { 2477 {
2077 unsigned int n; 2478 unsigned int n;
2078 /* 2479 /*
2079 * InheritPixmap transparency 2480 * InheritPixmap transparency
2080 */ 2481 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2483 {
2085 oldp = TermWin.parent[i]; 2484 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2486 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2487 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2488
2090 if (TermWin.parent[i] == display->root) 2489 if (TermWin.parent[i] == display->root)
2091 { 2490 {
2092 if (oldp != None) 2491 if (oldp != None)
2093 pchanged = 1; 2492 pchanged = 1;
2493
2094 break; 2494 break;
2095 } 2495 }
2496
2096 if (oldp != TermWin.parent[i]) 2497 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2498 pchanged = 1;
2098 } 2499 }
2500
2099 n = 0; 2501 n = 0;
2502
2100 if (pchanged) 2503 if (pchanged)
2101 { 2504 {
2102 for (; n < (unsigned int)i; n++) 2505 for (; n < (unsigned int)i; n++)
2103 { 2506 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2507 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) 2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2509 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2511 break;
2110 } 2512 }
2111 } 2513 }
2112 } 2514 }
2113 if (n > (int) (sizeof (TermWin.parent) 2515
2114 / sizeof (TermWin.parent[0]))) 2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2517 {
2116 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2520 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2521 /* XXX: also turn off Opt_transparent? */
2123 } 2522 }
2124 else 2523 else
2125 { 2524 {
2525#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2526 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2527 * 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); 2528 sleep (1);
2136# endif 2529#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2535
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2537 am_transparent = 1;
2144 } 2538 }
2539
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2541 TermWin.parent[i] = None;
2147 } 2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2549 }
2550
2148 return pchanged; 2551 return pchanged;
2149} 2552}
2150#endif 2553#endif
2151 2554
2152/*}}} */ 2555/*}}} */
2556
2557bool
2558rxvt_term::cmd_parse ()
2559{
2560 bool flag = false;
2561 unicode_t ch = NOCHAR;
2562 unsigned char *seq_begin; // remember start of esc-sequence here
2563
2564 for (;;)
2565 {
2566 if (ch == NOCHAR)
2567 {
2568 seq_begin = cmdbuf_ptr;
2569 ch = next_char ();
2570 }
2571
2572 if (ch == NOCHAR) // TODO: improve
2573 break;
2574
2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 {
2577 if (!seen_input)
2578 {
2579 seen_input = 1;
2580 // many badly-written programs (e.g. jed) contain a race condition:
2581 // they first read the screensize and then install a SIGWINCH handler.
2582 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized.
2587 if (seen_resize)
2588 kill (-cmd_pid, SIGWINCH);
2589 }
2590
2591 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false;
2594 int nlines = 0;
2595 unicode_t *str = buf;
2596
2597 for (;;)
2598 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break;
2601
2602 *str++ = ch;
2603
2604 if (ch == C0_LF)
2605 {
2606 nlines++;
2607 refresh_count++;
2608
2609 if (!(options & Opt_jumpScroll)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2611 {
2612 refreshnow = true;
2613 ch = NOCHAR;
2614 break;
2615 }
2616
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2618 if (nlines >= TermWin.nrow - 1)
2619 {
2620 scr_add_lines (buf, nlines, str - buf);
2621 nlines = 0;
2622 str = buf;
2623 }
2624 }
2625
2626 if (str >= buf + UBUFSIZ)
2627 {
2628 ch = NOCHAR;
2629 break;
2630 }
2631
2632 seq_begin = cmdbuf_ptr;
2633 ch = next_char ();
2634 }
2635
2636 scr_add_lines (buf, nlines, str - buf);
2637
2638 /*
2639 * If there have been a lot of new lines, then update the screen
2640 * What the heck I'll cheat and only refresh less than every page-full.
2641 * the number of pages between refreshes is refresh_limit, which
2642 * is incremented here because we must be doing flat-out scrolling.
2643 */
2644 if (refreshnow)
2645 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++;
2648 else
2649 {
2650 flag = true;
2651 scr_refresh (refresh_type);
2652 }
2653 }
2654
2655 }
2656 else
2657 {
2658 try
2659 {
2660 process_nonprinting (ch);
2661 }
2662 catch (const class out_of_input &o)
2663 {
2664 // we ran out of input, retry later
2665 cmdbuf_ptr = seq_begin;
2666 break;
2667 }
2668
2669 ch = NOCHAR;
2670 }
2671 }
2672
2673 return flag;
2674}
2675
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2685// read the next character
2686unicode_t
2687rxvt_term::next_char ()
2688{
2689 while (cmdbuf_ptr < cmdbuf_endp)
2690 {
2691 // assume 7-bit to be ascii ALWAYS
2692 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2693 return *cmdbuf_ptr++;
2694
2695 wchar_t wc;
2696 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2697
2698 if (len == (size_t)-2)
2699 {
2700 // the mbstate stores incomplete sequences. didn't know this :/
2701 cmdbuf_ptr = cmdbuf_endp;
2702 break;
2703 }
2704
2705 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707
2708 // assume wchar == unicode
2709 cmdbuf_ptr += len;
2710 return wc;
2711 }
2712
2713 return NOCHAR;
2714}
2715
2716/* rxvt_cmd_getc () - Return next input character */
2717/*
2718 * Return the next input character after first passing any keyboard input
2719 * to the command.
2720 */
2721unicode_t
2722rxvt_term::cmd_getc ()
2723{
2724 unicode_t c = next_char ();
2725
2726 if (c == NOCHAR)
2727 throw out_of_input;
2728
2729 return c;
2730}
2731
2732unicode_t
2733rxvt_term::cmd_get8 ()
2734{
2735 unicode_t c = next_octet ();
2736
2737 if (c == NOCHAR)
2738 throw out_of_input;
2739
2740 return c;
2741}
2153 2742
2154/*{{{ print pipe */ 2743/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2744/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2745#ifdef PRINTPIPE
2157FILE * 2746FILE *
2158rxvt_term::popen_printer () 2747rxvt_term::popen_printer ()
2159{ 2748{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2749 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2750
2162 if (stream == NULL) 2751 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2752 rxvt_warn ("can't open printer pipe, not printing.\n");
2753
2164 return stream; 2754 return stream;
2165} 2755}
2166 2756
2167int 2757int
2168rxvt_term::pclose_printer (FILE *stream) 2758rxvt_term::pclose_printer (FILE *stream)
2169{ 2759{
2170 fflush (stream); 2760 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); 2761 return pclose (stream);
2177# endif
2178} 2762}
2179 2763
2180/* 2764/*
2181 * simulate attached vt100 printer 2765 * simulate attached vt100 printer
2182 */ 2766 */
2183void 2767void
2184rxvt_term::process_print_pipe () 2768rxvt_term::process_print_pipe ()
2185{ 2769{
2186 int done; 2770 int done;
2187 FILE *fd; 2771 FILE *fd;
2188 2772
2189 if ((fd = popen_printer ()) == NULL) 2773 if ((fd = popen_printer ()) == NULL)
2190 return; 2774 return;
2191 2775
2192 /* 2776 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2777 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2778 * is received.
2195 */ 2779 */
2196 for (done = 0; !done;) 2780 for (done = 0; !done;)
2197 { 2781 {
2198 unsigned char buf[8]; 2782 unsigned char buf[8];
2199 unsigned char ch; 2783 unicode_t ch;
2200 unsigned int i, len; 2784 unsigned int i, len;
2201 2785
2202 if ((ch = cmd_getc ()) != C0_ESC) 2786 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2787 {
2204 if (putc (ch, fd) == EOF) 2788 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2789 break; /* done = 1 */
… …
2220 { 2804 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2805 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2806 break; /* done = 1 */
2223 } 2807 }
2224 } 2808 }
2809
2225 for (i = 0; i < len; i++) 2810 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2811 if (putc (buf[i], fd) == EOF)
2227 { 2812 {
2228 done = 1; 2813 done = 1;
2229 break; 2814 break;
2230 } 2815 }
2231 } 2816 }
2232 } 2817 }
2818
2233 pclose_printer (fd); 2819 pclose_printer (fd);
2234} 2820}
2235#endif /* PRINTPIPE */ 2821#endif /* PRINTPIPE */
2236/*}}} */ 2822/*}}} */
2237 2823
2238/* *INDENT-OFF* */ 2824/* *INDENT-OFF* */
2239enum { 2825enum {
2240 C1_40 = 0x40, 2826 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2827 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, 2828 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, 2829 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 2830 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2831};
2246/* *INDENT-ON* */ 2832/* *INDENT-ON* */
2247 2833
2248/*{{{ process non-printing single characters */ 2834/*{{{ process non-printing single characters */
2249void 2835void
2250rxvt_term::process_nonprinting (unsigned char ch) 2836rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2837{
2252 switch (ch) 2838 switch (ch)
2253 { 2839 {
2840 case C0_ESC:
2841 process_escape_seq ();
2842 break;
2254 case C0_ENQ: /* terminal Status */ 2843 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2844 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2259 else 2847 else
2260 tt_write ((unsigned char *)VT100_ANS, 2848 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2849 (unsigned int)strlen (VT100_ANS));
2262 break; 2850 break;
2263 case C0_BEL: /* bell */ 2851 case C0_BEL: /* bell */
2264 scr_bell (); 2852 scr_bell ();
2265 break; 2853 break;
2266 case C0_BS: /* backspace */ 2854 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2869 scr_charset_choose (1);
2282 break; 2870 break;
2283 case C0_SI: /* shift in - acs */ 2871 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2872 scr_charset_choose (0);
2285 break; 2873 break;
2874
2875#ifdef EIGHT_BIT_CONTROLS
2876 // 8-bit controls
2877 case 0x90: /* DCS */
2878 process_dcs_seq ();
2879 break;
2880 case 0x9b: /* CSI */
2881 process_csi_seq ();
2882 break;
2883 case 0x9d: /* CSI */
2884 process_osc_seq ();
2885 break;
2886#endif
2286 } 2887 }
2287} 2888}
2288/*}}} */ 2889/*}}} */
2289 2890
2290 2891
2291/*{{{ process VT52 escape sequences */ 2892/*{{{ process VT52 escape sequences */
2292void 2893void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2894rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2895{
2295 int row, col; 2896 int row, col;
2296 2897
2297 switch (ch) 2898 switch (ch)
2298 { 2899 {
… …
2350 2951
2351/*{{{ process escape sequences */ 2952/*{{{ process escape sequences */
2352void 2953void
2353rxvt_term::process_escape_seq () 2954rxvt_term::process_escape_seq ()
2354{ 2955{
2355 unsigned char ch = cmd_getc (); 2956 unicode_t ch = cmd_getc ();
2356 2957
2357 if (PrivateModes & PrivMode_vt52) 2958 if (priv_modes & PrivMode_vt52)
2358 { 2959 {
2359 process_escape_vt52 (ch); 2960 process_escape_vt52 (ch);
2360 return; 2961 return;
2361 } 2962 }
2362 2963
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2978 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2979 break;
2379 case '+': 2980 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2981 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2982 break;
2382#ifdef MULTICHAR_SET 2983#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': 2984 case '6':
2389 scr_backindex (); 2985 scr_backindex ();
2390 break; 2986 break;
2391#endif 2987#endif
2392 case '7': 2988 case '7':
2393 scr_cursor (SAVE); 2989 scr_cursor (SAVE);
2394 break; 2990 break;
2395 case '8': 2991 case '8':
2396 scr_cursor (RESTORE); 2992 scr_cursor (RESTORE);
2397 break; 2993 break;
2398#ifndef NO_FRILLS 2994#if ENABLE_FRILLS
2399 case '9': 2995 case '9':
2400 scr_forwardindex (); 2996 scr_forwardindex ();
2401 break; 2997 break;
2402#endif 2998#endif
2403 case '=': 2999 case '=':
… …
2413 break; 3009 break;
2414 3010
2415 /* 8.3.87: NEXT LINE */ 3011 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3012 case C1_NEL: /* ESC E */
2417 { 3013 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3014 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3015 scr_add_lines (nlcr, 1, 2);
2420 } 3016 }
2421 break; 3017 break;
2422 3018
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3019 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3030 case C1_RI: /* ESC M */
2435 scr_index (DN); 3031 scr_index (DN);
2436 break; 3032 break;
2437 3033
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3034 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3035 /*case C1_SS2: scr_single_shift (2); break; */
2440 3036
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3037 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3038 /*case C1_SS3: scr_single_shift (3); break; */
2443 3039
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3040 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3041 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3042 process_dcs_seq ();
2447 break; 3043 break;
… …
2462 process_osc_seq (); 3058 process_osc_seq ();
2463 break; 3059 break;
2464 3060
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3061 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3062 case 'c':
3063 mbstate.reset ();
2467 scr_poweron (); 3064 scr_poweron ();
2468 scrollbar_show (1); 3065 scrollbar_show (1);
2469 break; 3066 break;
2470 3067
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3068 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3080
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3081/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3082/* *INDENT-OFF* */
2486enum { 3083enum {
2487 CSI_ICH = 0x40, 3084 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3085 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 , 3086 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, 3087 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, 3088 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, 3089 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, 3090 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, */ 3105 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, [, \, ], ^, _, */ 3106 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, */ 3107 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, */ 3108 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, */ 3109 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, {, |, }, ~, */ 3110 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3111 };
2515/* *INDENT-ON* */ 3112/* *INDENT-ON* */
2516 3113
2517void 3114void
2518rxvt_term::process_csi_seq () 3115rxvt_term::process_csi_seq ()
2519{ 3116{
2520 unsigned char ch, priv, i; 3117 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3118 unsigned int nargs, p;
2522 int n, ndef; 3119 int n, ndef;
2523 int arg[ESC_ARGS]; 3120 int arg[ESC_ARGS];
2524 3121
2525 for (nargs = ESC_ARGS; nargs > 0;) 3122 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3123 arg[--nargs] = 0;
2527 3124
2528 priv = 0; 3125 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3127 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3128 { /* '<' '=' '>' '?' */
2532 priv = ch; 3129 priv = ch;
2533 ch = cmd_getc (); 3130 ch = cmd_getc ();
2534 } 3131 }
3132
2535 /* read any numerical arguments */ 3133 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3134 for (n = -1; ch < CSI_ICH; )
2537 { 3135 {
2538 if (isdigit (ch)) 3136 if (isdigit (ch))
2539 { 3137 {
… …
2546 { 3144 {
2547 if (nargs < ESC_ARGS) 3145 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3146 arg[nargs++] = n;
2549 n = -1; 3147 n = -1;
2550 } 3148 }
2551 else if (ch == '\b') 3149 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); 3150 process_nonprinting (ch);
2563 } 3151
2564 ch = cmd_getc (); 3152 ch = cmd_getc ();
2565 } 3153 }
2566 3154
2567 if (ch > CSI_7F) 3155 if (ch > CSI_7F)
2568 return; 3156 return;
… …
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2711 break; 3299 break;
2712 3300
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3302 tt_write ((const unsigned char *)VT100_ANS,
2715 (unsigned int) (sizeof (VT100_ANS) - 1)); 3303 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3304 break;
2717 3305
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3307 process_sgr_mode (nargs, arg);
2720 break; 3308 break;
… …
2726 tt_printf ("\033[0n"); 3314 tt_printf ("\033[0n");
2727 break; 3315 break;
2728 case 6: /* CPR requested */ 3316 case 6: /* CPR requested */
2729 scr_report_position (); 3317 scr_report_position ();
2730 break; 3318 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3319 case 7: /* unofficial extension */
3320 if (options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3321 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3322 break;
2735#endif
2736 case 8: /* unofficial extension */ 3323 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3325 break;
2739 } 3326 }
2740 break; 3327 break;
2741 3328
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3329 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3362 break;
2776 3363
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3364 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3365 if (arg[0] == 4)
2779 scr_insert_mode (0); 3366 scr_insert_mode (0);
3367 else if (arg[0] == 20)
3368 priv_modes &= ~PrivMode_LFNL;
2780 break; 3369 break;
2781 3370
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3371 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3372 if (arg[0] == 4)
2784 scr_insert_mode (1); 3373 scr_insert_mode (1);
3374 else if (arg[0] == 20)
3375 priv_modes |= PrivMode_LFNL;
2785 break; 3376 break;
2786 3377
2787 /* 3378 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3379 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3380 */
… …
2801 break; 3392 break;
2802 case CSI_75: 3393 case CSI_75:
2803 scr_cursor (RESTORE); 3394 scr_cursor (RESTORE);
2804 break; 3395 break;
2805 3396
2806#ifndef NO_FRILLS 3397#if ENABLE_FRILLS
2807 case CSI_74: 3398 case CSI_74:
2808 process_window_ops (arg, nargs); 3399 process_window_ops (arg, nargs);
2809 break; 3400 break;
2810#endif 3401#endif
2811 3402
2812 case CSI_78: /* DECREQTPARM */ 3403 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3404 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3405 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3406 break;
2816 3407
2817 default: 3408 default:
2818 break; 3409 break;
2819 } 3410 }
2820} 3411}
2821/*}}} */ 3412/*}}} */
2822 3413
2823#ifndef NO_FRILLS 3414#if ENABLE_FRILLS
2824/* ARGSUSED */ 3415/* ARGSUSED */
2825void 3416void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3417rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3418{
2828 int x, y; 3419 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3420 XWindowAttributes wattr;
2833 Window wdummy; 3421 Window wdummy;
2834 3422
2835 if (nargs == 0) 3423 if (nargs == 0)
2836 return; 3424 return;
3425
2837 switch (args[0]) 3426 switch (args[0])
2838 { 3427 {
2839 /* 3428 /*
2840 * commands 3429 * commands
2841 */ 3430 */
2842 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3433 break;
2845 case 2: /* iconify window */ 3434 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3452 break;
2864 case 8: /* set size (chars) */ 3453 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3455 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3456 break;
3457
3458 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3459 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3460 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3461 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3462 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3463 break;
3464
3465
2873 /* 3466 /*
2874 * reports - some output format copied from XTerm 3467 * reports - some output format copied from XTerm
2875 */ 3468 */
2876 case 11: /* report window state */ 3469 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3472 break;
2880 case 13: /* report window position */ 3473 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3476 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3477 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3478 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3479 break;
2887 case 14: /* report window size (pixels) */ 3480 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3483 break;
2891 case 18: /* report window size (chars) */ 3484 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3486 break;
2894#if 0 /* XXX: currently disabled due to security concerns */ 3487 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break;
2895 case 20: /* report icon label */ 3490 case 20: /* report icon label */
3491 {
3492 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3493 XGetIconName (display->display, TermWin.parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s);
3496 }
2898 break; 3497 break;
2899 case 21: /* report window title */ 3498 case 21: /* report window title */
3499 {
3500 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3501 XFetchName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s);
3504 }
2902 break; 3505 break;
2903#endif
2904
2905 } 3506 }
2906} 3507}
2907#endif 3508#endif
2908 3509
2909/*----------------------------------------------------------------------*/ 3510/*----------------------------------------------------------------------*/
2910/* 3511/*
2911 * get input up until STRING TERMINATOR (or BEL) 3512 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3513 * ends_how is terminator used. returned input must be free()'d
2913 */ 3514 */
2914unsigned char * 3515unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3516rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3517{
2917 int seen_esc = 0; /* seen escape? */ 3518 unicode_t seen_esc = 0, ch;
2918 unsigned int n = 0; 3519 unsigned int n = 0;
2919 unsigned char *s; 3520 unsigned char *s;
2920 unsigned char ch, string[STRING_MAX]; 3521 unsigned char string[STRING_MAX];
2921 3522
2922 for (; (ch = cmd_getc ());) 3523 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3524 {
2924 if (ch == C0_BEL 3525 if (seen_esc)
2925 || ch == CHAR_ST 3526 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3527 if (ch == 0x5c) /* 7bit ST */
2927 break; 3528 break;
3529 else
3530 return NULL;
3531 }
2928 if (ch == C0_ESC) 3532 else if (ch == C0_ESC)
2929 { 3533 {
2930 seen_esc = 1; 3534 seen_esc = 1;
2931 continue; 3535 continue;
2932 } 3536 }
2933 else if (ch == '\t') 3537 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3538 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3539 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3540 return NULL; /* other control character - exit */
3541
3542 seen_esc = 0;
3543
2937 if (n < sizeof (string) - 1) 3544 if (n >= sizeof (string) - 1)
3545 // stop at some sane length
3546 return NULL;
3547
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
2938 string[n++] = ch; 3551 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3552 }
3553
2941 string[n++] = '\0'; 3554 string[n++] = '\0';
3555
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3557 return NULL;
3558
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3560 strncpy (s, string, n);
2946 return s; 3561 return s;
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 = XInternAtom (display->display, str + 1, True);
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 XChangeProperty (display->display, TermWin.parent[0],
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 }
3705 else
3706 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str));
3708 }
3709 break;
3710
3041 case XTerm_Color: 3711 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3712 for (buf = (char *)str; buf && *buf;)
3043 { 3713 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3714 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3715 break;
3716
3046 *name++ = '\0'; 3717 *name++ = '\0';
3047 color = atoi (buf); 3718 color = atoi (buf);
3719
3048 if (color < 0 || color >= TOTAL_COLORS) 3720 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3721 break;
3722
3050 if ((buf = STRCHR (name, ';')) != NULL) 3723 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3724 *buf++ = '\0';
3725
3726 if (name[0] == '?' && !name[1])
3727 {
3728 unsigned short r, g, b;
3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3731 }
3732 else
3052 set_window_color (color + minCOLOR, name); 3733 set_window_color (color + minCOLOR, name);
3053 } 3734 }
3735 break;
3736 case XTerm_Color00:
3737 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3738 break;
3739 case XTerm_Color01:
3740 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3741 break;
3055#ifndef NO_CURSORCOLOR 3742#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3743 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3744 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3745 break;
3059#endif 3746#endif
3060 case XTerm_Color_pointer: 3747 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3748 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3749 break;
3750 case XTerm_Color_pointer_bg:
3751 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3752 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3753#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3754 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3066 break; 3759 break;
3067 case XTerm_Color_UL: 3760 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3762 break;
3070 case XTerm_Color_RV: 3763 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3765 break;
3073#endif 3766#endif
3074 3767#if TRANSPARENT && TINTING
3075 case XTerm_Menu: 3768 case XTerm_Color_tint:
3076 /* 3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3077 * rxvt_menubar_dispatch () violates the constness of the string, 3770 check_our_parents ();
3078 * so DON'T do it here 3771 if (am_transparent)
3079 */ 3772 want_full_refresh = want_refresh = 1;
3080 break; 3773 break;
3774#endif
3775
3081 case XTerm_Pixmap: 3776 case XTerm_Pixmap:
3082 if (*str != ';') 3777 if (*str != ';')
3083 { 3778 {
3084#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3780 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3781 set_bgPixmap (str); /* change pixmap */
3087#endif 3782#endif
3088 scr_touch (true); 3783 scr_touch (true);
3089 } 3784 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3785 while ((str = strchr (str, ';')) != NULL)
3091 { 3786 {
3092 str++; 3787 str++;
3093#if XPM_BACKGROUND 3788#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3789 changed += scale_pixmap (str);
3095#endif 3790#endif
… …
3108 set_window_color (Color_fg, str); 3803 set_window_color (Color_fg, str);
3109 break; 3804 break;
3110 case XTerm_restoreBG: 3805 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3806 set_window_color (Color_bg, str);
3112 break; 3807 break;
3808
3113 case XTerm_logfile: 3809 case XTerm_logfile:
3810 // TODO, when secure mode?
3114 break; 3811 break;
3812
3115 case XTerm_font: 3813 case XTerm_font:
3116 change_font (0, str); 3814 op = URxvt_font;
3815 case URxvt_font:
3816#if ENABLE_STYLES
3817 case URxvt_boldFont:
3818 case URxvt_italicFont:
3819 case URxvt_boldItalicFont:
3820#endif
3821 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3825 resp);
3826 else
3827 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829
3830 res = strdup (str);
3831 allocated.push_back ((void *)res);
3832 set_fonts ();
3833 }
3834 break;
3835
3836#if ENABLE_FRILLS
3837 case XTerm_locale:
3838 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3840 else
3841 {
3842 set_locale (str);
3843# ifdef USE_XIM
3844 im_cb ();
3845# endif
3846 }
3847 break;
3848#endif
3849
3850#ifdef MENUBAR
3851 case XTerm_Menu:
3852 if (options & Opt_insecure)
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3117 break; 3854 break;
3855#endif
3118#if 0 3856#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3857 case XTerm_dumpscreen: /* no error notices */
3120 { 3858 {
3121 int fd; 3859 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3861 {
3124 scr_dump (fd); 3862 scr_dump (fd);
3125 close (fd); 3863 close (fd);
3126 } 3864 }
3127 } 3865 }
3128 break; 3866 break;
3129#endif 3867#endif
3130
3131 } 3868 }
3132} 3869}
3133/*----------------------------------------------------------------------*/ 3870/*----------------------------------------------------------------------*/
3134 3871
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3872/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3880 * so no need for fancy checking
3144 */ 3881 */
3145int 3882int
3146rxvt_term::privcases (int mode, unsigned long bit) 3883rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3884{
3148 int state; 3885 int state;
3149 3886
3150 if (mode == 's') 3887 if (mode == 's')
3151 { 3888 {
3152 SavedModes |= (PrivateModes & bit); 3889 SavedModes |= (priv_modes & bit);
3153 return -1; 3890 return -1;
3154 } 3891 }
3155 else 3892 else
3156 { 3893 {
3157 if (mode == 'r') 3894 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3895 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3896 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3897 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3898 PrivMode (state, bit);
3162 } 3899 }
3900
3163 return state; 3901 return state;
3164} 3902}
3165 3903
3166/* we're not using priv _yet_ */ 3904/* we're not using priv _yet_ */
3167void 3905void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3906rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 3907{
3170 unsigned int i, j; 3908 unsigned int i, j;
3171 int state; 3909 int state;
3910
3172 static const struct 3911 static const struct
3173 { 3912 {
3174 const int argval; 3913 const int argval;
3175 const unsigned long bit; 3914 const unsigned long bit;
3176 } 3915 }
3916
3177 argtopriv[] = { 3917 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3918 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3919 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3920 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3921 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 3922 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 3923 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 3924 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 3926 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 3927#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 3928 { menuBar_esc, PrivMode_menuBar },
3188#endif 3929#endif
3930 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 3932#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3933 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3934#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 3935 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3936 { 40, PrivMode_132OK },
3937 // 41 xterm more fixes NYI
3938 // 45 margin bell NYI
3939 // 46 start logging
3195 { 47, PrivMode_Screen }, 3940 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3941 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3942#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3943 { 67, PrivMode_BackSpace },
3199#endif 3944#endif
3200 { 1000, PrivMode_MouseX11 }, 3945 { 1000, PrivMode_MouseX11 },
3946 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3947 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3948 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3949 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3950 { 1011, PrivMode_Keypress }, // rxvt extension
3951 // 1035 enable modifiers for alt, numlock NYI
3952 // 1036 send ESC for meta keys NYI
3953 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3954 { 1047, PrivMode_Screen },
3955 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3956 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3957 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 3958 };
3206 3959
3207 if (nargs == 0) 3960 if (nargs == 0)
3208 return; 3961 return;
3209 3962
… …
3224 state = privcases (mode, argtopriv[j].bit); 3977 state = privcases (mode, argtopriv[j].bit);
3225 break; 3978 break;
3226 } 3979 }
3227 3980
3228 /* extra handling for values with state unkept */ 3981 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3982 switch (arg[i])
3231 { 3983 {
3232 case 1048: /* alternative cursor save */ 3984 case 1048: /* alternative cursor save */
3985 case 1049:
3986 if (options & Opt_secondaryScreen)
3233 if (mode == 0) 3987 if (mode == 0)
3234 scr_cursor (RESTORE); 3988 scr_cursor (RESTORE);
3235 else if (mode == 1) 3989 else if (mode == 1)
3236 scr_cursor (SAVE); 3990 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; 3991 break;
3992 }
3993
3994 if (state >= 0)
3995 /* extra handling for values with valid 0 or 1 state */
3996 switch (arg[i])
3997 {
3998 /* case 1: - application cursor keys */
3999 case 2: /* VT52 mode */
4000 /* oddball mode. should be set regardless of set/reset
4001 * parameter. Return from VT52 mode with an ESC < from
4002 * within VT52 mode
4003 */
4004 PrivMode (1, PrivMode_vt52);
4005 break;
3253 case 3: /* 80/132 */ 4006 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4007 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 4009 break;
3258 case 4: /* smooth scrolling */ 4010 case 4: /* smooth scrolling */
3259 if (state) 4011 if (state)
3260 Options &= ~Opt_jumpScroll; 4012 options &= ~Opt_jumpScroll;
3261 else 4013 else
3262 Options |= Opt_jumpScroll; 4014 options |= Opt_jumpScroll;
3263 break; 4015 break;
3264 case 5: /* reverse video */ 4016 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4017 scr_rvideo_mode (state);
3266 break; 4018 break;
3267 case 6: /* relative/absolute origins */ 4019 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4020 scr_relative_origin (state);
3269 break; 4021 break;
3270 case 7: /* autowrap */ 4022 case 7: /* autowrap */
3271 scr_autowrap (state); 4023 scr_autowrap (state);
3272 break; 4024 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4025 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4026 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4027 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4028 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4029 break;
3278#ifdef menuBar_esc 4030#ifdef menuBar_esc
3279 case menuBar_esc: 4031 case menuBar_esc:
3280#ifdef MENUBAR 4032#ifdef MENUBAR
3281 map_menuBar (state); 4033 map_menuBar (state);
3282#endif 4034#endif
3283 break; 4035 break;
3284#endif 4036#endif
3285#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3286 case scrollBar_esc: 4038 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4039 if (scrollbar_mapping (state))
3288 { 4040 {
3289 resize_all_windows (0, 0, 0); 4041 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4042 scr_touch (true);
3291 } 4043 }
3292 break; 4044 break;
3293#endif 4045#endif
3294 case 25: /* visible/invisible cursor */ 4046 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4047 scr_cursor_visible (state);
3296 break; 4048 break;
3297 /* case 35: - shift keys */ 4049 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4050 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4051 case 47: /* secondary screen */
3300 scr_change_screen (state); 4052 scr_change_screen (state);
3301 break; 4053 break;
3302 /* case 66: - application key pad */ 4054 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4055 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4056 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4057 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4058 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4059 break;
3308#if 0 4060#if 0
3309 case 1001: 4061 case 1001:
3310 break; /* X11 mouse highlighting */ 4062 break; /* X11 mouse highlighting */
3311#endif 4063#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4064 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4065 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 4066 options &= ~Opt_scrollTtyOutput;
3315 else 4067 else
3316 Options |= Opt_scrollTtyOutput; 4068 options |= Opt_scrollTtyOutput;
3317 break; 4069 break;
3318 case 1011: /* scroll to bottom on key press */ 4070 case 1011: /* scroll to bottom on key press */
3319 if (state) 4071 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4072 options |= Opt_scrollTtyKeypress;
3321 else 4073 else
3322 Options &= ~Opt_scrollTtyKeypress; 4074 options &= ~Opt_scrollTtyKeypress;
3323 break; 4075 break;
3324 case 1047: /* secondary screen w/ clearing */ 4076 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4077 if (options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 4078 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4079 scr_erase_screen (2);
3328 scr_change_screen (state); 4080 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4081 break;
4082 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen)
4085 if (current_screen != PRIMARY)
4086 scr_erase_screen (2);
4087 break;
4088 default:
4089 break;
3332 } 4090 }
3333 } 4091 }
3334} 4092}
3335/*}}} */ 4093/*}}} */
3336 4094
3337/*{{{ process sgr sequences */ 4095/*{{{ process sgr sequences */
3338void 4096void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4097rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4098{
3341 unsigned int i; 4099 unsigned int i;
3342 short rendset; 4100 short rendset;
3343 int rendstyle; 4101 int rendstyle;
3344 4102
3345 if (nargs == 0) 4103 if (nargs == 0)
3346 { 4104 {
3347 scr_rendition (0, ~RS_None); 4105 scr_rendition (0, ~RS_None);
3348 return; 4106 return;
3349 } 4107 }
4108
3350 for (i = 0; i < nargs; i++) 4109 for (i = 0; i < nargs; i++)
3351 { 4110 {
3352 rendset = -1; 4111 rendset = -1;
3353 switch (arg[i]) 4112 switch (arg[i])
3354 { 4113 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4115 rendset = 0, rendstyle = ~RS_None;
3357 break; 4116 break;
3358 case 1: 4117 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4118 rendset = 1, rendstyle = RS_Bold;
3360 break; 4119 break;
4120 //case 2: // low intensity
4121 case 3:
4122 rendset = 1, rendstyle = RS_Italic;
4123 break;
3361 case 4: 4124 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4125 rendset = 1, rendstyle = RS_Uline;
3363 break; 4126 break;
3364 case 5: 4127 case 5: // slowly blinking
4128 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4129 rendset = 1, rendstyle = RS_Blink;
3366 break; 4130 break;
4131 //case 6: // scoansi light background
3367 case 7: 4132 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4133 rendset = 1, rendstyle = RS_RVid;
3369 break; 4134 break;
3370 case 22: 4135 case 8:
4136 // invisible. NYI
4137 break;
4138 //case 9: // crossed out
4139 //case 10: // scoansi acs off, primary font
4140 //case 11: // scoansi acs on, first alt font
4141 //case 12: // scoansi acs on, |0x80, second alt font
4142 //...
4143 //case 19: // ninth alt font
4144 //case 20: // gothic
4145 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 22: // normal intensity
4149 rendset = 0, rendstyle = RS_Bold;
4150 break;
4151 case 23: // disable italic
4152 rendset = 0, rendstyle = RS_Italic;
3372 break; 4153 break;
3373 case 24: 4154 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4155 rendset = 0, rendstyle = RS_Uline;
3375 break; 4156 break;
3376 case 25: 4157 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3378 break; 4159 break;
4160 case 26: // variable spacing (iso 8613)
4161 rendset = 0, rendstyle = RS_Blink;
4162 break;
3379 case 27: 4163 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4164 rendset = 0, rendstyle = RS_RVid;
3381 break; 4165 break;
4166 //case 28: // visible. NYI
4167 //case 29: // not crossed-out
3382 } 4168 }
4169
3383 if (rendset != -1) 4170 if (rendset != -1)
3384 { 4171 {
3385 scr_rendition (rendset, rendstyle); 4172 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4173 continue; /* for (;i;) */
3387 } 4174 }
… …
3394 case 33: 4181 case 33:
3395 case 34: 4182 case 34:
3396 case 35: 4183 case 35:
3397 case 36: 4184 case 36:
3398 case 37: 4185 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4186 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4187 break;
3402#ifdef TTY_256COLOR 4188 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4189 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4190 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4191 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4192 i += 2;
3409 } 4193 }
3410 break; 4194 break;
3411#endif
3412 case 39: /* default fg */ 4195 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4196 scr_color (Color_fg, Color_fg);
3414 break; 4197 break;
3415 4198
3416 case 40: 4199 case 40:
… …
3419 case 43: 4202 case 43:
3420 case 44: 4203 case 44:
3421 case 45: 4204 case 45:
3422 case 46: 4205 case 46:
3423 case 47: 4206 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4207 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4208 break;
3427#ifdef TTY_256COLOR 4209 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4210 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4211 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4212 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4213 i += 2;
3434 } 4214 }
3435 break; 4215 break;
3436#endif
3437 case 49: /* default bg */ 4216 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4217 scr_color (Color_bg, Color_bg);
3439 break; 4218 break;
4219
4220 //case 50: // not variable spacing
3440 4221
3441#ifndef NO_BRIGHTCOLOR 4222#ifndef NO_BRIGHTCOLOR
3442 case 90: 4223 case 90:
3443 case 91: /* set bright fg color */ 4224 case 91: /* set bright fg color */
3444 case 92: 4225 case 92:
3445 case 93: 4226 case 93:
3446 case 94: 4227 case 94:
3447 case 95: 4228 case 95:
3448 case 96: 4229 case 96:
3449 case 97: 4230 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4231 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4232 break;
3453 case 100: 4233 case 100:
3454 case 101: /* set bright bg color */ 4234 case 101: /* set bright bg color */
3455 case 102: 4235 case 102:
3456 case 103: 4236 case 103:
3457 case 104: 4237 case 104:
3458 case 105: 4238 case 105:
3459 case 106: 4239 case 106:
3460 case 107: 4240 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4242 break;
3464#endif 4243#endif
3465 4244
3466 } 4245 }
3467 } 4246 }
3468} 4247}
3469/*}}} */ 4248/*}}} */
3470 4249
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4250/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4251void
3473rxvt_term::process_graphics () 4252rxvt_term::process_graphics ()
3474{ 4253{
3475 unsigned char ch, cmd = cmd_getc (); 4254 unicode_t ch, cmd = cmd_getc ();
3476 4255
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4256 if (cmd == 'Q')
3479 { /* query graphics */ 4257 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4258 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4259 return;
3482 } 4260 }
3483 /* swallow other graphics sequences until terminating ':' */ 4261 /* swallow other graphics sequences until terminating ':' */
3484 do 4262 do
3485 ch = cmd_getc (); 4263 ch = cmd_getc ();
3486 while (ch != ':'); 4264 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} 4265}
3533/*}}} */ 4266/*}}} */
3534 4267
3535/* ------------------------------------------------------------------------- */ 4268/* ------------------------------------------------------------------------- */
3536 4269
… …
3545 unsigned char buf[256]; 4278 unsigned char buf[256];
3546 4279
3547 va_start (arg_ptr, fmt); 4280 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4282 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4283 tt_write (buf, strlen (buf));
3551} 4284}
3552 4285
3553/* ---------------------------------------------------------------------- */ 4286/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4287/* 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. 4288 * or generated by us in response to a query ESC sequence.
3556 */ 4289 */
3557void 4290void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3559{ 4292{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3561 4294
3562 if (len) 4295 if (len)
3563 { 4296 {
3564 if (v_buflen == 0) 4297 if (v_buflen == 0)
3565 { 4298 {
3566 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3567 4300
3568 if ((unsigned int)written == len) 4301 if ((unsigned int)written == len)
3569 return; 4302 return;
3570 4303
3571 data += written; 4304 data += written;
… …
3579 v_buflen += len; 4312 v_buflen += len;
3580 } 4313 }
3581 4314
3582 for (;;) 4315 for (;;)
3583 { 4316 {
3584 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3585 4318
3586 if (written > 0) 4319 if (written > 0)
3587 { 4320 {
3588 v_buflen -= written; 4321 v_buflen -= written;
3589 4322

Diff Legend

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