ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.34 by pcg, Fri Feb 20 22:27:27 2004 UTC

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

Diff Legend

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