ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.5 2003/11/25 15:44:38 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
93#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
67 x_ev (this, &rxvt_term::x_cb) 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
68{ 103{
69 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
70} 105}
71 106
72rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
73{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
135
74 delete PixColors; 136 delete PixColors;
137
138 displays.put (display);
139
140 scr_release ();
141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
146 free (locale);
147 free (codeset);
148
149 delete envv;
150 delete argv;
151}
152
153void
154rxvt_term::destroy ()
155{
156 if (display)
157 {
158 rootwin_ev.stop (display);
159 termwin_ev.stop (display);
160 vt_ev.stop (display);
161#ifdef USE_XIM
162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
171 }
172
173 check_ev.stop ();
174 pty_ev.stop ();
175#ifdef CURSOR_BLINK
176 cursor_blink_ev.stop ();
177#endif
178#ifdef TEXT_BLINK
179 text_blink_ev.stop ();
180#endif
181#ifdef POINTER_BLANK
182 pointer_ev.stop ();
183#endif
184
185 destroy_ev.start (0);
186}
187
188void
189rxvt_term::destroy_cb (time_watcher &w)
190{
191 SET_R (this);
192
193 delete this;
75} 194}
76 195
77/*----------------------------------------------------------------------*/ 196/*----------------------------------------------------------------------*/
78/* rxvt_init() */ 197/* rxvt_init () */
79/* LIBPROTO */ 198/* LIBPROTO */
80rxvt_t 199rxvt_t
81rxvt_init(int argc, const char *const *argv) 200rxvt_init (int argc, const char *const *argv)
82{ 201{
83 SET_R(new rxvt_term); 202 SET_R (new rxvt_term);
84 dR;
85 203
86 if (!R->init_vars () || !R->init (argc, argv)) 204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
87 { 205 {
88 delete R; 206 delete GET_R;
89 return NULL; 207 SET_R (0);
90 } 208 }
91 209
92 return R; 210 return GET_R;
211}
212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
215void
216rxvt_init_signals ()
217{
218 /* install exit handler for cleanup */
219#if 0
220#ifdef HAVE_ATEXIT
221 atexit (rxvt_clean_exit);
222#else
223#endif
224#endif
225
226 struct sigaction sa;
227
228 sigfillset (&sa.sa_mask);
229 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
230 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
231 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
236
237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
238 /* signal (SIGURG, SIG_DFL); */
239
240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
93} 242}
94 243
95bool 244bool
96rxvt_term::init (int argc, const char *const *argv) 245rxvt_term::init (int argc, const char *const *argv)
97{ 246{
98 dR;//TODO (scrollbar, setidle)
99
100 /* 247 /*
101 * Save and then give up any super-user privileges 248 * Save and then give up any super-user privileges
102 * If we need privileges in any area then we must specifically request it. 249 * If we need privileges in any area then we must specifically request it.
103 * We should only need to be root in these cases: 250 * We should only need to be root in these cases:
104 * 1. write utmp entries on some systems 251 * 1. write utmp entries on some systems
105 * 2. chown tty on some systems 252 * 2. chown tty on some systems
106 */ 253 */
107 rxvt_privileges (this, SAVE); 254 privileges (SAVE);
108 rxvt_privileges (this, IGNORE); 255 privileges (IGNORE);
109 256
110 rxvt_init_secondary (this); 257 init_secondary ();
111 258
112 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
113 260
261 set_locale ("");
262
114#if (MENUBAR_MAX) 263#if MENUBAR_MAX
115 rxvt_menubar_read (this, rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
116#endif 265#endif
117#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
118 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
119 scrollbar_setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
120#endif 269#endif
121 270
122 rxvt_Create_Windows (this, argc, argv); 271 create_windows (argc, argv);
123 272
124 rxvt_init_xlocale (this); 273 init_xlocale ();
125 274
126 rxvt_scr_reset (this); /* initialize screen */ 275 scr_reset (); /* initialize screen */
127#ifdef RXVT_GRAPHICS
128 rxvt_Gr_reset (this); /* reset graphics */
129#endif
130 276
131#if 0 277#if 0
132#ifdef DEBUG_X
133 XSynchronize(Xdisplay, True); 278 XSynchronize (display->display, True);
134 XSetErrorHandler((XErrorHandler) abort);
135#else
136 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
137#endif
138#endif 279#endif
139 280
140#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
141 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
142 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
143#endif 284#endif
144#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
145 if (menubar_visible(r)) 286 if (menubar_visible ())
146 XMapWindow (Xdisplay, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
147#endif 288#endif
148#ifdef TRANSPARENT 289#ifdef TRANSPARENT
149 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
150 { 291 {
151 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 292 XSelectInput (display->display, display->root, PropertyChangeMask);
152 rxvt_check_our_parents (this); 293 check_our_parents ();
153 } 294 }
154#endif 295#endif
296
297 rootwin_ev.start (display, display->root);
298
155 XMapWindow (Xdisplay, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
156 XMapWindow (Xdisplay, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
157 301
158 rxvt_init_env (this);
159 rxvt_init_command (this, cmd_argv); 302 init_command (cmd_argv);
160 303
161 x_ev.start (Xfd, EVENT_READ);
162 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
305
306 check_ev.start ();
163 307
164 return true; 308 return true;
165} 309}
166 310
167/* ------------------------------------------------------------------------- * 311/* ------------------------------------------------------------------------- *
171 * Catch a SIGCHLD signal and exit if the direct child has died 315 * Catch a SIGCHLD signal and exit if the direct child has died
172 */ 316 */
173/* ARGSUSED */ 317/* ARGSUSED */
174/* EXTPROTO */ 318/* EXTPROTO */
175RETSIGTYPE 319RETSIGTYPE
176rxvt_Child_signal(int sig __attribute__ ((unused))) 320rxvt_Child_signal (int sig __attribute__ ((unused)))
177{ 321{
178 dR;
179 int pid, save_errno = errno; 322 int pid, save_errno = errno;
180
181 do {
182 errno = 0;
183 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
184 324 ;
185 if (pid == R->cmd_pid)
186 exit(EXIT_SUCCESS);
187
188 errno = save_errno; 325 errno = save_errno;
189 signal(SIGCHLD, rxvt_Child_signal); 326
327#if 0
328 if (pid == cmd_pid)
329 exit (EXIT_SUCCESS);
330#endif
190} 331}
191 332
192/* 333/*
193 * Catch a fatal signal and tidy up before quitting 334 * Catch a fatal signal and tidy up before quitting
194 */ 335 */
195/* EXTPROTO */ 336/* EXTPROTO */
196RETSIGTYPE 337RETSIGTYPE
197rxvt_Exit_signal(int sig) 338rxvt_Exit_signal (int sig)
198{ 339{
199 signal(sig, SIG_DFL); 340 signal (sig, SIG_DFL);
200#ifdef DEBUG_CMD 341#ifdef DEBUG_CMD
201 rxvt_print_error("signal %d", sig); 342 rxvt_print_error ("signal %d", sig);
202#endif 343#endif
203 rxvt_clean_exit(); 344 rxvt_clean_exit ();
204 kill(getpid(), sig); 345 kill (getpid (), sig);
205} 346}
206 347
207/* ARGSUSED */
208/* INTPROTO */ 348/* INTPROTO */
209int 349int
210rxvt_xerror_handler(const Display * display 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
211 __attribute__ ((unused)), const XErrorEvent * event)
212{ 351{
213 dR;
214
215 if (R->allowedxerror == -1) { 352 if (GET_R->allowedxerror == -1)
216 R->allowedxerror = event->error_code; 353 GET_R->allowedxerror = event->error_code;
217 return 0; /* ignored anyway */ 354 else
218 } 355 {
219 rxvt_print_error("XError: Request: %d . %d, Error: %d", 356 old_xerror_handler (display, event);
220 event->request_code, event->minor_code, 357 GET_R->destroy ();
221 event->error_code); 358 }
222/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 359
223 exit(EXIT_FAILURE); 360 return 0;
224/* NOTREACHED */
225} 361}
226 362
227/*----------------------------------------------------------------------*/ 363/*----------------------------------------------------------------------*/
228/* 364/*
229 * Exit gracefully, clearing the utmp entry and restoring tty attributes 365 * Exit gracefully, clearing the utmp entry and restoring tty attributes
230 * TODO: if debugging, this should free up any known resources if we can 366 * TODO: if debugging, this should free up any known resources if we can
231 */ 367 */
232/* EXTPROTO */ 368/* EXTPROTO */
233void 369void
234rxvt_clean_exit(void) 370rxvt_clean_exit ()
235{ 371{
236 dR; 372 // TODO: rxvtd should clean up all ressources
237 373 if (GET_R)
238#ifdef DEBUG_SCREEN 374 GET_R->destroy ();
239 rxvt_scr_release(aR);
240#endif
241#ifndef NO_SETOWNER_TTYDEV
242 rxvt_privileged_ttydev(aR_ RESTORE);
243#endif
244#ifdef UTMP_SUPPORT
245 rxvt_privileged_utmp(aR_ RESTORE);
246#endif
247#ifdef USE_XIM
248 if (R->Input_Context != NULL) {
249 XDestroyIC(R->Input_Context);
250 R->Input_Context = NULL;
251 }
252#endif
253} 375}
254 376
255/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
256 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
257 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
258/* EXTPROTO */ 380/* EXTPROTO */
259void * 381void *
260rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
261{ 383{
262 void *p; 384 void *p;
263 385
264 p = malloc(size); 386 p = malloc (size);
265 if (p) 387 if (p)
266 return p; 388 return p;
267 389
268 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
269 rxvt_clean_exit(); 391 rxvt_clean_exit ();
270 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
271/* NOTREACHED */ 393 /* NOTREACHED */
272} 394}
273 395
274/* EXTPROTO */ 396/* EXTPROTO */
275void * 397void *
276rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
277{ 399{
278 void *p; 400 void *p;
279 401
280 p = calloc(number, size); 402 p = calloc (number, size);
281 if (p) 403 if (p)
282 return p; 404 return p;
283 405
284 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
285 rxvt_clean_exit(); 407 rxvt_clean_exit ();
286 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
287/* NOTREACHED */ 409 /* NOTREACHED */
288} 410}
289 411
290/* EXTPROTO */ 412/* EXTPROTO */
291void * 413void *
292rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
293{ 415{
294 void *p; 416 void *p;
295 417
296 if (ptr) 418 if (ptr)
297 p = realloc(ptr, size); 419 p = realloc (ptr, size);
298 else 420 else
299 p = malloc(size); 421 p = malloc (size);
300 if (p) 422 if (p)
301 return p; 423 return p;
302 424
303 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
304 rxvt_clean_exit(); 426 rxvt_clean_exit ();
305 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
306/* NOTREACHED */ 428 /* NOTREACHED */
307} 429}
308 430
309/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
310 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
311 * ------------------------------------------------------------------------- */ 433 * ------------------------------------------------------------------------- */
312/* take care of suid/sgid super-user (root) privileges */ 434/* take care of suid/sgid super-user (root) privileges */
313/* INTPROTO */
314void 435void
315rxvt_privileges(pR_ int mode) 436rxvt_term::privileges (int mode)
316{ 437{
317#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
318# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
319/* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
320# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
321# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
322# define HAVE_SETEUID 443# define HAVE_SETEUID
323# endif 444# endif
324# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
325 switch (mode) { 446 switch (mode)
447 {
326 case IGNORE: 448 case IGNORE:
327 /* 449 /*
328 * change effective uid/gid - not real uid/gid - so we can switch 450 * change effective uid/gid - not real uid/gid - so we can switch
329 * back to root later, as required 451 * back to root later, as required
330 */ 452 */
331 seteuid(getuid()); 453 seteuid (getuid ());
332 setegid(getgid()); 454 setegid (getgid ());
333 break; 455 break;
334 case SAVE: 456 case SAVE:
335 R->euid = geteuid(); 457 euid = geteuid ();
336 R->egid = getegid(); 458 egid = getegid ();
337 break; 459 break;
338 case RESTORE: 460 case RESTORE:
339 seteuid(R->euid); 461 seteuid (euid);
340 setegid(R->egid); 462 setegid (egid);
341 break; 463 break;
342 } 464 }
343# else 465# else
344 switch (mode) { 466 switch (mode)
467 {
345 case IGNORE: 468 case IGNORE:
346 setuid(getuid()); 469 setuid (getuid ());
347 setgid(getgid()); 470 setgid (getgid ());
348 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
349 case SAVE: 472 case SAVE:
350 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
351 case RESTORE: 474 case RESTORE:
352 break; 475 break;
353 } 476 }
354# endif 477# endif
355#endif 478#endif
356} 479}
357 480
358#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
359/* EXTPROTO */
360void 482void
361rxvt_privileged_utmp(pR_ char action) 483rxvt_term::privileged_utmp (char action)
362{ 484{
363 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
364 action, R->next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
365 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
366 || (R->Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
367 || R->ttydev == NULL || *R->ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
368 return; 490 return;
369 491
370 rxvt_privileges(aR_ RESTORE); 492 privileges (RESTORE);
371 if (action == SAVE) { 493 if (action == SAVE)
494 {
372 R->next_utmp_action = RESTORE; 495 next_utmp_action = RESTORE;
373 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
374 } else { /* action == RESTORE */ 499 { /* action == RESTORE */
375 R->next_utmp_action = IGNORE; 500 next_utmp_action = IGNORE;
376 rxvt_cleanutent(aR); 501 cleanutent ();
377 } 502 }
378 rxvt_privileges(aR_ IGNORE); 503 privileges (IGNORE);
379} 504}
380#endif 505#endif
381 506
382#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
383/* EXTPROTO */
384void 508void
385rxvt_privileged_ttydev(pR_ char action) 509rxvt_term::privileged_ttydev (char action)
386{ 510{
387 D_MAIN((stderr, 511 D_MAIN ((stderr,
388 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
389 action, R->next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
390 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
391 || R->ttydev == NULL || *R->ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
392 return; 516 return;
393 517
394 rxvt_privileges(aR_ RESTORE); 518 privileges (RESTORE);
395 519
396 if (action == SAVE) { 520 if (action == SAVE)
521 {
397 R->next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
398# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
399/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
400 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
401 R->next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
402 else 527 else
403# endif 528# endif
529
404 { 530 {
405 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
406 chmod(R->ttydev, R->ttymode); 532 chmod (ttydev, ttymode);
407# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
408 revoke(R->ttydev); 534 revoke (ttydev);
409# endif 535# endif
536
410 } 537 }
538 }
539 else
411 } else { /* action == RESTORE */ 540 { /* action == RESTORE */
412 R->next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
413# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
414 chmod(R->ttydev, R->ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
415 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
416# else 545# else
417 chmod(R->ttydev, 546 chmod (ttydev,
418 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
419 chown(R->ttydev, 0, 0); 548 chown (ttydev, 0, 0);
420# endif 549# endif
421 }
422 550
551 }
552
423 rxvt_privileges(aR_ IGNORE); 553 privileges (IGNORE);
424 554
425# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
426 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
427 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
428 SAVE ? "Saving" : 558 SAVE ? "Saving" :
429 "UNKNOWN ERROR for"), R->ttydev, 559 "UNKNOWN ERROR for"), ttydev,
430 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
431 R->ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
432# endif 562# endif
433} 563}
434#endif 564#endif
435 565
436/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
437/* 567/*
438 * window size/position calculcations for XSizeHint and other storage. 568 * window size/position calculcations for XSizeHint and other storage.
439 * if width/height are non-zero then override calculated width/height 569 * if width/height are non-zero then override calculated width/height
440 */ 570 */
441/* EXTPROTO */
442void 571void
443rxvt_window_calc(pR_ unsigned int width, unsigned int height) 572rxvt_term::window_calc (unsigned int width, unsigned int height)
444{ 573{
445 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
446 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
447 unsigned int w, h; 576 unsigned int w, h;
448 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
449 578
450 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
451 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
452 R->szHint.height)); 581 szHint.height));
453 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
454 R->szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
455/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
456 585
457 recalc_x = recalc_y = 0; 586 recalc_x = recalc_y = 0;
458 flags = 0; 587 flags = 0;
459 if (!R->parsed_geometry) { 588 if (!parsed_geometry)
589 {
460 R->parsed_geometry = 1; 590 parsed_geometry = 1;
461 if (R->rs[Rs_geometry]) 591 if (rs[Rs_geometry])
462 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
463 if (flags & WidthValue) { 593 if (flags & WidthValue)
594 {
464 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
465 R->szHint.flags |= USSize; 596 szHint.flags |= USSize;
466 } 597 }
467 if (flags & HeightValue) { 598 if (flags & HeightValue)
599 {
468 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
469 R->szHint.flags |= USSize; 601 szHint.flags |= USSize;
470 } 602 }
471 if (flags & XValue) { 603 if (flags & XValue)
604 {
472 R->szHint.x = x; 605 szHint.x = x;
473 R->szHint.flags |= USPosition; 606 szHint.flags |= USPosition;
474 if (flags & XNegative) { 607 if (flags & XNegative)
608 {
475 recalc_x = 1; 609 recalc_x = 1;
476 R->szHint.win_gravity = NorthEastGravity; 610 szHint.win_gravity = NorthEastGravity;
477 } 611 }
478 } 612 }
479 if (flags & YValue) { 613 if (flags & YValue)
614 {
480 R->szHint.y = y; 615 szHint.y = y;
481 R->szHint.flags |= USPosition; 616 szHint.flags |= USPosition;
482 if (flags & YNegative) { 617 if (flags & YNegative)
618 {
483 recalc_y = 1; 619 recalc_y = 1;
484 if (R->szHint.win_gravity == NorthEastGravity) 620 if (szHint.win_gravity == NorthEastGravity)
485 R->szHint.win_gravity = SouthEastGravity; 621 szHint.win_gravity = SouthEastGravity;
486 else 622 else
487 R->szHint.win_gravity = SouthWestGravity; 623 szHint.win_gravity = SouthWestGravity;
488 } 624 }
489 } 625 }
490 } 626 }
491/* TODO: BOUNDS */ 627 /* TODO: BOUNDS */
492 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 628 TermWin.width = TermWin.ncol * TermWin.fwidth;
493 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 629 TermWin.height = TermWin.nrow * TermWin.fheight;
494 max_width = MAX_COLS * R->TermWin.fwidth; 630 max_width = MAX_COLS * TermWin.fwidth;
495 max_height = MAX_ROWS * R->TermWin.fheight; 631 max_height = MAX_ROWS * TermWin.fheight;
496 632
497 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
498 634
499 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
500 R->window_vt_x = R->window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
501 if (scrollbar_visible(R)) { 637 if (scrollbar_visible ())
638 {
502 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
503 R->szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
504 if (!(R->Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
505 R->window_vt_x = sb_w; 642 window_vt_x = sb_w;
506 } 643 }
507 if (menubar_visible(R)) { 644 if (menubar_visible ())
645 {
508 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
509 R->szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
510 R->window_vt_y = mb_h; 648 window_vt_y = mb_h;
511 } 649 }
512 R->szHint.width_inc = R->TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
513 R->szHint.height_inc = R->TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
514 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 652 szHint.min_width = szHint.base_width + szHint.width_inc;
515 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 653 szHint.min_height = szHint.base_height + szHint.height_inc;
516 654
517 if (width && width - R->szHint.base_width < max_width) { 655 if (width && width - szHint.base_width < max_width)
656 {
518 R->szHint.width = width; 657 szHint.width = width;
519 R->TermWin.width = width - R->szHint.base_width; 658 TermWin.width = width - szHint.base_width;
520 } else { 659 }
660 else
661 {
521 MIN_IT(R->TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
522 R->szHint.width = R->szHint.base_width + R->TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
523 } 664 }
524 if (height && height - R->szHint.base_height < max_height) { 665 if (height && height - szHint.base_height < max_height)
666 {
525 R->szHint.height = height; 667 szHint.height = height;
526 R->TermWin.height = height - R->szHint.base_height; 668 TermWin.height = height - szHint.base_height;
527 } else { 669 }
670 else
671 {
528 MIN_IT(R->TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
529 R->szHint.height = R->szHint.base_height + R->TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
530 } 674 }
531 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
532 R->window_sb_x = R->szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
533 677
534 if (recalc_x) 678 if (recalc_x)
535 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
536 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 680 - szHint.width - 2 * TermWin.ext_bwidth);
537 if (recalc_y) 681 if (recalc_y)
538 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
539 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
540 684
541 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
542 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
543 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
544 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
545 R->szHint.height)); 689 szHint.height));
546 return; 690 return;
547} 691}
548 692
549/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
550/* 694/*
551 * Tell the teletype handler what size the window is. 695 * Tell the teletype handler what size the window is.
552 * Called after a window size change. 696 * Called after a window size change.
553 */ 697 */
554/* EXTPROTO */
555void 698void
556rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 699rxvt_term::tt_winch ()
557{ 700{
558 struct winsize ws; 701 struct winsize ws;
559 702
560 if (fd < 0) 703 if (cmd_fd < 0)
561 return; 704 return;
705
562 ws.ws_col = col; 706 ws.ws_col = TermWin.ncol;
563 ws.ws_row = row; 707 ws.ws_row = TermWin.nrow;
564 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
565#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
566 (void)ioctl(fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
567#else 711#else
568 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
569 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
570 }
571# ifdef SIGWINCH 714# ifdef SIGWINCH
572 else if (pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
573 kill(pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
574# endif 717# endif
575#endif 718#endif
576} 719}
577 720
578/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
579/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
580/* 723/*
581 * init = 1 - initialize 724 * init = 1 - initialize
582 * 725 *
583 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
584 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
585 */ 728 */
586/* EXTPROTO */ 729bool
587void
588rxvt_change_font(pR_ int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
589{ 731{
590} 732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
591 743
592/* INTPROTO */ 744 if (fs && fs->populate (fontname))
593void 745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 // TODO: screen needs to be told about new fonts
753
754 if (TermWin.parent[0])
755 {
756 resize_all_windows (0, 0, 0);
757 scr_remap_chars ();
758 scr_touch (true);
759 }
760
761 return true;
762 }
763 }
764
765 return false;
766}
767
768bool
594rxvt_font_up_down(pR_ int n, int direction) 769rxvt_term::font_up_down (int n, int direction)
595{ 770{
771 return false;
596} 772}
597 773
598/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
599/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
600/* xterm sequences - title, iconName, color (exptl) */ 776/* xterm sequences - title, iconName, color (exptl) */
601/* EXTPROTO */
602void 777void
603rxvt_set_title(pR_ const char *str) 778rxvt_term::set_title (const char *str)
604{ 779{
605#ifndef SMART_WINDOW_TITLE 780#ifndef SMART_WINDOW_TITLE
606 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 781 XStoreName (display->display, TermWin.parent[0], str);
607#else 782#else
608 char *name; 783 char *name;
609 784
610 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 785 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
611 name = NULL; 786 name = NULL;
612 if (name == NULL || STRCMP(name, str)) 787 if (name == NULL || STRCMP (name, str))
613 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 788 XStoreName (display->display, TermWin.parent[0], str);
614 if (name) 789 if (name)
615 XFree(name); 790 XFree (name);
616#endif 791#endif
617} 792}
618 793
619/* EXTPROTO */
620void 794void
621rxvt_set_iconName(pR_ const char *str) 795rxvt_term::set_iconName (const char *str)
622{ 796{
623#ifndef SMART_WINDOW_TITLE 797#ifndef SMART_WINDOW_TITLE
624 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 798 XSetIconName (display->display, TermWin.parent[0], str);
625#else 799#else
626 char *name; 800 char *name;
627 801
628 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 802 if (XGetIconName (display->display, TermWin.parent[0], &name))
629 name = NULL; 803 name = NULL;
630 if (name == NULL || STRCMP(name, str)) 804 if (name == NULL || STRCMP (name, str))
631 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 805 XSetIconName (display->display, TermWin.parent[0], str);
632 if (name) 806 if (name)
633 XFree(name); 807 XFree (name);
634#endif 808#endif
635} 809}
636 810
637#ifdef XTERM_COLOR_CHANGE 811#ifdef XTERM_COLOR_CHANGE
638/* EXTPROTO */
639void 812void
640rxvt_set_window_color(pR_ int idx, const char *color) 813rxvt_term::set_window_color (int idx, const char *color)
641{ 814{
642 rxvt_color xcol; 815 rxvt_color xcol;
643 int i; 816 int i;
644 817
645 if (color == NULL || *color == '\0') 818 if (color == NULL || *color == '\0')
646 return; 819 return;
647 820
648/* handle color aliases */ 821 /* handle color aliases */
649 if (isdigit(*color)) { 822 if (isdigit (*color))
823 {
650 i = atoi(color); 824 i = atoi (color);
825 if (i >= 8 && i <= 15)
651 if (i >= 8 && i <= 15) { /* bright colors */ 826 { /* bright colors */
652 i -= 8; 827 i -= 8;
653# ifndef NO_BRIGHTCOLOR 828# ifndef NO_BRIGHTCOLOR
654 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 829 PixColors[idx] = PixColors[minBrightCOLOR + i];
655 SET_PIXCOLOR(R, idx); 830 SET_PIXCOLOR (idx);
656 goto Done; 831 goto Done;
657# endif 832# endif
833
658 } 834 }
659 if (i >= 0 && i <= 7) { /* normal colors */ 835 if (i >= 0 && i <= 7)
836 { /* normal colors */
660 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 837 PixColors[idx] = PixColors[minCOLOR + i];
661 SET_PIXCOLOR(R, idx); 838 SET_PIXCOLOR (idx);
662 goto Done; 839 goto Done;
663 } 840 }
664 } 841 }
665 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 842 if (!rXParseAllocColor (& xcol, color))
666 return; 843 return;
667/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 844 /* XStoreColor (display->display, XCMAP, XColor*); */
668 845
669/* 846 /*
670 * FIXME: should free colors here, but no idea how to do it so instead, 847 * FIXME: should free colors here, but no idea how to do it so instead,
671 * so just keep gobbling up the colormap 848 * so just keep gobbling up the colormap
672 */ 849 */
673# if 0 850# if 0
674 for (i = Color_Black; i <= Color_White; i++) 851 for (i = Color_Black; i <= Color_White; i++)
675 if (R->PixColors[idx] == R->PixColors[i]) 852 if (PixColors[idx] == PixColors[i])
676 break; 853 break;
677 if (i > Color_White) { 854 if (i > Color_White)
855 {
678 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 856 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
679 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 857 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
680 DisplayPlanes(R->Xdisplay, Xscreen)); 858 DisplayPlanes (display->display, display->screen));
681 } 859 }
682# endif 860# endif
683 861
684 R->PixColors[idx] = xcol; 862 PixColors[idx] = xcol;
685 SET_PIXCOLOR(R, idx); 863 SET_PIXCOLOR (idx);
686 864
687/* XSetWindowAttributes attr; */ 865 /* XSetWindowAttributes attr; */
688/* Cursor cursor; */ 866 /* Cursor cursor; */
689 Done: 867Done:
690 if (idx == Color_bg && !(R->Options & Opt_transparent)) 868 if (idx == Color_bg && ! (Options & Opt_transparent))
691 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 869 XSetWindowBackground (display->display, TermWin.vt,
692 R->PixColors[Color_bg]); 870 PixColors[Color_bg]);
693 871
694/* handle Color_BD, scrollbar background, etc. */ 872 /* handle Color_BD, scrollbar background, etc. */
695 873
696 rxvt_set_colorfgbg(aR); 874 set_colorfgbg ();
697 rxvt_recolour_cursor(aR); 875 recolour_cursor ();
698/* the only reasonable way to enforce a clean update */ 876 /* the only reasonable way to enforce a clean update */
699 rxvt_scr_poweron(aR); 877 scr_poweron ();
700} 878}
701 879
702#else 880#else
703# define rxvt_set_window_color(aR_ idx,color) ((void)0) 881# define set_window_color (idx,color) ((void)0)
704#endif /* XTERM_COLOR_CHANGE */ 882#endif /* XTERM_COLOR_CHANGE */
705 883
706/* EXTPROTO */
707void 884void
708rxvt_recolour_cursor(pR) 885rxvt_term::recolour_cursor ()
709{ 886{
710 rxvt_color xcol[2];
711
712#if TODO 887#if TODO
888 rxvt_color xcol[2];
889
713 xcol[0] = R->PixColors[Color_pointer]; 890 xcol[0] = PixColors[Color_pointer];
714 xcol[1] = R->PixColors[Color_bg]; 891 xcol[1] = PixColors[Color_bg];
715 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 892 XQueryColors (display->display, XCMAP, xcol, 2);
716 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 893 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
717#endif 894#endif
718} 895}
719 896
720/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
721/* 898/*
722 * find if fg/bg matches any of the normal (low-intensity) colors 899 * find if fg/bg matches any of the normal (low-intensity) colors
723 */ 900 */
724/* INTPROTO */
725void 901void
726rxvt_set_colorfgbg(pR) 902rxvt_term::set_colorfgbg ()
727{ 903{
728 unsigned int i; 904 unsigned int i;
729 const char *xpmb = "\0"; 905 const char *xpmb = "\0";
730 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 906 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
731 907
732 R->env_colorfgbg = 908 env_colorfgbg =
733 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 909 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
734 STRCPY(fstr, "default"); 910 STRCPY (fstr, "default");
735 STRCPY(bstr, "default"); 911 STRCPY (bstr, "default");
736 for (i = Color_Black; i <= Color_White; i++) 912 for (i = Color_Black; i <= Color_White; i++)
737 if (R->PixColors[Color_fg] == R->PixColors[i]) { 913 if (PixColors[Color_fg] == PixColors[i])
914 {
738 sprintf(fstr, "%d", (i - Color_Black)); 915 sprintf (fstr, "%d", (i - Color_Black));
739 break; 916 break;
740 } 917 }
741 for (i = Color_Black; i <= Color_White; i++) 918 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_bg] == R->PixColors[i]) { 919 if (PixColors[Color_bg] == PixColors[i])
920 {
743 sprintf(bstr, "%d", (i - Color_Black)); 921 sprintf (bstr, "%d", (i - Color_Black));
744#ifdef XPM_BACKGROUND 922#ifdef XPM_BACKGROUND
745 xpmb = "default;"; 923 xpmb = "default;";
746#endif 924#endif
747 break; 925 break;
748 } 926 }
927
749 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 928 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
750 putenv(R->env_colorfgbg);
751 929
752#ifndef NO_BRIGHTCOLOR 930#ifndef NO_BRIGHTCOLOR
753 R->colorfgbg = DEFAULT_RSTYLE; 931 colorfgbg = DEFAULT_RSTYLE;
754 for (i = minCOLOR; i <= maxCOLOR; i++) { 932 for (i = minCOLOR; i <= maxCOLOR; i++)
933 {
755 if (R->PixColors[Color_fg] == R->PixColors[i]) 934 if (PixColors[Color_fg] == PixColors[i])
756 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_FGCOLOR (colorfgbg, i);
757 if (R->PixColors[Color_bg] == R->PixColors[i]) 936 if (PixColors[Color_bg] == PixColors[i])
758 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 937 colorfgbg = SET_BGCOLOR (colorfgbg, i);
759 } 938 }
760#endif 939#endif
761} 940}
762 941
763/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
764/* 943/*
765 * Colour determination for low colour displays, routine from 944 * Colour determination for low colour displays, routine from
766 * Hans de Goede <hans@highrise.nl> 945 * Hans de Goede <hans@highrise.nl>
767 */ 946 */
768 947
769/* EXTPROTO */
770int 948int
771rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 949rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
772{ 950{
773 screen_in_out->set(aR_ colour);
774
775 if (!screen_in_out->set(aR_ colour)) { 951 if (!screen_in_out->set (display, colour))
952 {
776 rxvt_print_error("can't allocate colour: %s", colour); 953 rxvt_print_error ("can't allocate colour: %s", colour);
777 return false; 954 return false;
778 } 955 }
779 956
780 return true; 957 return true;
781} 958}
782 959
783/* -------------------------------------------------------------------- * 960/* -------------------------------------------------------------------- *
784 * - WINDOW RESIZING - * 961 * - WINDOW RESIZING - *
785 * -------------------------------------------------------------------- */ 962 * -------------------------------------------------------------------- */
786/* EXTPROTO */
787void 963void
788rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 964rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
789 int ignoreparent)
790{ 965{
791 int fix_screen; 966 int fix_screen;
792 967
793#ifdef SMART_RESIZE 968#ifdef SMART_RESIZE
794 int old_width = R->szHint.width, old_height = R->szHint.height; 969 int old_width = szHint.width, old_height = szHint.height;
795#endif 970#endif
796 971
797 rxvt_window_calc(aR_ width, height); 972 window_calc (width, height);
798 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 973 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
799 if (!ignoreparent) { 974 if (!ignoreparent)
975 {
800#ifdef SMART_RESIZE 976#ifdef SMART_RESIZE
801/* 977 /*
802 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 978 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
803 * reposition window on resize depending on placement on screen 979 * reposition window on resize depending on placement on screen
804 */ 980 */
805 int x, y, x1, y1; 981 int x, y, x1, y1;
806 int dx, dy; 982 int dx, dy;
807 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 983 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
808 Window unused_cr; 984 Window unused_cr;
809 985
810 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 986 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
811 0, 0, &x, &y, &unused_cr); 987 0, 0, &x, &y, &unused_cr);
812 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 988 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
813 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 989 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
814 /* 990 /*
815 * if Xroot isn't the parent window, a WM will probably have offset 991 * if display->root isn't the parent window, a WM will probably have offset
816 * our position for handles and decorations. Counter it 992 * our position for handles and decorations. Counter it
817 */ 993 */
818 if (x1 != x || y1 != y) { 994 if (x1 != x || y1 != y)
995 {
819 x -= x1; 996 x -= x1;
820 y -= y1; 997 y -= y1;
821 } 998 }
822 999
823 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1000 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
824 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1001 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
825 dx = old_width - R->szHint.width; 1002 dx = old_width - szHint.width;
826 dy = old_height - R->szHint.height; 1003 dy = old_height - szHint.height;
827 1004
828 /* Check position of the center of the window */ 1005 /* Check position of the center of the window */
829 if (x < x1) /* left half */ 1006 if (x < x1) /* left half */
830 dx = 0; 1007 dx = 0;
831 else if (x == x1) /* exact center */ 1008 else if (x == x1) /* exact center */
832 dx /= 2; 1009 dx /= 2;
833 if (y < y1) /* top half */ 1010 if (y < y1) /* top half */
834 dy = 0; 1011 dy = 0;
835 else if (y == y1) /* exact center */ 1012 else if (y == y1) /* exact center */
836 dy /= 2; 1013 dy /= 2;
837 1014
838 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1015 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
839 R->szHint.width, R->szHint.height); 1016 szHint.width, szHint.height);
840#else 1017#else
841 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1018 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
842 R->szHint.height); 1019 szHint.height);
843#endif 1020#endif
844 }
845 1021
1022 }
1023
846 fix_screen = (R->TermWin.ncol != R->prev_ncol 1024 fix_screen = (TermWin.ncol != prev_ncol
847 || R->TermWin.nrow != R->prev_nrow); 1025 || TermWin.nrow != prev_nrow);
1026
848 if (fix_screen || width != R->old_width || height != R->old_height) { 1027 if (fix_screen || width != old_width || height != old_height)
1028 {
849 if (scrollbar_visible(R)) { 1029 if (scrollbar_visible ())
1030 {
850 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1031 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
851 0, scrollbar_TotalWidth(), R->szHint.height); 1032 0, scrollbar_TotalWidth (), szHint.height);
852 rxvt_Resize_scrollBar(aR); 1033 resize_scrollbar ();
853 } 1034 }
1035
854 if (menubar_visible(R)) 1036 if (menubar_visible ())
855 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1037 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
856 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1038 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1039
857 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1040 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
858 R->window_vt_y, TermWin_TotalWidth(), 1041 window_vt_y, TermWin_TotalWidth (),
859 TermWin_TotalHeight()); 1042 TermWin_TotalHeight ());
860#ifdef RXVT_GRAPHICS
861 if (R->old_height)
862 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
863 R->old_height - R->szHint.base_height);
864#endif
865 rxvt_scr_clear(aR); 1043 scr_clear ();
866#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
867 rxvt_resize_pixmap(aR); 1045 resize_pixmap ();
868#endif 1046#endif
869 }
870 1047
1048 }
1049
871 if (fix_screen || R->old_height == 0) { 1050 if (fix_screen || old_height == 0)
1051 {
872 int curr_screen = -1; 1052 int curr_screen = -1;
873 uint16_t old_ncol = R->prev_ncol; 1053 int old_ncol = prev_ncol;
874 1054
875 /* scr_reset only works on the primary screen */ 1055 /* scr_reset only works on the primary screen */
876 if (R->old_height) /* this is not the first time through */ 1056 if (old_height) /* this is not the first time through */
1057 {
1058 unsigned int ncol = TermWin.ncol;
1059 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
877 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1060 curr_screen = scr_change_screen (PRIMARY);
878 rxvt_scr_reset(aR); 1061 TermWin.ncol = ncol;
879 if (curr_screen >= 0) { /* this is not the first time through */
880 rxvt_scr_change_screen(aR_ curr_screen);
881 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
882 } 1062 }
883 }
884 1063
1064 scr_reset ();
1065
1066 if (curr_screen >= 0) /* this is not the first time through */
1067 {
1068 scr_change_screen (curr_screen);
1069 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1070 }
1071 }
1072
885 R->old_width = R->szHint.width; 1073 old_width = szHint.width;
886 R->old_height = R->szHint.height; 1074 old_height = szHint.height;
887 1075
888#ifdef USE_XIM 1076#ifdef USE_XIM
889 rxvt_IMSetStatusPosition(aR); 1077 IMSetStatusPosition ();
890#endif 1078#endif
891} 1079}
892 1080
893/* 1081/*
894 * Set the width/height of the vt window in characters. Units are pixels. 1082 * Set the width/height of the vt window in characters. Units are pixels.
895 * good for toggling 80/132 columns 1083 * good for toggling 80/132 columns
896 */ 1084 */
897/* EXTPROTO */
898void 1085void
899rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1086rxvt_term::set_widthheight (unsigned int width, unsigned int height)
900{ 1087{
901 XWindowAttributes wattr; 1088 XWindowAttributes wattr;
902 1089
903 if (width == 0 || height == 0) { 1090 if (width == 0 || height == 0)
1091 {
904 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1092 XGetWindowAttributes (display->display, display->root, &wattr);
905 if (width == 0) 1093 if (width == 0)
906 width = wattr.width - R->szHint.base_width; 1094 width = wattr.width - szHint.base_width;
907 if (height == 0) 1095 if (height == 0)
908 height = wattr.height - R->szHint.base_height; 1096 height = wattr.height - szHint.base_height;
909 } 1097 }
910 if (width != R->TermWin.width || height != R->TermWin.height) { 1098 if (width != TermWin.width || height != TermWin.height)
1099 {
911 width += R->szHint.base_width; 1100 width += szHint.base_width;
912 height += R->szHint.base_height; 1101 height += szHint.base_height;
913 rxvt_resize_all_windows(aR_ width, height, 0); 1102 resize_all_windows (width, height, 0);
914 } 1103 }
915} 1104}
916 1105
917/* -------------------------------------------------------------------- * 1106/* -------------------------------------------------------------------- *
918 * - X INPUT METHOD ROUTINES - * 1107 * - X INPUT METHOD ROUTINES - *
919 * -------------------------------------------------------------------- */ 1108 * -------------------------------------------------------------------- */
920#ifdef USE_XIM 1109#ifdef USE_XIM
921/* INTPROTO */ 1110
922void 1111void
923rxvt_setSize(pR_ XRectangle * size) 1112rxvt_term::im_set_size (XRectangle *size)
924{ 1113{
925 size->x = R->TermWin.int_bwidth; 1114 size->x = TermWin.int_bwidth;
926 size->y = R->TermWin.int_bwidth; 1115 size->y = TermWin.int_bwidth;
927 size->width = Width2Pixel(R->TermWin.ncol); 1116 size->width = Width2Pixel (TermWin.ncol);
928 size->height = Height2Pixel(R->TermWin.nrow); 1117 size->height = Height2Pixel (TermWin.nrow);
929} 1118}
930 1119
931/* INTPROTO */
932void 1120void
933rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1121rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
934{ 1122{
935 *fg = R->PixColors[Color_fg]; 1123 *fg = PixColors[Color_fg];
936 *bg = R->PixColors[Color_bg]; 1124 *bg = PixColors[Color_bg];
937} 1125}
938 1126
939/* Checking whether input method is running. */ 1127/* Checking whether input method is running. */
940/* INTPROTO */
941Bool 1128bool
942rxvt_IMisRunning(pR) 1129rxvt_term::IMisRunning ()
943{ 1130{
944 char *p; 1131 char *p;
945 Atom atom; 1132 Atom atom;
946 Window win; 1133 Window win;
947 char server[IMBUFSIZ]; 1134 char server[IMBUFSIZ];
948 1135
949/* get current locale modifier */ 1136 /* get current locale modifier */
950 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1137 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1138 {
951 STRCPY(server, "@server="); 1139 STRCPY (server, "@server=");
952 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1140 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
953 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1141 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
954 *p = '\0'; 1142 *p = '\0';
955 1143
956 atom = XInternAtom(R->Xdisplay, server, False); 1144 atom = XInternAtom (display->display, server, False);
957 win = XGetSelectionOwner(R->Xdisplay, atom); 1145 win = XGetSelectionOwner (display->display, atom);
958 if (win != None) 1146 if (win != None)
959 return True; 1147 return True;
960 } 1148 }
961 return False; 1149 return False;
962} 1150}
963 1151
964/* EXTPROTO */
965void 1152void
966rxvt_IMSendSpot(pR) 1153rxvt_term::IMSendSpot ()
967{ 1154{
968 XPoint spot; 1155 XPoint spot;
969 XVaNestedList preedit_attr; 1156 XVaNestedList preedit_attr;
970 1157
971 if (R->Input_Context == NULL 1158 if (Input_Context == NULL
972 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1159 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
973 || !(R->event_type == KeyPress 1160 || ! (event_type == KeyPress
974 || R->event_type == Expose 1161 || event_type == Expose
975 || R->event_type == NoExpose 1162 || event_type == NoExpose
976 || R->event_type == SelectionNotify 1163 || event_type == SelectionNotify
977 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1164 || event_type == ButtonRelease || event_type == FocusIn)
978 || !rxvt_IMisRunning(aR)) 1165 || !IMisRunning ())
979 return; 1166 return;
980 1167
981 rxvt_setPosition(aR_ & spot); 1168 im_set_position (&spot);
982 1169
983 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1170 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
984 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1171 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
985 XFree(preedit_attr); 1172 XFree (preedit_attr);
986} 1173}
987 1174
988/* EXTPROTO */
989void 1175void
990rxvt_setTermFontSet(pR_ int idx)
991{
992 char *string;
993 long length;
994 int success = 0;
995
996 if (idx < 0 || idx >= MAX_NFONTS)
997 return;
998}
999
1000/* INTPROTO */
1001void
1002rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1176rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1003 XRectangle * needed_rect) 1177 XRectangle * needed_rect)
1004{ 1178{
1005 int mbh, vtx = 0; 1179 int mbh, vtx = 0;
1006 1180
1007 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1181 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1008 vtx = scrollbar_TotalWidth(); 1182 vtx = scrollbar_TotalWidth ();
1183
1009 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1184 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1010 mbh -= R->TermWin.lineSpace; 1185 mbh -= TermWin.lineSpace;
1011 1186
1012 preedit_rect->x = needed_rect->width + vtx; 1187 preedit_rect->x = needed_rect->width + vtx;
1013 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1188 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1014 1189
1015 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1190 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1016 + vtx;
1017 preedit_rect->height = Height2Pixel(1); 1191 preedit_rect->height = Height2Pixel (1);
1018 1192
1019 status_rect->x = vtx; 1193 status_rect->x = vtx;
1020 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1194 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1021 1195
1022 status_rect->width = needed_rect->width ? needed_rect->width 1196 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1023 : Width2Pixel(R->TermWin.ncol + 1);
1024 status_rect->height = Height2Pixel(1); 1197 status_rect->height = Height2Pixel (1);
1025} 1198}
1026 1199
1027/* ARGSUSED */
1028/* INTPROTO */
1029void 1200void
1030rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1201rxvt_term::im_destroy ()
1031 __attribute__ ((unused)), XPointer call_data
1032 __attribute__ ((unused)))
1033{ 1202{
1034 dR; 1203 if (Input_Context)
1035 1204 {
1205 XDestroyIC (Input_Context);
1036 R->Input_Context = NULL; 1206 Input_Context = NULL;
1037/* To avoid Segmentation Fault in C locale: Solaris only? */ 1207 }
1038 if (STRCMP(R->locale, "C"))
1039 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1040 rxvt_IMInstantiateCallback, NULL);
1041}
1042 1208
1043/* 1209 if (input_method)
1044 * X manual pages and include files don't match on some systems:
1045 * some think this is an XIDProc and others an XIMProc so we can't
1046 * use the first argument - need to update this to be nice for
1047 * both types via some sort of configure detection
1048 */
1049/* ARGSUSED */
1050/* EXTPROTO */
1051void
1052rxvt_IMInstantiateCallback(Display * unused
1053 __attribute__ ((unused)), XPointer client_data
1054 __attribute__ ((unused)), XPointer call_data
1055 __attribute__ ((unused)))
1056{
1057 dR;
1058 int i, found, had_im;
1059 const char *p;
1060 char **s;
1061 char buf[IMBUFSIZ];
1062
1063 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1064 if (R->Input_Context)
1065 return;
1066
1067 found = had_im = 0;
1068 p = R->rs[Rs_inputMethod];
1069 if (p && *p) {
1070 had_im = 1;
1071 s = rxvt_splitcommastring(p);
1072 for (i = 0; s[i]; i++) {
1073 if (*s[i]) {
1074 STRCPY(buf, "@im=");
1075 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1076 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1077 && (rxvt_IM_get_IC(aR) == True)) {
1078 found = 1;
1079 break;
1080 }
1081 }
1082 }
1083 for (i = 0; s[i]; i++)
1084 free(s[i]);
1085 free(s);
1086 } 1210 {
1087 if (found) 1211 display->put_xim (input_method);
1088 return; 1212 input_method = 0;
1089
1090/* try with XMODIFIERS env. var. */
1091 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1092 rxvt_IM_get_IC(aR);
1093 return;
1094 } 1213 }
1095
1096/* try with no modifiers base IF the user didn't specify an IM */
1097 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1098 && rxvt_IM_get_IC(aR) == True)
1099 return;
1100} 1214}
1101 1215
1102/* 1216/*
1103 * Try to open a XIM with the current modifiers, then see if we can 1217 * Try to open a XIM with the current modifiers, then see if we can
1104 * open a suitable preedit type 1218 * open a suitable preedit type
1105 */ 1219 */
1106/* INTPROTO */
1107Bool 1220bool
1108rxvt_IM_get_IC(pR) 1221rxvt_term::IM_get_IC (const char *modifiers)
1109{ 1222{
1110 int i, j, found; 1223 int i, j, found;
1111 XIM xim; 1224 XIM xim;
1112 XPoint spot; 1225 XPoint spot;
1113 XRectangle rect, status_rect, needed_rect; 1226 XRectangle rect, status_rect, needed_rect;
1114 unsigned long fg, bg; 1227 unsigned long fg, bg;
1115 const char *p; 1228 const char *p;
1116 char **s; 1229 char **s;
1117 XIMStyles *xim_styles; 1230 XIMStyles *xim_styles;
1118 XVaNestedList preedit_attr, status_attr; 1231 XVaNestedList preedit_attr, status_attr;
1119 XIMCallback ximcallback;
1120 1232
1233 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1234 return false;
1235
1121 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1236 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1122 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1237 input_method = display->get_xim (locale, modifiers);
1123 if (xim == NULL) 1238 if (input_method == NULL)
1124 return False; 1239 return false;
1125 1240
1241 xim = input_method->xim;
1242
1126 xim_styles = NULL; 1243 xim_styles = NULL;
1127 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1244 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1128 || !xim_styles || !xim_styles->count_styles) { 1245 || !xim_styles || !xim_styles->count_styles)
1129 XCloseIM(xim); 1246 {
1247 display->put_xim (input_method);
1130 return False; 1248 return false;
1131 } 1249 }
1132 1250
1133 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1251 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1134 : "OverTheSpot,OffTheSpot,Root";
1135 s = rxvt_splitcommastring(p); 1252 s = rxvt_splitcommastring (p);
1136 for (i = found = 0; !found && s[i]; i++) { 1253 for (i = found = 0; !found && s[i]; i++)
1254 {
1137 if (!STRCMP(s[i], "OverTheSpot")) 1255 if (!STRCMP (s[i], "OverTheSpot"))
1138 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1256 input_style = (XIMPreeditPosition | XIMStatusNothing);
1139 else if (!STRCMP(s[i], "OffTheSpot")) 1257 else if (!STRCMP (s[i], "OffTheSpot"))
1140 R->input_style = (XIMPreeditArea | XIMStatusArea); 1258 input_style = (XIMPreeditArea | XIMStatusArea);
1141 else if (!STRCMP(s[i], "Root")) 1259 else if (!STRCMP (s[i], "Root"))
1142 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1260 input_style = (XIMPreeditNothing | XIMStatusNothing);
1143 1261
1144 for (j = 0; j < xim_styles->count_styles; j++) 1262 for (j = 0; j < xim_styles->count_styles; j++)
1145 if (R->input_style == xim_styles->supported_styles[j]) { 1263 if (input_style == xim_styles->supported_styles[j])
1264 {
1146 found = 1; 1265 found = 1;
1266 break;
1267 }
1268 }
1269
1270 for (i = 0; s[i]; i++)
1271 free (s[i]);
1272
1273 free (s);
1274 XFree (xim_styles);
1275
1276 if (!found)
1277 {
1278 display->put_xim (input_method);
1279 return false;
1280 }
1281
1282 preedit_attr = status_attr = NULL;
1283
1284 if (input_style & XIMPreeditPosition)
1285 {
1286 im_set_size (&rect);
1287 im_set_position (&spot);
1288 im_set_color (&fg, &bg);
1289
1290 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1291 XNSpotLocation, &spot,
1292 XNForeground, fg, XNBackground, bg,
1293 //XNFontSet, TermWin.fontset,
1294 NULL);
1295 }
1296 else if (input_style & XIMPreeditArea)
1297 {
1298 im_set_color (&fg, &bg);
1299
1300 /*
1301 * The necessary width of preedit area is unknown
1302 * until create input context.
1303 */
1304 needed_rect.width = 0;
1305
1306 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1307
1308 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1309 XNForeground, fg, XNBackground, bg,
1310 //XNFontSet, TermWin.fontset,
1311 NULL);
1312 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1313 XNForeground, fg, XNBackground, bg,
1314 //XNFontSet, TermWin.fontset,
1315 NULL);
1316 }
1317
1318 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1319 XNClientWindow, TermWin.parent[0],
1320 XNFocusWindow, TermWin.parent[0],
1321 preedit_attr ? XNPreeditAttributes : NULL,
1322 preedit_attr,
1323 status_attr ? XNStatusAttributes : NULL,
1324 status_attr, NULL);
1325 if (preedit_attr) XFree (preedit_attr);
1326 if (status_attr) XFree (status_attr);
1327
1328 if (Input_Context == NULL)
1329 {
1330 rxvt_print_error ("failed to create input context");
1331 display->put_xim (input_method);
1332 return false;
1333 }
1334
1335 if (input_style & XIMPreeditArea)
1336 IMSetStatusPosition ();
1337
1338 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1339 return true;
1340}
1341
1342void
1343rxvt_term::im_cb ()
1344{
1345 int i, found, had_im;
1346 const char *p;
1347 char **s;
1348 char buf[IMBUFSIZ];
1349
1350 im_destroy ();
1351
1352 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1353 if (Input_Context)
1354 return;
1355
1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1357 if (rs[Rs_imLocale])
1358 SET_LOCALE (rs[Rs_imLocale]);
1359#endif
1360
1361 p = rs[Rs_inputMethod];
1362 if (p && *p)
1363 {
1364 bool found = false;
1365
1366 s = rxvt_splitcommastring (p);
1367 for (i = 0; s[i]; i++)
1368 {
1369 if (*s[i])
1370 {
1371 STRCPY (buf, "@im=");
1372 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1373 if (IM_get_IC (buf))
1374 {
1375 found = true;
1147 break; 1376 break;
1377 }
1148 } 1378 }
1149 } 1379 }
1150 for (i = 0; s[i]; i++) 1380 for (i = 0; s[i]; i++)
1151 free(s[i]); 1381 free (s[i]);
1152 free(s); 1382 free (s);
1153 XFree(xim_styles);
1154 1383
1155 if (!found) { 1384 if (found)
1156 XCloseIM(xim); 1385 goto done;
1157 return False;
1158 } 1386 }
1159 1387
1160 ximcallback.callback = rxvt_IMDestroyCallback; 1388 /* try with XMODIFIERS env. var. */
1389 if (IM_get_IC (""))
1390 goto done;
1161 1391
1162/* XXX: not sure why we need this (as well as IC one below) */ 1392 /* try with no modifiers base IF the user didn't specify an IM */
1163 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1393 if (IM_get_IC ("@im=none"))
1394 goto done;
1164 1395
1165 preedit_attr = status_attr = NULL; 1396done:
1166 1397#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1167 if (R->input_style & XIMPreeditPosition) { 1398 if (rs[Rs_imLocale])
1168 rxvt_setSize(aR_ & rect); 1399 SET_LOCALE (locale);
1169 rxvt_setPosition(aR_ & spot); 1400#endif
1170 rxvt_setColor(aR_ & fg, &bg);
1171
1172 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1173 XNSpotLocation, &spot,
1174 XNForeground, fg, XNBackground, bg,
1175 //XNFontSet, R->TermWin.fontset,
1176 NULL);
1177 } else if (R->input_style & XIMPreeditArea) {
1178 rxvt_setColor(aR_ & fg, &bg);
1179
1180 /*
1181 * The necessary width of preedit area is unknown
1182 * until create input context.
1183 */
1184 needed_rect.width = 0;
1185
1186 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1187
1188 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1189 XNForeground, fg, XNBackground, bg,
1190 //XNFontSet, R->TermWin.fontset,
1191 NULL);
1192 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1193 XNForeground, fg, XNBackground, bg,
1194 //XNFontSet, R->TermWin.fontset,
1195 NULL);
1196 }
1197 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1198 XNClientWindow, R->TermWin.parent[0],
1199 XNFocusWindow, R->TermWin.parent[0],
1200 XNDestroyCallback, &ximcallback,
1201 preedit_attr ? XNPreeditAttributes : NULL,
1202 preedit_attr,
1203 status_attr ? XNStatusAttributes : NULL,
1204 status_attr, NULL);
1205 if (preedit_attr)
1206 XFree(preedit_attr);
1207 if (status_attr)
1208 XFree(status_attr);
1209 if (R->Input_Context == NULL) {
1210 rxvt_print_error("failed to create input context");
1211 XCloseIM(xim);
1212 return False;
1213 }
1214 if (R->input_style & XIMPreeditArea)
1215 rxvt_IMSetStatusPosition(aR);
1216 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1217 return True;
1218} 1401}
1219 1402
1220/* EXTPROTO */
1221void 1403void
1222rxvt_IMSetStatusPosition(pR) 1404rxvt_term::IMSetStatusPosition ()
1223{ 1405{
1224 XRectangle preedit_rect, status_rect, *needed_rect; 1406 XRectangle preedit_rect, status_rect, *needed_rect;
1225 XVaNestedList preedit_attr, status_attr; 1407 XVaNestedList preedit_attr, status_attr;
1226 1408
1227 if (R->Input_Context == NULL 1409 if (Input_Context == NULL
1228 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1410 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1229 || !rxvt_IMisRunning(aR)) 1411 || !IMisRunning ())
1230 return; 1412 return;
1231 1413
1232/* Getting the necessary width of preedit area */ 1414 /* Getting the necessary width of preedit area */
1233 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1415 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1234 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1416 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1235 XFree(status_attr); 1417 XFree (status_attr);
1236 1418
1237 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1419 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1238 1420
1239 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1421 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1422 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1241 1423
1242 XSetICValues(R->Input_Context, 1424 XSetICValues (Input_Context,
1243 XNPreeditAttributes, preedit_attr, 1425 XNPreeditAttributes, preedit_attr,
1244 XNStatusAttributes, status_attr, NULL); 1426 XNStatusAttributes, status_attr, NULL);
1245 1427
1246 XFree(preedit_attr); 1428 XFree (preedit_attr);
1247 XFree(status_attr); 1429 XFree (status_attr);
1248} 1430}
1249#endif /* USE_XIM */ 1431#endif /* USE_XIM */
1250 1432
1251/*----------------------------------------------------------------------*/ 1433/*----------------------------------------------------------------------*/
1252rxvt_t rxvt_current_term; 1434rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines