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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines