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

Diff Legend

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