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.19 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC

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

Diff Legend

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