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.20 by pcg, Thu Dec 18 07:31:18 2003 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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