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

Diff Legend

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