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

Diff Legend

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