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.35 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC

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

Diff Legend

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