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

Diff Legend

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