[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H	43	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	44	# include <termios.h>
49	#endif	45	#endif
50		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
51	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
52		57
53	// used to tell global functions which terminal instance is "active"	58	// used to tell global functions which terminal instance is "active"
54	rxvt_t rxvt_current_term;	59	rxvt_t rxvt_current_term;
55		60
56	static char curlocale[128], savelocale[128];	61	static char curlocale[128], savelocale[128];
57		62
58	bool	63	bool
59	rxvt_set_locale (const char *locale) NOTHROW	64	rxvt_set_locale (const char *locale) NOTHROW
60	{	65	{
		66	int size = strlen (locale) + 1;
		67
		68	if (size > sizeof (curlocale))
		69	rxvt_fatal ("locale string too long, aborting.\n");
		70
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	71	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	72	return false;
63		73
64	strncpy (curlocale, locale, 128);	74	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	75	setlocale (LC_CTYPE, curlocale);
66	return true;	76	return true;
67	}	77	}
68		78
69	void	79	void
…		…
83	class rxvt_composite_vec rxvt_composite;	93	class rxvt_composite_vec rxvt_composite;
84		94
85	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	95	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86	{	96	{
87	compose_char *cc;	97	compose_char *cc;
88		98
89	// break compose chains, as stupid readline really likes to duplicate	99	// break compose chains, as stupid readline really likes to duplicate
90	// composing characters for some reason near the end of a line.	100	// composing characters for some reason near the end of a line.
91	cc = (*this)[c1];	101	cc = (*this)[c1];
92	while (cc)	102	while (cc)
93	{	103	{
…		…
143	}	153	}
144	#endif	154	#endif
145		155
146	rxvt_term::rxvt_term ()	156	rxvt_term::rxvt_term ()
147	:	157	:
148	#if TRANSPARENT	158	#if HAVE_BG_PIXMAP
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	159	update_background_ev(this, &rxvt_term::update_background_cb),
150	#endif
151	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),
153	#endif	160	#endif
154	#ifdef CURSOR_BLINK	161	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	162	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif	163	#endif
157	#ifdef TEXT_BLINK	164	#ifdef TEXT_BLINK
…		…
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	174	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif	175	#endif
169	#ifdef POINTER_BLANK	176	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	177	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	178	#endif
		179	#ifndef NO_BELL
		180	bell_ev (this, &rxvt_term::bell_cb),
		181	#endif
		182	child_ev (this, &rxvt_term::child_cb),
		183	prepare_ev (this, &rxvt_term::prepare_cb),
		184	flush_ev (this, &rxvt_term::flush_cb),
		185	destroy_ev (this, &rxvt_term::destroy_cb),
		186	pty_ev (this, &rxvt_term::pty_cb),
		187	incr_ev (this, &rxvt_term::incr_cb)
		188	{
		189	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		190	callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
		191	#endif
		192	#ifdef HAVE_SCROLLBARS
		193	callback_set (scrollbar_ev, this, rxvt_term, x_cb);
		194	#endif
172	#ifdef USE_XIM	195	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	196	callback_set (im_ev , this, rxvt_term, im_cb);
174	#endif	197	#endif
175	#ifndef NO_BELL	198	callback_set (termwin_ev , this, rxvt_term, x_cb);
176	bell_ev (this, &rxvt_term::bell_cb),	199	callback_set (vt_ev , this, rxvt_term, x_cb);
177	#endif	200
178	termwin_ev (this, &rxvt_term::x_cb),
179	vt_ev (this, &rxvt_term::x_cb),
180	child_ev (this, &rxvt_term::child_cb),
181	check_ev (this, &rxvt_term::check_cb),
182	flush_ev (this, &rxvt_term::flush_cb),
183	destroy_ev (this, &rxvt_term::destroy_cb),
184	pty_ev (this, &rxvt_term::pty_cb),
185	incr_ev (this, &rxvt_term::incr_cb)
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	201	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		202
189	termlist.push_back (this);	203	termlist.push_back (this);
190		204
191	#ifdef KEYSYM_RESOURCE	205	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	207	#endif
194	}	208	}
195		209
196	// clean up the most important stuff, do not call x or free mem etc.	210	// clean up the most important stuff, do not call x or free mem etc.
197	// for use before an emergency exit	211	// for use before an emergency exit
		212	void
198	void rxvt_term::emergency_cleanup ()	213	rxvt_term::emergency_cleanup ()
199	{	214	{
200	if (cmd_pid)	215	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	216	kill (-cmd_pid, SIGHUP);
202		217
		218	pty_ev.stop ();
203	delete pty; pty = 0;	219	delete pty; pty = 0;
204	}	220	}
205		221
206	rxvt_term::~rxvt_term ()	222	rxvt_term::~rxvt_term ()
207	{	223	{
…		…
222		238
223	#ifdef USE_XIM	239	#ifdef USE_XIM
224	im_destroy ();	240	im_destroy ();
225	#endif	241	#endif
226	#ifdef XTERM_SCROLLBAR	242	#ifdef XTERM_SCROLLBAR
227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);	243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);	244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
229	#endif	245	#endif
230	#ifdef PLAIN_SCROLLBAR	246	#ifdef PLAIN_SCROLLBAR
231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);	247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232	#endif	248	#endif
233	#ifdef NEXT_SCROLLBAR	249	#ifdef NEXT_SCROLLBAR
234	if (blackGC) XFreeGC (xdisp, blackGC);	250	if (blackGC) XFreeGC (dpy, blackGC);
235	if (whiteGC) XFreeGC (xdisp, whiteGC);	251	if (whiteGC) XFreeGC (dpy, whiteGC);
236	if (grayGC) XFreeGC (xdisp, grayGC);	252	if (grayGC) XFreeGC (dpy, grayGC);
237	if (darkGC) XFreeGC (xdisp, darkGC);	253	if (darkGC) XFreeGC (dpy, darkGC);
238	if (stippleGC) XFreeGC (xdisp, stippleGC);	254	if (stippleGC) XFreeGC (dpy, stippleGC);
239	if (dimple) XFreePixmap (xdisp, dimple);	255	if (dimple) XFreePixmap (dpy, dimple);
240	if (upArrow) XFreePixmap (xdisp, upArrow);	256	if (upArrow) XFreePixmap (dpy, upArrow);
241	if (downArrow) XFreePixmap (xdisp, downArrow);	257	if (downArrow) XFreePixmap (dpy, downArrow);
242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);	258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);	259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244	#endif	260	#endif
245	#ifdef RXVT_SCROLLBAR	261	#ifdef RXVT_SCROLLBAR
246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);	262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);	263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);	264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249	#endif	265	#endif
250	if (gc) XFreeGC (xdisp, gc);	266	if (gc) XFreeGC (dpy, gc);
251		267
252	delete drawable;	268	delete drawable;
253	// destroy all windows	269	// destroy all windows
254	if (parent[0])	270	if (parent[0])
255	XDestroyWindow (xdisp, parent[0]);	271	XDestroyWindow (dpy, parent[0]);
		272
		273	for (int i = 0; i < TOTAL_COLORS; i++)
		274	if (ISSET_PIXCOLOR (i))
		275	{
		276	pix_colors_focused [i].free (this);
		277	#if OFF_FOCUS_FADING
		278	pix_colors_unfocused [i].free (this);
		279	#endif
		280	}
256		281
257	clear ();	282	clear ();
258	}	283	}
259		284
260	// TODO: free pixcolours, colours should become part of rxvt_display
261	delete pix_colors_focused;	285	delete [] pix_colors_focused;
262	#if OFF_FOCUS_FADING	286	#if OFF_FOCUS_FADING
263	delete pix_colors_unfocused;	287	delete [] pix_colors_unfocused;
264	#endif	288	#endif
265		289
		290	#ifdef HAVE_BG_PIXMAP
		291	bgPixmap.destroy ();
		292	#endif
266	displays.put (display);	293	displays.put (display);
267		294
268	scr_release ();	295	scr_release ();
269		296
270	/* clear all resources */	297	/* clear all resources */
…		…
283	delete argv;	310	delete argv;
284		311
285	#ifdef KEYSYM_RESOURCE	312	#ifdef KEYSYM_RESOURCE
286	delete keyboard;	313	delete keyboard;
287	#endif	314	#endif
		315	#ifndef NO_RESOURCES
		316	XrmDestroyDatabase (option_db);
		317	#endif
288	}	318	}
289		319
290	// child has exited, usually destroys	320	// child has exited, usually destroys
291	void	321	void
292	rxvt_term::child_cb (child_watcher &w, int status)	322	rxvt_term::child_cb (ev::child &w, int status)
293	{	323	{
294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	324	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295		325
296	cmd_pid = 0;	326	cmd_pid = 0;
297		327
298	if (!OPTION (Opt_hold))	328	if (!option (Opt_hold))
299	destroy ();	329	destroy ();
300	}	330	}
301		331
302	void	332	void
303	rxvt_term::destroy ()	333	rxvt_term::destroy ()
…		…
317	im_ev.stop (display);	347	im_ev.stop (display);
318	#endif	348	#endif
319	#if HAVE_SCROLLBARS	349	#if HAVE_SCROLLBARS
320	scrollbar_ev.stop (display);	350	scrollbar_ev.stop (display);
321	#endif	351	#endif
322	#if TRANSPARENT	352	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
323	rootwin_ev.stop (display);	353	rootwin_ev.stop (display);
324	#endif	354	#endif
325	incr_ev.stop ();	355	incr_ev.stop ();
326	termwin_ev.stop (display);	356	termwin_ev.stop (display);
327	vt_ev.stop (display);	357	vt_ev.stop (display);
328	}	358	}
329		359
330	check_ev.stop ();	360	prepare_ev.stop ();
331	pty_ev.stop ();	361	pty_ev.stop ();
332	#ifdef CURSOR_BLINK	362	#ifdef CURSOR_BLINK
333	cursor_blink_ev.stop ();	363	cursor_blink_ev.stop ();
334	#endif	364	#endif
335	#ifdef TEXT_BLINK	365	#ifdef TEXT_BLINK
…		…
343	#endif	373	#endif
344	#ifdef POINTER_BLANK	374	#ifdef POINTER_BLANK
345	pointer_ev.stop ();	375	pointer_ev.stop ();
346	#endif	376	#endif
347		377
348	destroy_ev.start (0);	378	destroy_ev.start ();
349	}	379	}
350		380
351	void	381	void
352	rxvt_term::destroy_cb (time_watcher &w)	382	rxvt_term::destroy_cb (ev::idle &w, int revents)
353	{	383	{
354	make_current ();	384	make_current ();
355		385
356	delete this;	386	delete this;
357	}	387	}
…		…
411	else	441	else
412	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	442	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413	mesg, BUFSIZ);	443	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415	}	445	}
416	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	446	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417	mesg, BUFSIZ);	447	mesg, BUFSIZ);
418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	448	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419	}	449	}
420	#endif	450	#endif
421		451
…		…
467	#ifdef KEYSYM_RESOURCE	497	#ifdef KEYSYM_RESOURCE
468	keyboard->register_done ();	498	keyboard->register_done ();
469	#endif	499	#endif
470		500
471	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
472	if (OPTION (Opt_scrollBar))	502	if (option (Opt_scrollBar))
473	scrollBar.setIdle (); /* set existence for size calculations */	503	scrollBar.setIdle (); /* set existence for size calculations */
474	#endif	504	#endif
475		505
476	pty = ptytty::create ();	506	pty = ptytty::create ();
477		507
…		…
480	init_xlocale ();	510	init_xlocale ();
481		511
482	scr_reset (); // initialize screen	512	scr_reset (); // initialize screen
483		513
484	#if 0	514	#if 0
485	XSynchronize (xdisp, True);	515	XSynchronize (dpy, True);
486	#endif	516	#endif
487		517
488	#ifdef HAVE_SCROLLBARS	518	#ifdef HAVE_SCROLLBARS
489	if (OPTION (Opt_scrollBar))	519	if (option (Opt_scrollBar))
490	resize_scrollbar (); /* create and map scrollbar */	520	resize_scrollbar (); /* create and map scrollbar */
491	#endif	521	#endif
		522	#ifdef HAVE_BG_PIXMAP
		523	{
		524	bgPixmap.set_target (this);
		525
492	#ifdef TRANSPARENT	526	#ifdef ENABLE_TRANSPARENCY
493	if (OPTION (Opt_transparent))	527	if (option (Opt_transparent))
494	{	528	{
		529	bgPixmap.set_transparent ();
		530	#ifdef HAVE_AFTERIMAGE
		531	if (rs [Rs_blurradius])
		532	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		533	#endif
		534	if (ISSET_PIXCOLOR (Color_tint))
		535	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		536	if (rs [Rs_shade])
		537	bgPixmap.set_shade (rs [Rs_shade]);
		538
		539	bgPixmap.set_root_pixmap ();
495	XSelectInput (xdisp, display->root, PropertyChangeMask);	540	XSelectInput (dpy, display->root, PropertyChangeMask);
496	check_our_parents ();
497	rootwin_ev.start (display, display->root);	541	rootwin_ev.start (display, display->root);
498	}	542	}
		543	#endif
		544
		545	#ifdef BG_IMAGE_FROM_FILE
		546	if (rs[Rs_backgroundPixmap] != NULL)
		547	{
		548	const char *p = rs[Rs_backgroundPixmap];
		549
		550	if ((p = strchr (p, ';')) != NULL)
		551	{
		552	p++;
		553	bgPixmap.set_geometry (p);
		554	}
		555	else
		556	bgPixmap.set_defaultGeometry ();
		557
		558	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		559	if (!bgPixmap.window_position_sensitive ())
		560	update_background ();
		561	}
		562	#endif
		563	}
		564	#endif
		565
		566	#if ENABLE_PERL
		567	rootwin_ev.start (display, display->root);
499	#endif	568	#endif
500		569
501	set_colorfgbg ();	570	set_colorfgbg ();
502		571
503	init_command (cmd_argv);	572	init_command (cmd_argv);
504		573
505	free (cmd_argv);	574	free (cmd_argv);
506		575
507	if (pty->pty >= 0)	576	if (pty->pty >= 0)
508	pty_ev.start (pty->pty, EVENT_READ);	577	pty_ev.start (pty->pty, ev::READ);
509		578
510	check_ev.start ();	579	prepare_ev.start ();
511		580
512	HOOK_INVOKE ((this, HOOK_START, DT_END));	581	HOOK_INVOKE ((this, HOOK_START, DT_END));
513		582
514	#if ENABLE_XEMBED	583	#if ENABLE_XEMBED
515	if (rs[Rs_embed])	584	if (rs[Rs_embed])
516	{	585	{
517	long info[2] = { 0, XEMBED_MAPPED };	586	long info[2] = { 0, XEMBED_MAPPED };
518		587
519	XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	588	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520	32, PropModeReplace, (unsigned char *)&info, 2);	589	32, PropModeReplace, (unsigned char *)&info, 2);
521	}	590	}
522	#endif	591	#endif
523		592
524	XMapWindow (xdisp, vt);	593	XMapWindow (dpy, vt);
525	XMapWindow (xdisp, parent[0]);	594	XMapWindow (dpy, parent[0]);
526		595
527	return true;	596	return true;
528	}	597	}
529		598
530	static struct sig_handlers	599	static struct sig_handlers
531	{	600	{
532	sig_watcher sw_term, sw_int;	601	ev::sig sw_term, sw_int;
533		602
534	/*	603	/*
535	* Catch a fatal signal and tidy up before quitting	604	* Catch a fatal signal and tidy up before quitting
536	*/	605	*/
537	void	606	void
538	sig_term (sig_watcher &w)	607	sig_term (ev::sig &w, int revents)
539	{	608	{
540	rxvt_emergency_cleanup ();	609	rxvt_emergency_cleanup ();
541	signal (w.signum, SIG_DFL);	610	w.stop ();
542	kill (getpid (), w.signum);	611	kill (getpid (), w.signum);
543	}	612	}
544		613
545	sig_handlers ()	614	sig_handlers ()
546	: sw_term (this, &sig_handlers::sig_term),	615	: sw_term (this, &sig_handlers::sig_term),
…		…
554	void	623	void
555	rxvt_init ()	624	rxvt_init ()
556	{	625	{
557	ptytty::init ();	626	ptytty::init ();
558		627
		628	if (!ev_default_loop (0))
		629	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
		630
559	rxvt_environ = environ;	631	rxvt_environ = environ;
560		632
561	signal (SIGHUP, SIG_IGN);	633	signal (SIGHUP, SIG_IGN);
562	signal (SIGPIPE, SIG_IGN);	634	signal (SIGPIPE, SIG_IGN);
563		635
564	sig_handlers.sw_term.start (SIGTERM);	636	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565	sig_handlers.sw_int.start (SIGINT);	637	sig_handlers.sw_int.start (SIGINT); ev_unref ();
566		638
567	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	639	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
568	/* signal (SIGURG, SIG_DFL); */	640	/* signal (SIGURG, SIG_DFL); */
569		641
570	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	642	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
610	return p;	682	return p;
611	}	683	}
612		684
613	/----------------------------------------------------------------------/	685	/----------------------------------------------------------------------/
614	/*	686	/*
615	* window size/position calculcations for XSizeHint and other storage.	687	* window size/position calculations for XSizeHint and other storage.
616	* if width/height are non-zero then override calculated width/height	688	* if width/height are non-zero then override calculated width/height
617	*/	689	*/
618	void	690	void
619	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	691	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620	{	692	{
…		…
691		763
692	if (scrollBar.state)	764	if (scrollBar.state)
693	{	765	{
694	sb_w = scrollbar_TotalWidth ();	766	sb_w = scrollbar_TotalWidth ();
695	szHint.base_width += sb_w;	767	szHint.base_width += sb_w;
		768
696	if (!OPTION (Opt_scrollBar_right))	769	if (!option (Opt_scrollBar_right))
697	window_vt_x += sb_w;	770	window_vt_x += sb_w;
698	}	771	}
699		772
700	szHint.width_inc = fwidth;	773	szHint.width_inc = fwidth;
701	szHint.height_inc = fheight;	774	szHint.height_inc = fheight;
702	szHint.min_width = szHint.base_width + szHint.width_inc;	775	szHint.min_width = szHint.base_width + szHint.width_inc;
703	szHint.min_height = szHint.base_height + szHint.height_inc;	776	szHint.min_height = szHint.base_height + szHint.height_inc;
704		777
705	if (newwidth && newwidth - szHint.base_width < max_width)	778	if (newwidth && newwidth - szHint.base_width < max_width)
706	{	779	{
707	szHint.width = newwidth;	780	szHint.width = newwidth;
…		…
722	{	795	{
723	min_it (height, max_height);	796	min_it (height, max_height);
724	szHint.height = szHint.base_height + height;	797	szHint.height = szHint.base_height + height;
725	}	798	}
726		799
727	if (scrollBar.state && OPTION (Opt_scrollBar_right))	800	if (scrollBar.state && option (Opt_scrollBar_right))
728	window_sb_x = szHint.width - sb_w;	801	window_sb_x = szHint.width - sb_w;
729		802
730	if (recalc_x)	803	if (recalc_x)
731	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;	804	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732		805
733	if (recalc_y)	806	if (recalc_y)
734	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;	807	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735		808
736	ncol = width / fwidth;	809	ncol = width / fwidth;
737	nrow = height / fheight;	810	nrow = height / fheight;
738	}	811	}
739		812
…		…
794	delete fontset[0];	867	delete fontset[0];
795	fontset[0] = fs;	868	fontset[0] = fs;
796		869
797	prop = (*fs)[1]->properties ();	870	prop = (*fs)[1]->properties ();
798	prop.height += lineSpace;	871	prop.height += lineSpace;
		872
799	fs->set_prop (prop);	873	fs->set_prop (prop, false);
800		874
801	fwidth = prop.width;	875	fwidth = prop.width;
802	fheight = prop.height;	876	fheight = prop.height;
803	fbase = prop.ascent;	877	fbase = prop.ascent;
804		878
…		…
813	{	887	{
814	fontset[style] = fs = new rxvt_fontset (this);	888	fontset[style] = fs = new rxvt_fontset (this);
815	rxvt_fontprop prop2 = prop;	889	rxvt_fontprop prop2 = prop;
816		890
817	if (res)	891	if (res)
818	prop2.weight = prop2.slant = rxvt_fontprop::unset;	892	{
		893	fs->populate (res);
		894	fs->set_prop (prop2, false);
		895	}
819	else	896	else
820	{	897	{
821	res = fontset[0]->fontdesc;	898	fs->populate (fontset[0]->fontdesc);
822		899
823	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	900	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	901	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		902
		903	fs->set_prop (prop2, true);
825	}	904	}
826		905
827	fs->populate (res);
828	fs->set_prop (prop2);
829	}	906	}
830	#else	907	#else
831	fontset[style] = fontset[0];	908	fontset[style] = fontset[0];
832	#endif	909	#endif
833	}	910	}
…		…
835	if (parent[0])	912	if (parent[0])
836	{	913	{
837	resize_all_windows (0, 0, 0);	914	resize_all_windows (0, 0, 0);
838	scr_remap_chars ();	915	scr_remap_chars ();
839	scr_touch (true);	916	scr_touch (true);
840	}	917	}
841		918
842	return true;	919	return true;
843	}	920	}
844		921
		922	void
845	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	923	rxvt_term::set_string_property (Atom prop, const char *str, int len)
846	{	924	{
847	XChangeProperty (xdisp, parent[0],	925	XChangeProperty (dpy, parent[0],
848	prop, XA_STRING, 8, PropModeReplace,	926	prop, XA_STRING, 8, PropModeReplace,
849	(const unsigned char *)str, len >= 0 ? len : strlen (str));	927	(const unsigned char *)str, len >= 0 ? len : strlen (str));
850	}	928	}
851		929
		930	void
852	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	931	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853	{	932	{
854	wchar_t *ws = rxvt_mbstowcs (str, len);	933	wchar_t *ws = rxvt_mbstowcs (str, len);
855	char *s = rxvt_wcstoutf8 (ws);	934	char *s = rxvt_wcstoutf8 (ws);
856		935
857	XChangeProperty (xdisp, parent[0],	936	XChangeProperty (dpy, parent[0],
858	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	937	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859	(const unsigned char *)s, strlen (s));	938	(const unsigned char *)s, strlen (s));
860		939
861	free (s);	940	free (s);
862	free (ws);	941	free (ws);
…		…
881	#if ENABLE_EWMH	960	#if ENABLE_EWMH
882	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	961	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883	#endif	962	#endif
884	}	963	}
885		964
		965	void
		966	rxvt_term::set_window_color (int idx, const char *color)
		967	{
886	#ifdef XTERM_COLOR_CHANGE	968	#ifdef XTERM_COLOR_CHANGE
887	void
888	rxvt_term::set_window_color (int idx, const char *color)
889	{
890	rxvt_color xcol;	969	rxvt_color xcol;
891	int i;	970	int i;
892		971
893	if (color == NULL \|\| *color == '\0')	972	if (color == NULL \|\| *color == '\0')
894	return;	973	return;
895		974
896	color = strdup (color);	975	color = strdup (color);
897	allocated.push_back ((void *)color);	976	allocated.push_back ((void *)color);
…		…
901	if (isdigit (*color))	980	if (isdigit (*color))
902	{	981	{
903	i = atoi (color);	982	i = atoi (color);
904		983
905	if (i >= 8 && i <= 15)	984	if (i >= 8 && i <= 15)
		985	{
906	{ /* bright colors */	986	/* bright colors */
907	i -= 8;
908	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909	goto done;	988	goto done;
910	}	989	}
911		990
912	if (i >= 0 && i <= 7)	991	if (i >= 0 && i <= 7)
		992	{
913	{ /* normal colors */	993	/* normal colors */
914	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	994	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
915	goto done;	995	goto done;
916	}	996	}
917	}	997	}
918		998
…		…
923	* so just keep gobbling up the colormap	1003	* so just keep gobbling up the colormap
924	*/	1004	*/
925		1005
926	pix_colors_focused[idx] = xcol;	1006	pix_colors_focused[idx] = xcol;
927		1007
928	/* XSetWindowAttributes attr; */
929	/* Cursor cursor; */
930	done:	1008	done:
931
932	#if OFF_FOCUS_FADING
933	if (rs[Rs_fade])
934	{
935	rgba c;
936	pix_colors [Color_fade].get (this, c);
937	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
938	}
939	#endif
940
941	/TODO: handle Color_BD, scrollbar background, etc. /	1009	/TODO: handle Color_BD, scrollbar background, etc. /
942		1010
		1011	update_fade_color (idx);
943	recolour_cursor ();	1012	recolour_cursor ();
944	scr_recolour ();	1013	scr_recolour ();
		1014	#endif /* XTERM_COLOR_CHANGE */
945	}	1015	}
946
947	#else
948	# define set_window_color (idx,color) ((void)0)
949	#endif /* XTERM_COLOR_CHANGE */
950		1016
951	void	1017	void
952	rxvt_term::recolour_cursor ()	1018	rxvt_term::recolour_cursor ()
953	{	1019	{
954	XColor xcol[2];	1020	XColor fg, bg;
955		1021
956	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	1022	(ISSET_PIXCOLOR (Color_pointer_fg)
957	? pix_colors_focused[Color_pointer_fg]	1023	? pix_colors_focused[Color_pointer_fg]
958	: pix_colors_focused[Color_fg];	1024	: pix_colors_focused[Color_fg]).get (fg);
		1025
959	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	1026	(ISSET_PIXCOLOR (Color_pointer_bg)
960	? pix_colors_focused[Color_pointer_bg]	1027	? pix_colors_focused[Color_pointer_bg]
961	: pix_colors_focused[Color_bg];	1028	: pix_colors_focused[Color_bg]).get (bg);
962		1029
963	XQueryColors (xdisp, cmap, xcol, 2);
964	XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);	1030	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965	}	1031	}
966		1032
967	/----------------------------------------------------------------------/	1033	/----------------------------------------------------------------------/
968	/*	1034	/*
969	* find if fg/bg matches any of the normal (low-intensity) colors	1035	* find if fg/bg matches any of the normal (low-intensity) colors
970	*/	1036	*/
971	void	1037	void
972	rxvt_term::set_colorfgbg ()	1038	rxvt_term::set_colorfgbg ()
973	{	1039	{
974	unsigned int i;	1040	unsigned int i;
975	const char *xpmb = "\0";	1041	const char *xpmb = "";
976	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1042	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
977		1043
978	strcpy (fstr, "default");	1044	strcpy (fstr, "default");
979	strcpy (bstr, "default");	1045	strcpy (bstr, "default");
980	for (i = Color_Black; i <= Color_White; i++)	1046	for (i = Color_Black; i <= Color_White; i++)
…		…
986		1052
987	for (i = Color_Black; i <= Color_White; i++)	1053	for (i = Color_Black; i <= Color_White; i++)
988	if (pix_colors[Color_bg] == pix_colors[i])	1054	if (pix_colors[Color_bg] == pix_colors[i])
989	{	1055	{
990	sprintf (bstr, "%d", (i - Color_Black));	1056	sprintf (bstr, "%d", (i - Color_Black));
991	#ifdef XPM_BACKGROUND	1057	#ifdef BG_IMAGE_FROM_FILE
992	xpmb = "default;";	1058	xpmb = "default;";
993	#endif	1059	#endif
994	break;	1060	break;
995	}	1061	}
996		1062
…		…
1005	if (color.set (this, name))	1071	if (color.set (this, name))
1006	return true;	1072	return true;
1007		1073
1008	rxvt_warn ("can't get colour '%s', continuing without.\n", name);	1074	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009	return false;	1075	return false;
		1076	}
		1077
		1078	void
		1079	rxvt_term::alias_color (int dst, int src)
		1080	{
		1081	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1010	}	1082	}
1011		1083
1012	/* -------------------------------------------------------------------- *	1084	/* -------------------------------------------------------------------- *
1013	* - WINDOW RESIZING - *	1085	* - WINDOW RESIZING - *
1014	* -------------------------------------------------------------------- */	1086	* -------------------------------------------------------------------- */
…		…
1018	int fix_screen;	1090	int fix_screen;
1019	int old_width = szHint.width;	1091	int old_width = szHint.width;
1020	int old_height = szHint.height;	1092	int old_height = szHint.height;
1021		1093
1022	window_calc (newwidth, newheight);	1094	window_calc (newwidth, newheight);
		1095
		1096	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1023	XSetWMNormalHints (xdisp, parent[0], &szHint);	1097	XSetWMNormalHints (dpy, parent[0], &szHint);
1024		1098
1025	if (!ignoreparent)	1099	if (!ignoreparent)
1026	{	1100	{
1027	#ifdef SMART_RESIZE	1101	#ifdef SMART_RESIZE
1028	/*	1102	/*
…		…
1032	int x, y, x1, y1;	1106	int x, y, x1, y1;
1033	int dx, dy;	1107	int dx, dy;
1034	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1108	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035	Window unused_cr;	1109	Window unused_cr;
1036		1110
1037	XTranslateCoordinates (xdisp, parent[0], display->root,	1111	XTranslateCoordinates (dpy, parent[0], display->root,
1038	0, 0, &x, &y, &unused_cr);	1112	0, 0, &x, &y, &unused_cr);
1039	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,	1113	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1114	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041	/*	1115	/*
1042	* if display->root isn't the parent window, a WM will probably have offset	1116	* if display->root isn't the parent window, a WM will probably have offset
1043	* our position for handles and decorations. Counter it	1117	* our position for handles and decorations. Counter it
1044	*/	1118	*/
…		…
1046	{	1120	{
1047	x -= x1;	1121	x -= x1;
1048	y -= y1;	1122	y -= y1;
1049	}	1123	}
1050		1124
1051	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;	1125	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;	1126	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053	dx = old_width - szHint.width;	1127	dx = old_width - szHint.width;
1054	dy = old_height - szHint.height;	1128	dy = old_height - szHint.height;
1055		1129
1056	/* Check position of the center of the window */	1130	/* Check position of the center of the window */
1057	if (x < x1) /* left half */	1131	if (x < x1) /* left half */
…		…
1061	if (y < y1) /* top half */	1135	if (y < y1) /* top half */
1062	dy = 0;	1136	dy = 0;
1063	else if (y == y1) /* exact center */	1137	else if (y == y1) /* exact center */
1064	dy /= 2;	1138	dy /= 2;
1065		1139
1066	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,	1140	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067	szHint.width, szHint.height);	1141	szHint.width, szHint.height);
1068	#else	1142	#else
1069	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);	1143	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070	#endif	1144	#endif
1071	}	1145	}
1072		1146
1073	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1147	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1074		1148
1075	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1149	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1076	{	1150	{
1077	if (scrollBar.state)	1151	if (scrollBar.state)
1078	{	1152	{
1079	XMoveResizeWindow (xdisp, scrollBar.win,	1153	XMoveResizeWindow (dpy, scrollBar.win,
1080	window_sb_x, 0,	1154	window_sb_x, 0,
1081	scrollbar_TotalWidth (), szHint.height);	1155	scrollbar_TotalWidth (), szHint.height);
1082	resize_scrollbar ();	1156	resize_scrollbar ();
1083	}	1157	}
1084		1158
1085	XMoveResizeWindow (xdisp, vt,	1159	XMoveResizeWindow (dpy, vt,
1086	window_vt_x, window_vt_y,	1160	window_vt_x, window_vt_y,
1087	width, height);	1161	width, height);
1088		1162
		1163	#ifdef HAVE_BG_PIXMAP
		1164	if (bgPixmap.window_size_sensitive ())
		1165	update_background ();
		1166	#endif
		1167
1089	scr_clear ();	1168	scr_clear ();
1090	#ifdef XPM_BACKGROUND
1091	resize_pixmap ();
1092	#endif
1093	}	1169	}
1094		1170
1095	if (fix_screen \|\| old_height == 0)	1171	if (fix_screen \|\| old_height == 0)
1096	scr_reset ();	1172	scr_reset ();
1097		1173
1098	#ifdef XPM_BACKGROUND	1174	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1099	if (pixmap)	1175	//scr_touch (false);
		1176
		1177	#ifdef HAVE_BG_PIXMAP
		1178	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1179	// if (bgPixmap.pixmap)
1100	scr_touch (false);	1180	// scr_touch (false);
1101	#endif	1181	#endif
1102		1182
1103	#ifdef USE_XIM	1183	#ifdef USE_XIM
1104	IMSetStatusPosition ();	1184	IMSetPosition ();
1105	#endif	1185	#endif
1106	}	1186	}
1107		1187
1108	/*	1188	/*
1109	* Set the width/height of the vt window in characters. Units are pixels.	1189	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1114	{	1194	{
1115	XWindowAttributes wattr;	1195	XWindowAttributes wattr;
1116		1196
1117	if (newwidth == 0 \|\| newheight == 0)	1197	if (newwidth == 0 \|\| newheight == 0)
1118	{	1198	{
1119	XGetWindowAttributes (xdisp, display->root, &wattr);	1199	XGetWindowAttributes (dpy, display->root, &wattr);
1120		1200
1121	if (newwidth == 0)	1201	if (newwidth == 0)
1122	newwidth = wattr.width - szHint.base_width;	1202	newwidth = wattr.width - szHint.base_width;
1123	if (newheight == 0)	1203	if (newheight == 0)
1124	newheight = wattr.height - szHint.base_height;	1204	newheight = wattr.height - szHint.base_height;
…		…
1138	#ifdef USE_XIM	1218	#ifdef USE_XIM
1139		1219
1140	void	1220	void
1141	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1221	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142	{	1222	{
1143	fg = pix_colors[Color_fg];	1223	fg = pix_colors [Color_fg];
1144	bg = pix_colors[Color_bg];	1224	bg = pix_colors [Color_bg];
1145	}	1225	}
1146		1226
1147	void	1227	void
1148	rxvt_term::im_set_size (XRectangle &size)	1228	rxvt_term::im_set_size (XRectangle &size)
1149	{	1229	{
…		…
1186	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1266	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187		1267
1188	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1268	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189	*p = '\0';	1269	*p = '\0';
1190		1270
1191	atom = XInternAtom (xdisp, server, False);	1271	atom = XInternAtom (dpy, server, False);
1192	win = XGetSelectionOwner (xdisp, atom);	1272	win = XGetSelectionOwner (dpy, atom);
1193		1273
1194	if (win != None)	1274	if (win != None)
1195	return True;	1275	return True;
1196	}	1276	}
1197		1277
…		…
1276	if (term->rs[Rs_imLocale])	1356	if (term->rs[Rs_imLocale])
1277	SET_LOCALE (term->locale);	1357	SET_LOCALE (term->locale);
1278	}	1358	}
1279	else	1359	else
1280	str = (void *)text->string.wide_char;	1360	str = (void *)text->string.wide_char;
1281		1361
1282	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1362	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1283	DT_INT, call_data->caret,	1363	DT_INT, call_data->caret,
1284	DT_INT, call_data->chg_first,	1364	DT_INT, call_data->chg_first,
1285	DT_INT, call_data->chg_length,	1365	DT_INT, call_data->chg_length,
1286	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1366	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1421	"*",	1501	"*",
1422	fheight,	1502	fheight,
1423	fheight + 1, fheight - 1,	1503	fheight + 1, fheight - 1,
1424	fheight - 2, fheight + 2);	1504	fheight - 2, fheight + 2);
1425		1505
1426	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1506	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427	&missing_charset_list, &missing_charset_count, &def_string);	1507	&missing_charset_list, &missing_charset_count, &def_string);
1428		1508
1429	if (missing_charset_list)	1509	if (missing_charset_list)
1430	XFreeStringList (missing_charset_list);	1510	XFreeStringList (missing_charset_list);
1431		1511
…		…
1506	preedit_attr,	1586	preedit_attr,
1507	status_attr ? XNStatusAttributes : NULL,	1587	status_attr ? XNStatusAttributes : NULL,
1508	status_attr, NULL);	1588	status_attr, NULL);
1509		1589
1510	if (preedit_attr) XFree (preedit_attr);	1590	if (preedit_attr) XFree (preedit_attr);
1511	if (status_attr) XFree (status_attr);	1591	if (status_attr) XFree (status_attr);
1512	if (fs) XFreeFontSet (xdisp, fs);	1592	if (fs) XFreeFontSet (dpy, fs);
1513		1593
1514	if (Input_Context == NULL)	1594	if (Input_Context == NULL)
1515	{	1595	{
1516	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1596	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517	im_destroy ();	1597	im_destroy ();
…		…
1522	// unfortunately, only the focus window is used by XIM, hard to fix	1602	// unfortunately, only the focus window is used by XIM, hard to fix
1523	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1603	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524	vt_select_input ();	1604	vt_select_input ();
1525	#endif	1605	#endif
1526		1606
1527	if (input_style & XIMPreeditArea)
1528	IMSetStatusPosition ();	1607	IMSetPosition ();
1529		1608
1530	return true;	1609	return true;
1531	}	1610	}
1532		1611
1533	void	1612	void
…		…
1591	SET_LOCALE (locale);	1670	SET_LOCALE (locale);
1592	#endif	1671	#endif
1593	}	1672	}
1594		1673
1595	void	1674	void
1596	rxvt_term::IMSetStatusPosition ()	1675	rxvt_term::IMSetPosition ()
1597	{	1676	{
1598	XRectangle preedit_rect, status_rect, *needed_rect;	1677	XRectangle preedit_rect, status_rect, *needed_rect;
1599	XVaNestedList preedit_attr, status_attr;	1678	XVaNestedList preedit_attr, status_attr;
1600		1679
1601	if (!Input_Context	1680	if (!Input_Context
1602	\|\| !focus	1681	\|\| !focus
1603	\|\| !(input_style & XIMPreeditArea)	1682	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1604	\|\| !IMisRunning ())	1683	\|\| !IMisRunning ())
1605	return;	1684	return;
1606		1685
		1686	if (input_style & XIMPreeditPosition)
		1687	{
		1688	im_set_size (preedit_rect);
		1689	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1690
		1691	XSetICValues (Input_Context,
		1692	XNPreeditAttributes, preedit_attr, NULL);
		1693	}
		1694	else
		1695	{
1607	/* Getting the necessary width of preedit area */	1696	/* Getting the necessary width of preedit area */
1608	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1697	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1609	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1698	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1610	XFree (status_attr);	1699	XFree (status_attr);
1611		1700
1612	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1701	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1613	XFree (needed_rect);	1702	XFree (needed_rect);
1614		1703
1615	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1704	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1616	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1705	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1617		1706
1618	XSetICValues (Input_Context,	1707	XSetICValues (Input_Context,
1619	XNPreeditAttributes, preedit_attr,	1708	XNPreeditAttributes, preedit_attr,
1620	XNStatusAttributes, status_attr, NULL);	1709	XNStatusAttributes, status_attr,
		1710	NULL);
1621		1711
		1712	XFree (status_attr);
		1713	}
		1714
1622	XFree (preedit_attr);	1715	XFree (preedit_attr);
1623	XFree (status_attr);
1624	}	1716	}
1625	#endif /* USE_XIM */	1717	#endif /* USE_XIM */
		1718
		1719	void
		1720	rxvt_term::get_window_origin (int &x, int &y)
		1721	{
		1722	Window cr;
		1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1725	}
		1726
		1727	Pixmap
		1728	rxvt_term::get_pixmap_property (int prop_id)
		1729	{
		1730	if (prop_id > 0 && prop_id < NUM_XA)
		1731	if (xa[prop_id])
		1732	{
		1733	int aformat;
		1734	unsigned long nitems, bytes_after;
		1735	Atom atype;
		1736	unsigned char *prop = NULL;
		1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1739	&nitems, &bytes_after, &prop);
		1740	if (result == Success && prop && atype == XA_PIXMAP)
		1741	{
		1742	return (Pixmap )prop;
		1743	}
		1744	}
		1745	return None;
		1746	}
		1747
		1748	#ifdef HAVE_BG_PIXMAP
		1749	# if TRACE_PIXMAPS
		1750	# undef update_background
		1751	int rxvt_term::trace_update_background (const char *file, int line)
		1752	{
		1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1754	update_background ();
		1755	}
		1756	# endif
		1757
		1758	int
		1759	rxvt_term::update_background ()
		1760	{
		1761	bgPixmap.invalidate ();
		1762
		1763	/* no chance of real time refresh if we are blurring! */
		1764	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1765	bgPixmap.render ();
		1766	else
		1767	{
		1768	update_background_ev.stop ();
		1769
		1770	if (!bgPixmap.need_client_side_rendering())
		1771	update_background_ev.start (.05);
		1772	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1773	update_background_ev.start (.20); /* very slow !!! */
		1774	else
		1775	update_background_ev.start (.07);
		1776	}
		1777
		1778	return 0;
		1779	}
		1780
		1781	void
		1782	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1783	{
		1784	bgPixmap.render ();
		1785	}
		1786
		1787	#endif /* HAVE_BG_PIXMAP */
1626		1788
1627	/----------------------- end-of-file (C source) -----------------------/	1789	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.212 by root, Tue Jan 31 18:36:35 2006 UTC vs. Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC