ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	$self->focus_out;
		239	}
		240
		241	sub hide {
		242	my ($self) = @_;
		243
		244	$self->set_invisible;
186		245
187	$self->{parent}->remove ($self)	246	$self->{parent}->remove ($self)
188	if $self->{parent};	247	if $self->{parent};
189	}	248	}
190		249
…		…
240		299
241	sub size_allocate {	300	sub size_allocate {
242	# nothing to be done	301	# nothing to be done
243	}	302	}
244		303
		304	sub reconfigure {
		305	my ($self) = @_;
		306
		307	$self->check_size (1);
		308	$self->update;
		309	}
		310
245	sub children {	311	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	312	}
259		313
260	sub set_max_size {	314	sub set_max_size {
261	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
262		316
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	317	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	318	delete $self->{max_h}; $self->{max_h} = $h if $h;
		319	}
		320
		321	sub set_tooltip {
		322	my ($self, $tooltip) = @_;
		323
		324	$self->{tooltip} = $tooltip;
		325
		326	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		327	delete $CFClient::UI::TOOLTIP->{owner};
		328	CFClient::UI::check_tooltip;
		329	}
265	}	330	}
266		331
267	# translate global coordinates to local coordinate system	332	# translate global coordinates to local coordinate system
268	sub coord2local {	333	sub coord2local {
269	my ($self, $x, $y) = @_;	334	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	349	return if $FOCUS == $self;
285	return unless $self->{can_focus};	350	return unless $self->{can_focus};
286		351
287	my $focus = $FOCUS; $FOCUS = $self;	352	my $focus = $FOCUS; $FOCUS = $self;
288		353
289	$self->emit (focus_in => $focus);	354	$self->_emit (focus_in => $focus);
290		355
291	$focus->update if $focus;	356	$focus->update if $focus;
292	$FOCUS->update;	357	$FOCUS->update;
293	}	358	}
294		359
…		…
297		362
298	return unless $FOCUS == $self;	363	return unless $FOCUS == $self;
299		364
300	my $focus = $FOCUS; undef $FOCUS;	365	my $focus = $FOCUS; undef $FOCUS;
301		366
302	$self->emit (focus_out => $focus);	367	$self->_emit (focus_out => $focus);
303		368
304	$focus->update if $focus; #?	369	$focus->update if $focus; #?
		370
		371	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		372	unless $FOCUS;
305	}	373	}
306		374
307	sub mouse_motion { }	375	sub mouse_motion { }
308	sub button_up { }	376	sub button_up { }
309	sub key_down { }	377	sub key_down { }
310	sub key_up { }	378	sub key_up { }
311		379
312	sub button_down {	380	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	381	my ($self, $ev, $x, $y) = @_;
314		382
315	$self->focus_in;	383	$self->focus_in;
…		…
355	glVertex $self->{w}, 0;	423	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	424	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	425	glVertex 0 , $self->{h};
358	glEnd;	426	glEnd;
359	glPopMatrix;	427	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	428	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	429	}
362	}	430	}
363		431
364	sub _draw {	432	sub _draw {
365	my ($self) = @_;	433	my ($self) = @_;
…		…
382	sub set_parent {	450	sub set_parent {
383	my ($self, $parent) = @_;	451	my ($self, $parent) = @_;
384		452
385	Scalar::Util::weaken ($self->{parent} = $parent);	453	Scalar::Util::weaken ($self->{parent} = $parent);
386		454
		455	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	456	$self->check_size
388	unless exists $self->{req_w};	457	unless exists $self->{req_w};
		458
		459	$self->show;
389	}	460	}
390		461
391	sub check_size {	462	sub check_size {
392	my ($self) = @_;	463	my ($self, $forced) = @_;
393		464
		465	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	466	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	467	}
396		468
397	sub update {	469	sub update {
398	my ($self) = @_;	470	my ($self) = @_;
…		…
405	my ($self, $signal, $cb) = @_;	477	my ($self, $signal, $cb) = @_;
406		478
407	push @{ $self->{signal_cb}{$signal} }, $cb;	479	push @{ $self->{signal_cb}{$signal} }, $cb;
408	}	480	}
409		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
410	sub emit {	488	sub emit {
411	my ($self, $signal, @args) = @_;	489	my ($self, $signal, @args) = @_;
412		490
413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
414	}	493	}
415		494
416	sub DESTROY {	495	sub DESTROY {
417	my ($self) = @_;	496	my ($self) = @_;
418		497
		498	delete $WIDGET{$self+0};
419	#$self->deactivate;	499	#$self->deactivate;
420	}	500	}
421		501
422	#############################################################################	502	#############################################################################
423		503
…		…
432	my $class = shift;	512	my $class = shift;
433		513
434	# range [value, low, high, page]	514	# range [value, low, high, page]
435		515
436	$class->SUPER::new (	516	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	517	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	518	#active_bg => [1, 1, 1, 0.5],
439	@_	519	@_
440	)	520	)
441	}	521	}
442		522
443	sub _draw {	523	sub _draw {
444	my ($self) = @_;	524	my ($self) = @_;
445		525
		526	my $color = $FOCUS == $self && $self->{active_bg}
		527	? $self->{active_bg}
		528	: $self->{bg};
		529
		530	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	531	my ($w, $h) = @$self{qw(w h)};
447		532
448	glEnable GL_BLEND;	533	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	534	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	535	glColor @$color;
451		536
452	glBegin GL_QUADS;	537	glBegin GL_QUADS;
453	glVertex 0 , 0;	538	glVertex 0 , 0;
454	glVertex 0 , $h;	539	glVertex 0 , $h;
455	glVertex $w, $h;	540	glVertex $w, $h;
456	glVertex $w, 0;	541	glVertex $w, 0;
457	glEnd;	542	glEnd;
458		543
459	glDisable GL_BLEND;	544	glDisable GL_BLEND;
		545	}
460	}	546	}
461		547
462	#############################################################################	548	#############################################################################
463		549
464	package CFClient::UI::Empty;	550	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	594	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	595	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	596	@{$self->{children}}, @widgets
511	];	597	];
512		598
513	$self->check_size;	599	$self->check_size (1);
514	$self->update;	600	$self->update;
515	}	601	}
516		602
517	sub children {	603	sub children {
518	@{ $_[0]{children} }	604	@{ $_[0]{children} }
…		…
625	}	711	}
626		712
627	sub update {	713	sub update {
628	my ($self) = @_;	714	my ($self) = @_;
629		715
630	$ROOT->on_refresh ($self => sub { $self->render_child });	716	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	717	$self->SUPER::update;
632	}	718	}
633		719
634	sub size_allocate {	720	sub size_allocate {
635	my ($self, $w, $h) = @_;	721	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	734	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	735	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	736	glClear GL_COLOR_BUFFER_BIT;
651		737
652	$self->_render;	738	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	739	};
661	}	740	}
662		741
663	sub _draw {	742	sub _draw {
664	my ($self) = @_;	743	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	745	my ($w, $h) = ($self->w, $self->h);
667		746
668	my $tex = $self->{texture}	747	my $tex = $self->{texture}
669	or return;	748	or return;
670		749
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	750	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	752	glColor 1, 1, 1, 1;
676		753
677	$tex->draw_quad (0, 0, $w, $h);	754	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		755
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	756	glDisable GL_TEXTURE_2D;
681	}	757	}
682		758
683	#############################################################################	759	#############################################################################
684		760
…		…
688		764
689	sub size_request {	765	sub size_request {
690	my ($self) = @_;	766	my ($self) = @_;
691		767
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	768	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		769
695	@$self{qw(child_w child_h)}	770	@$self{qw(child_w child_h)}
696	}	771	}
697		772
698	sub size_allocate {	773	sub size_allocate {
699	my ($self, $w, $h) = @_;	774	my ($self, $w, $h) = @_;
700		775
		776	my ($cw, $ch) = @$self{qw(child_w child_h)};
		777	# $w = $self->{w};
		778	$self->child->configure (0, 0, $cw, $ch);
701	$self->update;	779	$self->update;
702	}	780	}
703		781
704	sub set_offset {	782	sub set_offset {
705	my ($self, $x, $y) = @_;	783	my ($self, $x, $y) = @_;
…		…
759		837
760	my $slider = new CFClient::UI::Slider	838	my $slider = new CFClient::UI::Slider
761	vertical => 1,	839	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	840	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	841	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	842	$self->{vp}->set_offset (0, $_[1]);
765	},	843	},
766	;	844	;
767		845
768	$self = $class->SUPER::new (	846	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	847	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	848	slider => $slider,
771	@_,	849	@_,
772	);	850	);
773		851
774	$self->{vp}->add ($self->{scrolled});	852	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	854	$self->add ($self->{slider});
777		855
778	$self	856	$self
779	}	857	}
780		858
		859	sub size_allocate {
		860	my ($self, $w, $h) = @_;
		861
		862	$self->SUPER::size_allocate ($w, $h);
		863
		864	my $child = $self->{vp}->child;
		865	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		866	}
		867
781	#TODO# update range on size_allocate depeneing on child	868	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	869	# update viewport offset on scroll
783		870
784	#############################################################################	871	#############################################################################
785		872
786	package CFClient::UI::Frame;	873	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	877	use CFClient::OpenGL;
791		878
792	sub new {	879	sub new {
793	my $class = shift;	880	my $class = shift;
794		881
795	my $self = $class->SUPER::new (	882	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	883	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	884	@_,
800	);	885	)
801
802	$self
803	}	886	}
804		887
805	sub _draw {	888	sub _draw {
806	my ($self) = @_;	889	my ($self) = @_;
807		890
808	my ($w, $h) = ($self->{w}, $self->{h});	891	if ($self->{bg}) {
		892	my ($w, $h) = @$self{qw(w h)};
809		893
810	glEnable GL_BLEND;	894	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	895	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	896	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		897
815	# glBegin GL_QUADS;	898	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	899	glVertex 0 , 0;
818	# glVertex 0 , $h;	900	glVertex 0 , $h;
819	# glVertex $w, $h;	901	glVertex $w, $h;
820	# glVertex $w, 0;	902	glVertex $w, 0;
821	# glEnd;	903	glEnd;
822		904
823
824	$self->child->draw;
825	glDisable GL_BLEND;	905	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	906	}
		907
		908	$self->SUPER::_draw;
827	}	909	}
828		910
829	#############################################################################	911	#############################################################################
830		912
831	package CFClient::UI::FancyFrame;	913	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	924	my $class = shift;
843		925
844	# TODO: user_x, user_y, overwrite moveto?	926	# TODO: user_x, user_y, overwrite moveto?
845		927
846	my $self = $class->SUPER::new (	928	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	929	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	930	border_bg => [1, 1, 1, 1],
849	border => 0.6,	931	border => 0.6,
		932	is_toplevel => 1,
850	can_events => 1,	933	can_events => 1,
851	@_	934	@_
852	);	935	);
853		936
854	$self->{title} &&= new CFClient::UI::Label	937	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	938	align => 0,
…		…
879	my ($self, $w, $h) = @_;	962	my ($self, $w, $h) = @_;
880		963
881	$h -= List::Util::max 0, $self->border * 2;	964	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	965	$w -= List::Util::max 0, $self->border * 2;
883		966
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	967	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	968	if $self->{title};
886		969
887	$self->child->configure ($self->border, $self->border, $w, $h);	970	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	971	}
889		972
…		…
947	my ($self) = @_;	1030	my ($self) = @_;
948		1031
949	my ($w, $h ) = ($self->{w}, $self->{h});	1032	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1033	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1034
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1035	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1037
957	my $border = $self->border;	1038	my $border = $self->border;
958		1039
959	glColor @{ $self->{border_bg} };	1040	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1041	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1042	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1043	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1044	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1045
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1046	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1047	my $bg = $tex[0];
967		1048
968	# TODO: repeat texture not scale	1049	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1053	glColor @{ $self->{bg} };
973		1054
974	$bg->{s} = $rep_x;	1055	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1056	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1057	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1058	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1059	}
978		1060
979	glDisable GL_TEXTURE_2D;	1061	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1062
983	$self->{title}->draw if $self->{title};	1063	$self->{title}->draw if $self->{title};
984		1064
985	$self->child->draw;	1065	$self->child->draw;
986	}	1066	}
…		…
1253		1333
1254	#############################################################################	1334	#############################################################################
1255		1335
1256	package CFClient::UI::Label;	1336	package CFClient::UI::Label;
1257		1337
1258	our @ISA = CFClient::UI::Base::;	1338	our @ISA = CFClient::UI::DrawBG::;
1259		1339
1260	use CFClient::OpenGL;	1340	use CFClient::OpenGL;
1261		1341
1262	sub new {	1342	sub new {
1263	my ($class, %arg) = @_;	1343	my ($class, %arg) = @_;
1264		1344
1265	my $self = $class->SUPER::new (	1345	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1346	fg => [1, 1, 1],
		1347	#bg => none
		1348	#active_bg => none
1267	#font => default_font	1349	#font => default_font
		1350	#text => initial text
		1351	#markup => initial narkup
		1352	#max_w => maximum pixel width
		1353	ellipsise => 3, # end
		1354	layout => (new CFClient::Layout),
1268	fontsize => 1,	1355	fontsize => 1,
1269	text => "",
1270	align => -1,	1356	align => -1,
1271	valign => -1,	1357	valign => -1,
1272	padding => 2,	1358	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1359	can_events => 0,
1275	%arg	1360	%arg
1276	);	1361	);
1277		1362
1278	if (exists $self->{template}) {	1363	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1364	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1365	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1366	$self->{template} = $layout;
1282	}	1367	}
1283		1368
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1369	if (exists $self->{markup}) {
1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1370	$self->set_markup (delete $self->{markup});
		1371	} else {
		1372	$self->set_text (delete $self->{text});
		1373	}
1286		1374
1287	$self	1375	$self
1288	}	1376	}
1289		1377
1290	sub escape {	1378	sub escape($) {
1291	local $_ = $_[1];	1379	local $_ = $_[0];
1292		1380
1293	s/&/&amp;/g;	1381	s/&/&amp;/g;
1294	s/>/&gt;/g;	1382	s/>/&gt;/g;
1295	s/</&lt;/g;	1383	s/</&lt;/g;
1296		1384
1297	$_[1]	1385	$_
1298	}	1386	}
1299		1387
1300	sub update {	1388	sub update {
1301	my ($self) = @_;	1389	my ($self) = @_;
1302		1390
…		…
1308	my ($self, $text) = @_;	1396	my ($self, $text) = @_;
1309		1397
1310	return if $self->{text} eq "T$text";	1398	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1399	$self->{text} = "T$text";
1312		1400
		1401	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1402	$self->{layout}->set_text ($text);
1314		1403
1315	$self->update;	1404	$self->update;
1316	$self->check_size;	1405	$self->check_size;
1317	}	1406	}
…		…
1320	my ($self, $markup) = @_;	1409	my ($self, $markup) = @_;
1321		1410
1322	return if $self->{text} eq "M$markup";	1411	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1412	$self->{text} = "M$markup";
1324		1413
		1414	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1415
		1416	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1417	$self->{layout}->set_markup ($markup);
1326		1418
1327	$self->update;	1419	$self->update;
1328	$self->check_size;	1420	$self->check_size;
1329	}	1421	}
…		…
1331	sub size_request {	1423	sub size_request {
1332	my ($self) = @_;	1424	my ($self) = @_;
1333		1425
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1426	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1427	$self->{layout}->set_width ($self->{max_w} || -1);
		1428	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1429	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1430	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1431
1338	my ($w, $h) = $self->{layout}->size;	1432	my ($w, $h) = $self->{layout}->size;
1339		1433
1340	if (exists $self->{template}) {	1434	if (exists $self->{template}) {
…		…
1370	}	1464	}
1371		1465
1372	sub _draw {	1466	sub _draw {
1373	my ($self) = @_;	1467	my ($self) = @_;
1374		1468
		1469	$self->SUPER::_draw; # draw background, if applicable
		1470
1375	my $tex = $self->{texture} ||= do {	1471	my $tex = $self->{texture} ||= do {
		1472	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1473	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$self->{layout}->set_width ($self->{w});	1474	$self->{layout}->set_width ($self->{w});
		1475	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1476	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1477	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1478
1379	new_from_layout CFClient::Texture $self->{layout}	1479	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1480
		1481	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1482	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1483	: ($self->{w} - $tex->{w}) * 0.5);
		1484
		1485	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1486	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1487	: ($self->{h} - $tex->{h}) * 0.5);
		1488
		1489	$tex
1380	};	1490	};
1381		1491
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1492	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1494
		1495	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1496	glColor @{$self->{fg}};
1388
1389	$self->{ox} = int (
1390	$self->{align} < 0 ? $self->{padding}
1391	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392	: ($self->{w} - $tex->{w}) * 0.5
1393	);
1394
1395	$self->{oy} = int (
1396	$self->{valign} < 0 ? $self->{padding}
1397	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398	: ($self->{h} - $tex->{h}) * 0.5
1399	);
1400
1401	$tex->draw_quad ($self->{ox}, $self->{oy});	1497	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1498	} else {
		1499	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1500	}
1402		1501
1403	glDisable GL_TEXTURE_2D;	1502	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1503	}
1406		1504
1407	#############################################################################	1505	#############################################################################
1408		1506
1409	package CFClient::UI::EntryBase;	1507	package CFClient::UI::EntryBase;
…		…
1422	active_fg => [0, 0, 0],	1520	active_fg => [0, 0, 0],
1423	can_hover => 1,	1521	can_hover => 1,
1424	can_focus => 1,	1522	can_focus => 1,
1425	valign => 0,	1523	valign => 0,
1426	can_events => 1,	1524	can_events => 1,
		1525	#text => ...
1427	@_	1526	@_
1428	)	1527	)
1429	}	1528	}
1430		1529
1431	sub _set_text {	1530	sub _set_text {
…		…
1441	$self->{text} = $text;	1540	$self->{text} = $text;
1442		1541
1443	$text =~ s/./*/g if $self->{hidden};	1542	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1543	$self->{layout}->set_text ("$text ");
1445		1544
1446	$self->emit (changed => $self->{text});	1545	$self->_emit (changed => $self->{text});
1447	}
1448
1449	sub get_text {
1450	$_[0]{text}
1451	}
1452
1453	sub size_request {
1454	my ($self) = @_;
1455
1456	my ($w, $h) = $self->SUPER::size_request;
1457
1458	($w + 1, $h) # add 1 for cursor
1459	}
1460
1461	sub size_allocate {
1462	my ($self, $w, $h) = @_;
1463
1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465	}	1546	}
1466		1547
1467	sub set_text {	1548	sub set_text {
1468	my ($self, $text) = @_;	1549	my ($self, $text) = @_;
1469		1550
1470	$self->{cursor} = length $text;	1551	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1552	$self->_set_text ($text);
1472	$self->update;	1553	$self->update;
		1554	$self->check_size;
		1555	}
		1556
		1557	sub get_text {
		1558	$_[0]{text}
		1559	}
		1560
		1561	sub size_request {
		1562	my ($self) = @_;
		1563
		1564	my ($w, $h) = $self->SUPER::size_request;
		1565
		1566	($w + 1, $h) # add 1 for cursor
		1567	}
		1568
		1569	sub size_allocate {
		1570	my ($self, $w, $h) = @_;
		1571
		1572	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}	1573	}
1474		1574
1475	sub key_down {	1575	sub key_down {
1476	my ($self, $ev) = @_;	1576	my ($self, $ev) = @_;
1477		1577
…		…
1479	my $sym = $ev->{sym};	1579	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1580	my $uni = $ev->{unicode};
1481		1581
1482	my $text = $self->get_text;	1582	my $text = $self->get_text;
1483		1583
1484	if ($sym == 8) {	1584	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1585	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1586	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1587	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1588	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1589	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1590	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1591	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1592	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1593	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1594	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1595	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1596	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1597	$self->_emit ('escape');
1498	} elsif ($uni) {	1598	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1599	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1600	}
1501		1601
1502	$self->_set_text ($text);	1602	$self->_set_text ($text);
1503	$self->update;	1603	$self->update;
		1604	$self->check_size;
1504	}	1605	}
1505		1606
1506	sub focus_in {	1607	sub focus_in {
1507	my ($self) = @_;	1608	my ($self) = @_;
1508		1609
…		…
1588	if ($sym == 13) {	1689	if ($sym == 13) {
1589	unshift @{$self->{history}},	1690	unshift @{$self->{history}},
1590	my $txt = $self->get_text;	1691	my $txt = $self->get_text;
1591	$self->{history_pointer} = -1;	1692	$self->{history_pointer} = -1;
1592	$self->{history_saveback} = '';	1693	$self->{history_saveback} = '';
1593	$self->emit (activate => $txt);	1694	$self->_emit (activate => $txt);
1594	$self->update;	1695	$self->update;
1595		1696
1596	} elsif ($sym == CFClient::SDLK_UP) {	1697	} elsif ($sym == CFClient::SDLK_UP) {
1597	if ($self->{history_pointer} < 0) {	1698	if ($self->{history_pointer} < 0) {
1598	$self->{history_saveback} = $self->get_text;	1699	$self->{history_saveback} = $self->get_text;
…		…
1637	my $class = shift;	1738	my $class = shift;
1638		1739
1639	$class->SUPER::new (	1740	$class->SUPER::new (
1640	padding => 4,	1741	padding => 4,
1641	fg => [1, 1, 1],	1742	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1743	active_fg => [0, 0, 1],
1644	can_hover => 1,	1744	can_hover => 1,
1645	align => 0,	1745	align => 0,
1646	valign => 0,	1746	valign => 0,
1647	can_events => 1,	1747	can_events => 1,
1648	@_	1748	@_
1649	)	1749	)
1650	}	1750	}
1651		1751
		1752	sub activate { }
		1753
1652	sub button_up {	1754	sub button_up {
1653	my ($self, $ev, $x, $y) = @_;	1755	my ($self, $ev, $x, $y) = @_;
1654		1756
		1757	$self->emit ("activate")
1655	if ($x >= 0 && $x < $self->{w}	1758	if $x >= 0 && $x < $self->{w}
1656	&& $y >= 0 && $y < $self->{h}) {	1759	&& $y >= 0 && $y < $self->{h};
1657	$self->emit ("activate");
1658	}
1659	}	1760	}
1660		1761
1661	sub _draw {	1762	sub _draw {
1662	my ($self) = @_;	1763	my ($self) = @_;
1663		1764
…		…
1665		1766
1666	if ($GRAB == $self) {	1767	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1768	$self->{fg} = $self->{active_fg};
1668	}	1769	}
1669		1770
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1771	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1772	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1773	glColor 0, 0, 0, 1;
1675		1774
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1775	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1776
1678	glDisable GL_TEXTURE_2D;	1777	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1778
1681	$self->SUPER::_draw;	1779	$self->SUPER::_draw;
1682	}	1780	}
1683		1781
1684	#############################################################################	1782	#############################################################################
…		…
1698		1796
1699	$class->SUPER::new (	1797	$class->SUPER::new (
1700	padding => 2,	1798	padding => 2,
1701	fg => [1, 1, 1],	1799	fg => [1, 1, 1],
1702	active_fg => [1, 1, 0],	1800	active_fg => [1, 1, 0],
		1801	bg => [0, 0, 0, 0.2],
		1802	active_bg => [1, 1, 1, 0.5],
1703	state => 0,	1803	state => 0,
1704	can_hover => 1,	1804	can_hover => 1,
1705	@_	1805	@_
1706	)	1806	)
1707	}	1807	}
…		…
1716	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1717		1817
1718	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1818	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1719	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1819	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1720	$self->{state} = !$self->{state};	1820	$self->{state} = !$self->{state};
1721	$self->emit (changed => $self->{state});	1821	$self->_emit (changed => $self->{state});
1722	}	1822	}
1723	}	1823	}
1724		1824
1725	sub _draw {	1825	sub _draw {
1726	my ($self) = @_;	1826	my ($self) = @_;
…		…
1731		1831
1732	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1832	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733		1833
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1834	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1835
1736	glEnable GL_BLEND;	1836	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1837
1737	glEnable GL_TEXTURE_2D;	1838	glEnable GL_TEXTURE_2D;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740	my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742	$tex->draw_quad (0, 0, $s, $s);	1839	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1840	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1841	}
1747		1842
1748	#############################################################################	1843	#############################################################################
1749		1844
1750	package CFClient::UI::Image;	1845	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1888	glTranslate 0, -$self->{w}, 0;
1794		1889
1795	($w, $h) = ($h, $w);	1890	($w, $h) = ($h, $w);
1796	}	1891	}
1797		1892
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1893	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1894	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1895
1803	$tex->draw_quad (0, 0, $w, $h);	1896	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1897
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1898	glDisable GL_TEXTURE_2D;
1807	}	1899	}
1808		1900
1809	#############################################################################	1901	#############################################################################
1810		1902
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2091	qw(s1_slider.png s1_slider_bg.png);
2000		2092
2001	sub new {	2093	sub new {
2002	my $class = shift;	2094	my $class = shift;
2003		2095
2004	# range [value, low, high, page]	2096	# range [value, low, high, page, unit]
2005		2097
2006	# TODO: 0-width page	2098	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2099	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2100	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2101	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2102	fg => [1, 1, 1],
2011	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
		2104	bg => [0, 0, 0, 0.2],
		2105	active_bg => [1, 1, 1, 0.5],
2012	range => [0, 0, 100, 10],	2106	range => [0, 0, 100, 10, 0],
2013	req_w => $::WIDTH / 80,	2107	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2108	req_h => $::WIDTH / 80,
2015	vertical => 0,	2109	vertical => 0,
2016	can_hover => 1,	2110	can_hover => 1,
2017	inner_pad => 5,	2111	inner_pad => 0.02,
2018	@_	2112	@_
2019	);	2113	);
2020		2114
		2115	$self->set_value ($self->{range}[0]);
		2116	$self->update;
		2117
2021	$self	2118	$self
		2119	}
		2120
		2121	sub set_range {
		2122	my ($self, $range) = @_;
		2123
		2124	$self->{range} = $range;
		2125
		2126	$self->update;
		2127	}
		2128
		2129	sub set_value {
		2130	my ($self, $value) = @_;
		2131
		2132	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2133
		2134	$hi = $lo + 1 if $hi <= $lo;
		2135
		2136	$page = $hi - $lo if $page > $hi - $lo;
		2137
		2138	$value = $lo if $value < $lo;
		2139	$value = $hi - $page if $value > $hi - $page;
		2140
		2141	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2142	if $unit;
		2143
		2144	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2145
		2146	if ($value != $old_value) {
		2147	$self->_emit (changed => $value);
		2148	$self->update;
		2149	}
2022	}	2150	}
2023		2151
2024	sub size_request {	2152	sub size_request {
2025	my ($self) = @_;	2153	my ($self) = @_;
2026		2154
…		…
2032		2160
2033	sub button_down {	2161	sub button_down {
2034	my ($self, $ev, $x, $y) = @_;	2162	my ($self, $ev, $x, $y) = @_;
2035		2163
2036	$self->SUPER::button_down ($ev, $x, $y);	2164	$self->SUPER::button_down ($ev, $x, $y);
		2165
		2166	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2167
2037	$self->mouse_motion ($ev, $x, $y);	2168	$self->mouse_motion ($ev, $x, $y);
2038	}	2169	}
2039		2170
2040	sub mouse_motion {	2171	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2172	my ($self, $ev, $x, $y) = @_;
2042		2173
2043	if ($GRAB == $self) {	2174	if ($GRAB == $self) {
		2175	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2176
		2177	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2178
		2179	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2180
		2181	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2182	}
		2183	}
		2184
		2185	sub update {
		2186	my ($self) = @_;
		2187
		2188	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2189	$self->set_value ($self->{range}[0]);
		2190
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2191	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2192	my $range = ($hi - $page - $lo) || 1e-100;
2045		2193
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2194	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047		2195
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2196	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2197	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050		2198
2051	$x -= $inner_pad_px; # substract the padding	2199	$value = ($value - $lo) / $range;
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2200	$value = $value * $self->{scale} + $self->{offset};
2053	$x = $lo if $x < $lo;
2054	$x = $hi - $page if $x > $hi - $page;
2055	$self->{range}[0] = $x;
2056		2201
2057	$self->emit (changed => $x);	2202	$self->{knob_x} = $value - $knob_w * 0.5;
2058	$self->update;	2203	$self->{knob_w} = $knob_w;
2059	}	2204	});
2060	}
2061		2205
2062	# the inner_* stuff is for generating a padding for the slider handle,	2206	$self->SUPER::update;
2063	# so that the handle doesn't leave the texture. This calculation isn't 100%
2064	# correct propably, but it does the job for now
2065	sub _calc_inner_pad_px {
2066	my ($self, $w) = @_;
2067	($w / 100) * $self->{inner_pad} # % to pixels
2068	}	2207	}
2069		2208
2070	sub _draw {	2209	sub _draw {
2071	my ($self) = @_;	2210	my ($self) = @_;
2072		2211
2073	$self->SUPER::_draw ();	2212	$self->SUPER::_draw ();
2074		2213
2075	my ($w, $h) = @$self{qw(w h)};	2214	glScale $self->{w}, $self->{h};
2076		2215
2077	if ($self->{vertical}) {	2216	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2217	# draw a vertical slider like a rotated horizontal slider
2079		2218
		2219	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2220	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2221	}
2085		2222
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2223	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2224	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2225
2089	my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091	$hi = $value + 1 if $lo == $hi;
2092
2093	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096	$page = int $page * $inner_w / ($hi - $lo);
2097	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099	$w -= $page;
2100	$page &= ~1;
2101	glTranslate $page * 0.5, 0, 0;
2102	$page ||= 2;
2103
2104	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107	glEnable GL_BLEND;
2108	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109	glEnable GL_TEXTURE_2D;	2226	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2227	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2228
2112	# draw background	2229	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2230	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2231
2115	# draw handle	2232	# draw handle
2116	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2233	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117		2234
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2235	glDisable GL_TEXTURE_2D;
2120	}	2236	}
		2237
		2238	#############################################################################
		2239
		2240	package CFClient::UI::ValSlider;
		2241
		2242	our @ISA = CFClient::UI::HBox::;
		2243
		2244	sub new {
		2245	my ($class, %arg) = @_;
		2246
		2247	my $range = delete $arg{range};
		2248
		2249	my $self = $class->SUPER::new (
		2250	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2251	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2252	to_value => sub { shift },
		2253	from_value => sub { shift },
		2254	%arg,
		2255	);
		2256
		2257	$self->{slider}->connect (changed => sub {
		2258	my ($self, $value) = @_;
		2259	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2260	$self->{parent}->emit (changed => $value);
		2261	});
		2262
		2263	# $self->{entry}->connect (changed => sub {
		2264	# my ($self, $value) = @_;
		2265	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2266	# $self->{parent}->emit (changed => $value);
		2267	# });
		2268
		2269	$self->add ($self->{slider}, $self->{entry});
		2270
		2271	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2272
		2273	$self
		2274	}
		2275
		2276	sub set_range { shift->{slider}->set_range (@_) }
		2277	sub set_value { shift->{slider}->set_value (@_) }
2121		2278
2122	#############################################################################	2279	#############################################################################
2123		2280
2124	package CFClient::UI::TextView;	2281	package CFClient::UI::TextView;
2125		2282
…		…
2134	fontsize => 1,	2291	fontsize => 1,
2135	can_events => 0,	2292	can_events => 0,
2136	#font => default_font	2293	#font => default_font
2137	@_,	2294	@_,
2138		2295
2139	layout => (new CFClient::Layout),	2296	layout => (new CFClient::Layout 1),
2140	par => [],	2297	par => [],
2141	height => 0,	2298	height => 0,
2142	children => [	2299	children => [
2143	(new CFClient::UI::Empty expand => 1),	2300	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2301	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2312
2156	$self->{fontsize} = $fontsize;	2313	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2314	$self->reflow;
2158	}	2315	}
2159		2316
2160	sub text_height {
2161	my ($self, $text) = @_;
2162
2163	my $layout = $self->{layout};
2164
2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166	$layout->set_width ($self->{children}[0]{w});
2167	$layout->set_text ($text);
2168
2169	($layout->size)[1]
2170	}
2171
2172	sub reflow {
2173	my ($self) = @_;
2174
2175	$self->{need_reflow}++;
2176	$self->update;
2177	}
2178
2179	sub size_allocate {	2317	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2318	my ($self, $w, $h) = @_;
2181		2319
2182	$self->SUPER::size_allocate ($w, $h);	2320	$self->SUPER::size_allocate ($w, $h);
2183		2321
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2324	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2325
2188	$self->reflow;	2326	$self->reflow;
2189	}	2327	}
2190		2328
		2329	sub text_size {
		2330	my ($self, $text, $indent) = @_;
		2331
		2332	my $layout = $self->{layout};
		2333
		2334	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2335	$layout->set_width ($self->{children}[0]{w} - $indent);
		2336	$layout->set_markup ($text);
		2337
		2338	$layout->size
		2339	}
		2340
		2341	sub reflow {
		2342	my ($self) = @_;
		2343
		2344	$self->{need_reflow}++;
		2345	$self->update;
		2346	}
		2347
		2348	sub set_offset {
		2349	my ($self, $offset) = @_;
		2350
		2351	# todo: base offset on lines or so, not on pixels
		2352	$self->{children}[1]->set_value ($offset);
		2353	}
		2354
		2355	sub clear {
		2356	my ($self) = @_;
		2357
		2358	$self->{par} = [];
		2359	$self->{height} = 0;
		2360	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2361	}
		2362
2191	sub add_paragraph {	2363	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2364	my ($self, $color, $text, $indent) = @_;
2193		2365
2194	#TODO: intelligently "reformat" paragraph	2366	for my $line (split /\n/, $text) {
2195		2367	my ($w, $h) = $self->text_size ($line);
2196	my $height = $self->text_height ($text);
2197
2198	$self->{height} += $height;	2368	$self->{height} += $h;
		2369	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2370	}
2199		2371
2200	push @{$self->{par}}, [$height, $color, $text];
2201
2202	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2372	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203	$self->{children}[1]->update;
2204	}	2373	}
2205		2374
2206	sub update {	2375	sub update {
2207	my ($self) = @_;	2376	my ($self) = @_;
2208		2377
…		…
2210		2379
2211	return unless $self->{h} > 0;	2380	return unless $self->{h} > 0;
2212		2381
2213	delete $self->{texture};	2382	delete $self->{texture};
2214		2383
2215	$ROOT->on_refresh ($self, sub {	2384	$ROOT->on_post_alloc ($self, sub {
		2385	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2386
2216	if (delete $self->{need_reflow}) {	2387	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2388	my $height = 0;
2218		2389
2219	$height += $_->[0] = $self->text_height ($_->[2])	2390	my $layout = $self->{layout};
		2391
		2392	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2393
2220	for @{$self->{par}};	2394	for (@{$self->{par}}) {
		2395	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2396	$layout->set_width ($W - $_->[3]);
		2397	$layout->set_markup ($_->[4]);
		2398	my ($w, $h) = $layout->size;
		2399	$_->[0] = $w + $_->[3];
		2400	$_->[1] = $h;
		2401	}
		2402
		2403	$height += $_->[1];
		2404	}
2221		2405
2222	$self->{height} = $height;	2406	$self->{height} = $height;
2223		2407
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2408	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225		2409
2226	delete $self->{texture};	2410	delete $self->{texture};
2227	}	2411	}
2228		2412
2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2413	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230	glClearColor 0, 0, 0, 0;	2414	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2415	glClear GL_COLOR_BUFFER_BIT;
2232		2416
		2417	my $top = int $self->{children}[1]{range}[0];
		2418
		2419	my $y0 = $top;
		2420	my $y1 = $top + $H;
		2421
		2422	my $y = 0;
		2423
		2424	my $layout = $self->{layout};
		2425
		2426	$layout->set_font ($self->{font}) if $self->{font};
		2427
2233	glEnable GL_BLEND;	2428	glEnable GL_BLEND;
		2429	#TODO# not correct in windows where rgba is forced off
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2430	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235	glEnable GL_TEXTURE_2D;
2236	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238	my $top = int $self->{children}[1]{range}[0];
2239
2240	my $y0 = $top;
2241	my $y1 = $top + $self->{h};
2242
2243	my $y = 0;
2244
2245	my $layout = $self->{layout};
2246
2247	$layout->set_font ($self->{font}) if $self->{font};
2248		2431
2249	for my $par (@{$self->{par}}) {	2432	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2433	my $h = $par->[1];
2251		2434
2252	if ($y0 < $y + $h && $y < $y1) {	2435	if ($y0 < $y + $h && $y < $y1) {
		2436	$layout->set_foreground (@{ $par->[2] });
		2437	$layout->set_width ($W - $par->[3]);
2253	$layout->set_text ($par->[2]);	2438	$layout->set_markup ($par->[4]);
2254		2439
2255	glColor @{ $par->[1] };	2440	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2441
2257	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2442	glRasterPos $par->[3], $y - $y0;
		2443	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258	}	2444	}
2259		2445
2260	$y += $h;	2446	$y += $h;
2261	}	2447	}
2262		2448
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2449	glDisable GL_BLEND;
2265	};	2450	};
2266	});	2451	});
2267	}	2452	}
2268		2453
2269	sub _draw {	2454	sub _draw {
2270	my ($self) = @_;	2455	my ($self) = @_;
2271		2456
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2460	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2462
2281	$self->{children}[1]->draw;	2463	$self->{children}[1]->draw;
2282		2464
2283	}	2465	}
2284		2466
…		…
2352		2534
2353	# TODO: use animation	2535	# TODO: use animation
2354	if ($self->{state} = !$self->{state}) {	2536	if ($self->{state} = !$self->{state}) {
2355	$CFClient::UI::ROOT->add ($self->{other});	2537	$CFClient::UI::ROOT->add ($self->{other});
2356	$self->{other}->move ($self->coord2global (0, $self->{h}));	2538	$self->{other}->move ($self->coord2global (0, $self->{h}));
2357	$self->emit ("open");	2539	$self->_emit ("open");
2358	} else {	2540	} else {
2359	$CFClient::UI::ROOT->remove ($self->{other});	2541	$CFClient::UI::ROOT->remove ($self->{other});
2360	$self->emit ("close");	2542	$self->_emit ("close");
2361	}	2543	}
2362		2544
2363	$self->emit (changed => $self->{state});	2545	$self->_emit (changed => $self->{state});
2364	}	2546	}
2365		2547
2366	#############################################################################	2548	#############################################################################
2367		2549
2368	package CFClient::UI::Tooltip;	2550	package CFClient::UI::Tooltip;
…		…
2378	@_,	2560	@_,
2379	can_events => 0,	2561	can_events => 0,
2380	)	2562	)
2381	}	2563	}
2382		2564
2383	sub set_markup {	2565	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2566	my ($self, $widget) = @_;
2385		2567
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2568	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2569	markup => $widget->{tooltip},
2388	$self->add ($self->{label});	2570	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2571	fontsize => 0.8,
		2572	fg => [0, 0, 0, 1],
		2573	ellipsise => 0,
		2574	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2575	);
2389	}	2576	}
2390		2577
2391	sub size_request {	2578	sub size_request {
2392	my ($self) = @_;	2579	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2580
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2581	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2582
2398	($w + 4, $h + 4)	2583	($w + 4, $h + 4)
2399	}	2584	}
…		…
2405	}	2590	}
2406		2591
2407	sub _draw {	2592	sub _draw {
2408	my ($self) = @_;	2593	my ($self) = @_;
2409		2594
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2595	glTranslate 0.375, 0.375;
2412		2596
2413	my ($w, $h) = @$self{qw(w h)};	2597	my ($w, $h) = @$self{qw(w h)};
2414		2598
2415	glColor 1, 0.8, 0.4;	2599	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2610	glVertex 0 , $h;
2427	glVertex $w, $h;	2611	glVertex $w, $h;
2428	glVertex $w, 0;	2612	glVertex $w, 0;
2429	glEnd;	2613	glEnd;
2430		2614
2431	glPopMatrix;	2615	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2616	$self->SUPER::_draw;
2435	}	2617	}
2436		2618
2437	#############################################################################	2619	#############################################################################
2438		2620
…		…
2443	use CFClient::OpenGL;	2625	use CFClient::OpenGL;
2444		2626
2445	sub new {	2627	sub new {
2446	my $class = shift;	2628	my $class = shift;
2447		2629
2448	$class->SUPER::new (	2630	my $self = $class->SUPER::new (
2449	aspect => 1,	2631	aspect => 1,
2450	@_,	2632	@_,
2451	)	2633	);
		2634
		2635	if ($self->{anim} && $self->{animspeed}) {
		2636	Scalar::Util::weaken (my $widget = $self);
		2637
		2638	$self->{timer} = Event->timer (
		2639	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2640	hard => 1,
		2641	interval => $self->{animspeed},
		2642	cb => sub {
		2643	++$widget->{frame};
		2644	$widget->update;
		2645	},
		2646	);
		2647	}
		2648
		2649	$self
2452	}	2650	}
2453		2651
2454	sub size_request {	2652	sub size_request {
2455	(32, 8)	2653	(32, 8)
2456	}	2654	}
2457		2655
		2656	sub update {
		2657	my ($self) = @_;
		2658
		2659	return unless $self->{visible};
		2660
		2661	$self->SUPER::update;
		2662	}
		2663
2458	sub _draw {	2664	sub _draw {
2459	my ($self) = @_;	2665	my ($self) = @_;
2460		2666
2461	return unless $::CONN;#d# manage and cache textures differently	2667	return unless $::CONN;
		2668
		2669	my $face;
		2670
		2671	if ($self->{frame}) {
		2672	my $anim = $::CONN->{anim}[$self->{anim}];
		2673
		2674	$face = $anim->[ $self->{frame} % @$anim ]
		2675	if $anim && @$anim;
		2676	}
		2677
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2678	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2679
2464	# TODO animation
2465	if ($tex) {	2680	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2681	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2682	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2683	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2684	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2685	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2686	}
		2687	}
		2688
		2689	sub DESTROY {
		2690	my ($self) = @_;
		2691
		2692	$self->{timer}->cancel
		2693	if $self->{timer};
		2694
		2695	$self->SUPER::DESTROY;
2475	}	2696	}
2476		2697
2477	#############################################################################	2698	#############################################################################
2478		2699
2479	package CFClient::UI::InventoryItem;	2700	package CFClient::UI::InventoryItem;
2480		2701
2481	our @ISA = CFClient::UI::HBox::;	2702	our @ISA = CFClient::UI::HBox::;
		2703
		2704	sub _item_to_desc {
		2705	my ($item) = @_;
		2706
		2707	my $desc =
		2708	$item->{nrof} < 2
		2709	? $item->{name}
		2710	: "$item->{nrof} × $item->{name_pl}";
		2711
		2712	$item->{flags} & Crossfire::Protocol::F_OPEN
		2713	and $desc .= " (open)";
		2714	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2715	and $desc .= " (applied)";
		2716	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2717	and $desc .= " (unpaid)";
		2718	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2719	and $desc .= " (magic)";
		2720	$item->{flags} & Crossfire::Protocol::F_CURSED
		2721	and $desc .= " (cursed)";
		2722	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2723	and $desc .= " (damned)";
		2724	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2725	and $desc .= " *";
		2726
		2727	$desc
		2728	}
2482		2729
2483	sub new {	2730	sub new {
2484	my $class = shift;	2731	my $class = shift;
2485		2732
2486	my %args = @_;	2733	my %args = @_;
2487		2734
2488	my $item = delete $args{item};	2735	my $item = delete $args{item};
2489		2736
2490	my $desc = $item->{nrof} < 2	2737	my $desc = _item_to_desc ($item);
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494		2738
2495	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2496	can_hover => 1,	2740	can_hover => 1,
2497	can_events => 1,	2741	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)	2742	tooltip => ((CFClient::UI::Label::escape $desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2743	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {	2744	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;	2745	my ($self, $ev, $x, $y) = @_;
2502		2746
2503	# todo: maybe put examine on 1? but should just be a tooltip :(	2747	# todo: maybe put examine on 1? but should just be a tooltip :(
		2748	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2749	my $targ = $::CONN->{player}{tag};
		2750
		2751	if ($item->{container} == $::CONN->{player}{tag}) {
		2752	$targ = $main::OPENCONT;
		2753	}
		2754
		2755	$::CONN->send ("move $targ $item->{tag} 0");
2504	if ($ev->{button} == 1) {	2756	} elsif ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2757	$::CONN->send ("examine $item->{tag}");
2506	} elsif ($ev->{button} == 2) {	2758	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");	2759	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {	2760	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (	2761	my @menu_items = (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2762	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2763	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2764	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2765	(
		2766	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2767	? (
		2768	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2769	)
		2770	: (
		2771	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2772	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2773	)
2519	],	2774	),
2520	)->popup ($ev);	2775	);
		2776
		2777	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521	}	2778	}
2522		2779
2523	1	2780	1
2524	},	2781	},
2525	%args	2782	%args
2526	);	2783	);
		2784
2527		2785
2528	$self->add (new CFClient::UI::Face	2786	$self->add (new CFClient::UI::Face
2529	can_events => 0,	2787	can_events => 0,
2530	face => $item->{face},	2788	face => $item->{face},
2531	anim => $item->{anim},	2789	anim => $item->{anim},
2532	animspeed => $item->{animspeed},	2790	animspeed => $item->{animspeed},
2533	);	2791	);
2534		2792
2535	$self->add (new CFClient::UI::Label	2793	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536	can_events => 0,	2794
2537	text => $desc,	2795	$self->{item} = $item;
2538	);	2796
		2797	$self->update_item;
2539		2798
2540	$self	2799	$self
		2800	}
		2801
		2802	sub update_item {
		2803	my ($self) = @_;
		2804
		2805	my $desc = _item_to_desc ($self->{item});
		2806
		2807	$self->{name_lbl}->set_text ($desc);
2541	}	2808	}
2542		2809
2543	#############################################################################	2810	#############################################################################
2544		2811
2545	package CFClient::UI::Inventory;	2812	package CFClient::UI::Inventory;
…		…
2548		2815
2549	sub new {	2816	sub new {
2550	my $class = shift;	2817	my $class = shift;
2551		2818
2552	my $self = $class->SUPER::new (	2819	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),	2820	scrolled => (new CFClient::UI::Table),
2554	@_,	2821	@_,
2555	);	2822	);
2556		2823
2557	$self	2824	$self
2558	}	2825	}
…		…
2561	my ($self, $items) = @_;	2828	my ($self, $items) = @_;
2562		2829
2563	$self->{scrolled}->clear;	2830	$self->{scrolled}->clear;
2564	return unless $items;	2831	return unless $items;
2565		2832
2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2833	my @items = sort {
		2834	($a->{type} <=> $b->{type})
		2835	or ($a->{name} cmp $b->{name})
		2836	} @$items;
2567		2837
2568	$self->{real_items} = \@items;	2838	$self->{real_items} = \@items;
2569		2839
2570	for my $item (@items) {	2840	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2841	$item->{item} = $item;
2572	? $item->{name}
2573	: "$item->{nrof} $item->{name_pl}";
2574
2575	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2842	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2843	$item->update_item ();
		2844	}
		2845
		2846	my $i = 0;
		2847	for (@items) {
		2848	$self->{scrolled}->add (0, $i, $_);
		2849	my $nrof = $_->{item}->{nrof} || 1;
		2850	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2576	}	2851	}
2577		2852
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2853	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579	}	2854	}
2580		2855
…		…
2623		2898
2624	# popup given the event (must be a mouse button down event currently)	2899	# popup given the event (must be a mouse button down event currently)
2625	sub popup {	2900	sub popup {
2626	my ($self, $ev) = @_;	2901	my ($self, $ev) = @_;
2627		2902
2628	$self->emit ("popdown");	2903	$self->_emit ("popdown");
2629		2904
2630	# maybe save $GRAB? must be careful about events...	2905	# maybe save $GRAB? must be careful about events...
2631	$GRAB = $self;	2906	$GRAB = $self;
2632	$self->{button} = $ev->{button};	2907	$self->{button} = $ev->{button};
2633		2908
…		…
2648		2923
2649	if ($ev->{button} == $self->{button}) {	2924	if ($ev->{button} == $self->{button}) {
2650	undef $GRAB;	2925	undef $GRAB;
2651	$self->hide;	2926	$self->hide;
2652		2927
2653	$self->emit ("popdown");	2928	$self->_emit ("popdown");
2654	$self->{hover}[1]->() if $self->{hover};	2929	$self->{hover}[1]->() if $self->{hover};
2655	}	2930	}
		2931	}
		2932
		2933	#############################################################################
		2934
		2935	package CFClient::UI::Statusbox;
		2936
		2937	our @ISA = CFClient::UI::VBox::;
		2938
		2939	sub new {
		2940	my $class = shift;
		2941
		2942	$class->SUPER::new (
		2943	fontsize => 0.8,
		2944	@_,
		2945	)
		2946	}
		2947
		2948	sub reorder {
		2949	my ($self) = @_;
		2950	my $NOW = time;
		2951
		2952	while (my ($k, $v) = each %{ $self->{item} }) {
		2953	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2954	}
		2955
		2956	my @widgets;
		2957
		2958	my @items = sort {
		2959	$a->{pri} <=> $b->{pri}
		2960	or $b->{id} <=> $a->{id}
		2961	} values %{ $self->{item} };
		2962
		2963	my $count = 10 + 1;
		2964	for my $item (@items) {
		2965	last unless --$count;
		2966
		2967	push @widgets, $item->{label} ||= do {
		2968	# TODO: doesn't handle markup well (read as: at all)
		2969	my $short = $item->{count} > 1
		2970	? "<b>$item->{count} ×</b> $item->{text}"
		2971	: $item->{text};
		2972
		2973	for ($short) {
		2974	s/^\s+//;
		2975	s/\s+/ /g;
		2976	}
		2977
		2978	new CFClient::UI::Label
		2979	markup => $short,
		2980	tooltip => $item->{tooltip},
		2981	tooltip_font => $::FONT_PROP,
		2982	tooltip_width => 0.67,
		2983	fontsize => $item->{fontsize} || $self->{fontsize},
		2984	max_w => $::WIDTH * 0.44,
		2985	fg => $item->{fg},
		2986	can_events => 1,
		2987	can_hover => 1
		2988	};
		2989	}
		2990
		2991	$self->clear;
		2992	$self->SUPER::add (reverse @widgets);
		2993	}
		2994
		2995	sub add {
		2996	my ($self, $text, %arg) = @_;
		2997
		2998	$text =~ s/^\s+//;
		2999	$text =~ s/\s+$//;
		3000
		3001	my $timeout = time + ((delete $arg{timeout}) || 60);
		3002
		3003	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		3004
		3005	if (my $item = $self->{item}{$group}) {
		3006	if ($item->{text} eq $text) {
		3007	$item->{count}++;
		3008	} else {
		3009	$item->{count} = 1;
		3010	$item->{text} = $item->{tooltip} = $text;
		3011	}
		3012	$item->{id} = ++$self->{id};
		3013	$item->{timeout} = $timeout;
		3014	delete $item->{label};
		3015	} else {
		3016	$self->{item}{$group} = {
		3017	id => ++$self->{id},
		3018	text => $text,
		3019	timeout => $timeout,
		3020	tooltip => $text,
		3021	fg => [0.8, 0.8, 0.8, 0.8],
		3022	pri => 0,
		3023	count => 1,
		3024	%arg,
		3025	};
		3026	}
		3027
		3028	$self->reorder;
		3029	}
		3030
		3031	sub reconfigure {
		3032	my ($self) = @_;
		3033
		3034	delete $_->{label}
		3035	for values %{ $self->{item} || {} };
		3036
		3037	$self->reorder;
		3038	$self->SUPER::reconfigure;
2656	}	3039	}
2657		3040
2658	#############################################################################	3041	#############################################################################
2659		3042
2660	package CFClient::UI::Root;	3043	package CFClient::UI::Root;
…		…
2692	}	3075	}
2693		3076
2694	sub size_allocate {	3077	sub size_allocate {
2695	my ($self, $w, $h) = @_;	3078	my ($self, $w, $h) = @_;
2696		3079
2697	my $old_w = $self->{old_w};
2698	my $old_h = $self->{old_h};
2699
2700	if ($old_w && $old_h) {
2701	for my $child ($self->children) {
2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710	}
2711	}
2712
2713	for my $child ($self->children) {	3080	for my $child ($self->children) {
2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3081	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715		3082
		3083	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3084	if exists $child->{req_x};
		3085
		3086	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3087	if exists $child->{req_y};
		3088
2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3089	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3090	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3091
2718	$child->configure ($X, $Y, $W, $H);	3092	$child->configure ($X, $Y, $W, $H);
2719	}	3093	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	3094	}
2724		3095
2725	sub coord2local {	3096	sub coord2local {
2726	my ($self, $x, $y) = @_;	3097	my ($self, $x, $y) = @_;
2727		3098
…		…
2740	$self->check_size;	3111	$self->check_size;
2741	$::WANT_REFRESH++;	3112	$::WANT_REFRESH++;
2742	}	3113	}
2743		3114
2744	sub add {	3115	sub add {
2745	my ($self, $child) = @_;	3116	my ($self, @children) = @_;
2746		3117
		3118	for (my @widgets = @children; my $w = pop @widgets; ) {
		3119	push @widgets, $w->children;
		3120	$w->{root} = $self;
		3121	$w->{visible} = 1;
		3122	}
		3123
		3124	for my $child (@children) {
		3125	$child->{is_toplevel} = 1;
		3126
2747	# integerise window positions	3127	# integerise window positions
2748	$child->{x} = int $child->{x};	3128	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3129	$child->{y} = int $child->{y};
		3130	}
2750		3131
2751	$self->SUPER::add ($child);	3132	$self->SUPER::add (@children);
		3133	}
		3134
		3135	sub remove {
		3136	my ($self, @children) = @_;
		3137
		3138	$self->SUPER::remove (@children);
		3139
		3140	while (@children) {
		3141	my $w = pop @children;
		3142	push @children, $w->children;
		3143	$w->set_invisible;
		3144	}
2752	}	3145	}
2753		3146
2754	sub on_refresh {	3147	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3148	my ($self, $id, $cb) = @_;
2756		3149
2757	$self->{refresh_hook}{$id} = $cb;	3150	$self->{refresh_hook}{$id} = $cb;
2758	}	3151	}
2759		3152
		3153	sub on_post_alloc {
		3154	my ($self, $id, $cb) = @_;
		3155
		3156	$self->{post_alloc_hook}{$id} = $cb;
		3157	}
		3158
2760	sub draw {	3159	sub draw {
2761	my ($self) = @_;	3160	my ($self) = @_;
		3161
		3162	while ($self->{refresh_hook}) {
		3163	$_->()
		3164	for values %{delete $self->{refresh_hook}};
		3165	}
2762		3166
2763	if ($self->{check_size}) {	3167	if ($self->{check_size}) {
2764	my @queue = ([], []);	3168	my @queue = ([], []);
2765		3169
2766	for (;;) {	3170	for (;;) {
…		…
2774		3178
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3179	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3180	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3181	: $widget->size_request;
2778		3182
		3183	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3184	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3185	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3186
2782	$widget->{req_w} = $w;	3187	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3188	$widget->{req_h} = $h;
2784		3189
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3190	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3191
2787	$widget->{parent}->check_size	3192	$widget->{parent}->check_size
2788	if $widget->{parent};	3193	if $widget->{parent};
2789	}	3194	}
2790	}	3195	}
…		…
2797	$w = 0 if $w < 0;	3202	$w = 0 if $w < 0;
2798	$h = 0 if $h < 0;	3203	$h = 0 if $h < 0;
2799		3204
2800	$widget->{w} = $w;	3205	$widget->{w} = $w;
2801	$widget->{h} = $h;	3206	$widget->{h} = $h;
2802	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3207	$widget->emit (size_allocate => $w, $h);
2804	}	3208	}
2805	}	3209	}
2806		3210
2807	while ($self->{refresh_hook}) {	3211	while ($self->{post_alloc_hook}) {
2808	$_->()	3212	$_->()
2809	for values %{delete $self->{refresh_hook}};	3213	for values %{delete $self->{post_alloc_hook}};
2810	}	3214	}
2811		3215
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3216	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3217	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2815		3219
2816	glMatrixMode GL_PROJECTION;	3220	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3221	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3222	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3223	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3224	glLoadIdentity;
2821		3225
2822	$self->_draw;	3226	$self->_draw;
2823	}	3227	}
…		…
2825	#############################################################################	3229	#############################################################################
2826		3230
2827	package CFClient::UI;	3231	package CFClient::UI;
2828		3232
2829	$ROOT = new CFClient::UI::Root;	3233	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3234	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3235
2832	1	3236	1
2833		3237

Diff Legend

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