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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38	}
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	61	}
44		62
45	return;	63	return;
46	}	64	}
47	}	65	}
…		…
51	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
52	}	70	}
53		71
54	# class methods for events	72	# class methods for events
55	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	75	if $FOCUS;
58	}	76	}
59		77
60	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	80	if $FOCUS;
63	}	81	}
64		82
65	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	84	my ($ev) = @_;
…		…
75	check_tooltip;	93	check_tooltip;
76	}	94	}
77		95
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		97
80	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	100	}
85		101
86	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	103	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
89		105
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		107
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		109
94	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		112
99	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	115	$grab->update if $grab;
102	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		133
120	check_tooltip;	134	check_tooltip;
121	}	135	}
122		136
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	138	if $HOVER;
127	}	139	}
128		140
129	# convert position array to integers	141	# convert position array to integers
130	sub harmonize {	142	sub harmonize {
131	my ($vals) = @_;	143	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	149	$rem += $_ - $i;
138	$_ = $i;	150	$_ = $i;
139	}	151	}
140	}	152	}
141		153
		154	sub full_refresh {
		155	# make a copy, otherwise for complains about freed values.
		156	my @widgets = values %WIDGET;
		157
		158	$_->update
		159	for @widgets;
		160	}
		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
142	# call when resolution changes etc.	170	# call when resolution changes etc.
143	sub rescale_widgets {	171	sub rescale_widgets {
144	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
145		173
146	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
156	}	189	}
157
158	$widget->reconfigure;
159	}	190	}
		191
		192	reconfigure_widgets;
160	}	193	}
161		194
162	#############################################################################	195	#############################################################################
163		196
164	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
169		202
170	sub new {	203	sub new {
171	my $class = shift;	204	my $class = shift;
172		205
173	my $self = bless {	206	my $self = bless {
174	x => 0,	207	x => "center",
175	y => 0,	208	y => "center",
176	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
177	can_events => 1,	212	can_events => 1,
178	@_	213	@_
179	}, $class;	214	}, $class;
180		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
181	for (keys %$self) {	218	for (keys %$self) {
182	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
184	}	221	}
185	}	222	}
186		223
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
188		235
189	$self	236	$self
190	}	237	}
191		238
192	sub destroy {	239	sub destroy {
…		…
202	return if $self->{parent};	249	return if $self->{parent};
203		250
204	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
205	}	252	}
206		253
207	sub hide {	254	sub set_visible {
208	my ($self) = @_;	255	my ($self) = @_;
		256
		257	return if $self->{visible};
		258
		259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
		261
		262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
		270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
209		278
210	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
212		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
213	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
214	if $self->{parent};	313	if $self->{parent};
215	}	314	}
216		315
217	sub move {	316	sub move_abs {
218	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
219		318
220	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
221	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
222	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
223		322
224	$self->update;	323	$self->update;
225	}	324	}
226		325
227	sub set_size {	326	sub set_size {
228	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
229		328
230	$self->{user_w} = $w;	329	$self->{force_w} = $w;
231	$self->{user_h} = $h;	330	$self->{force_h} = $h;
232		331
233	$self->check_size;	332	$self->realloc;
234	}	333	}
235		334
236	sub size_request {	335	sub size_request {
237	require Carp;	336	require Carp;
238	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
240		339
241	sub configure {	340	sub configure {
242	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
243		342
244	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
245	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
246	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
247		348
248	# use alignment to adjust x, y	349	# use alignment to adjust x, y
249		350
250	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
251	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
252
253	($w, $h) = ($w2, $h2);
254	}	353	}
255		354
256	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
257	$self->{x} = $x;	356	$self->{x} = $x;
258	$self->{y} = $y;	357	$self->{y} = $y;
259	$self->update;	358	$self->update;
260	}	359	}
261		360
262	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
264	}	368	}
265	}	369	}
266		370
267	sub size_allocate {	371	sub size_allocate {
268	# nothing to be done	372	# nothing to be done
269	}	373	}
270		374
271	sub reconfigure {
272	my ($self) = @_;
273
274	$self->check_size (1);
275	$self->update;
276	}
277
278	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
279	}	381	}
280		382
281	sub set_max_size {	383	sub set_max_size {
282	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
283		385
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
		390	}
		391
		392	sub set_tooltip {
		393	my ($self, $tooltip) = @_;
		394
		395	$tooltip =~ s/^\s+//;
		396	$tooltip =~ s/\s+$//;
		397
		398	return if $self->{tooltip} eq $tooltip;
		399
		400	$self->{tooltip} = $tooltip;
		401
		402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		403	delete $CFClient::UI::TOOLTIP->{owner};
		404	CFClient::UI::check_tooltip;
		405	}
286	}	406	}
287		407
288	# translate global coordinates to local coordinate system	408	# translate global coordinates to local coordinate system
289	sub coord2local {	409	sub coord2local {
290	my ($self, $x, $y) = @_;	410	my ($self, $x, $y) = @_;
…		…
305	return if $FOCUS == $self;	425	return if $FOCUS == $self;
306	return unless $self->{can_focus};	426	return unless $self->{can_focus};
307		427
308	my $focus = $FOCUS; $FOCUS = $self;	428	my $focus = $FOCUS; $FOCUS = $self;
309		429
310	$self->emit (focus_in => $focus);	430	$self->_emit (focus_in => $focus);
311		431
312	$focus->update if $focus;	432	$focus->update if $focus;
313	$FOCUS->update;	433	$FOCUS->update;
314	}	434	}
315		435
…		…
318		438
319	return unless $FOCUS == $self;	439	return unless $FOCUS == $self;
320		440
321	my $focus = $FOCUS; undef $FOCUS;	441	my $focus = $FOCUS; undef $FOCUS;
322		442
323	$self->emit (focus_out => $focus);	443	$self->_emit (focus_out => $focus);
324		444
325	$focus->update if $focus; #?	445	$focus->update if $focus; #?
326	}
327		446
		447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		448	unless $FOCUS;
		449	}
		450
328	sub mouse_motion { }	451	sub mouse_motion { 0 }
329	sub button_up { }	452	sub button_up { 0 }
330	sub key_down { }	453	sub key_down { 0 }
331	sub key_up { }	454	sub key_up { 0 }
332		455
333	sub button_down {	456	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
335		458
336	$self->focus_in;	459	$self->focus_in;
337	}
338		460
339	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
340	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
341	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	463
342	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	464	sub find_widget {
343	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	465	my ($self, $x, $y) = @_;
		466
		467	return () unless $self->{can_events};
		468
		469	return $self
		470	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		471	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		472
		473	()
		474	}
		475
		476	sub set_parent {
		477	my ($self, $parent) = @_;
		478
		479	Scalar::Util::weaken ($self->{parent} = $parent);
		480	$self->set_visible if $parent->{visible};
		481	}
		482
		483	sub connect {
		484	my ($self, $signal, $cb) = @_;
		485
		486	push @{ $self->{signal_cb}{$signal} }, $cb;
		487	}
		488
		489	sub _emit {
		490	my ($self, $signal, @args) = @_;
		491
		492	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		493	}
		494
		495	sub emit {
		496	my ($self, $signal, @args) = @_;
		497
		498	$self->_emit ($signal, @args)
		499	|| $self->$signal (@args);
		500	}
		501
		502	sub visibility_change {
		503	#my ($self, $visible) = @_;
		504	}
		505
		506	sub realloc {
		507	my ($self) = @_;
		508
		509	if ($self->{visible}) {
		510	return if $self->{root}{realloc}{$self+0};
		511
		512	$self->{root}{realloc}{$self+0} = $self;
		513	$self->{root}->update;
		514	} else {
		515	delete $self->{req_w};
		516	delete $self->{req_h};
		517	}
		518	}
		519
		520	sub update {
		521	my ($self) = @_;
		522
		523	$self->{parent}->update
		524	if $self->{parent};
		525	}
		526
		527	sub reconfigure {
		528	my ($self) = @_;
		529
		530	$self->realloc;
		531	$self->update;
		532	}
		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
344		537
345	sub draw {	538	sub draw {
346	my ($self) = @_;	539	my ($self) = @_;
347		540
348	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
349		552
350	glPushMatrix;	553	glPushMatrix;
351	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
352	$self->_draw;
353	glPopMatrix;
354		555
355	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
356	my ($x, $y) = @$self{qw(x y)};
357
358	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
359	glEnable GL_BLEND;	558	glEnable GL_BLEND;
360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
361	glBegin GL_QUADS;	560	glBegin GL_QUADS;
362	glVertex $x , $y;
363	glVertex $x + $self->{w}, $y;
364	glVertex $x + $self->{w}, $y + $self->{h};
365	glVertex $x , $y + $self->{h};
366	glEnd;
367	glDisable GL_BLEND;
368	}
369
370	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;
372	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	561	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	562	glVertex $self->{w}, 0;
377	glVertex $self->{w}, $self->{h};	563	glVertex $self->{w}, $self->{h};
378	glVertex 0 , $self->{h};	564	glVertex 0 , $self->{h};
379	glEnd;	565	glEnd;
		566	glDisable GL_BLEND;
		567	}
		568
		569	if ($ENV{CFPLUS_DEBUG} & 1) {
		570	glPushMatrix;
		571	glColor 1, 1, 0, 1;
		572	glTranslate 0.375, 0.375;
		573	glBegin GL_LINE_LOOP;
		574	glVertex 0 , 0;
		575	glVertex $self->{w} - 1, 0;
		576	glVertex $self->{w} - 1, $self->{h} - 1;
		577	glVertex 0 , $self->{h} - 1;
		578	glEnd;
380	glPopMatrix;	579	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
383	}	585	}
384		586
385	sub _draw {	587	sub _draw {
386	my ($self) = @_;	588	my ($self) = @_;
387		589
388	warn "no draw defined for $self\n";	590	warn "no draw defined for $self\n";
389	}
390
391	sub find_widget {
392	my ($self, $x, $y) = @_;
393
394	return () unless $self->{can_events};
395
396	return $self
397	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400	()
401	}
402
403	sub set_parent {
404	my ($self, $parent) = @_;
405
406	Scalar::Util::weaken ($self->{parent} = $parent);
407
408	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size
410	unless exists $self->{req_w};
411	}
412
413	sub check_size {
414	my ($self, $forced) = @_;
415
416	$self->{force_alloc} = 1 if $forced;
417	$CFClient::UI::ROOT->{check_size}{$self} = $self;
418	}
419
420	sub update {
421	my ($self) = @_;
422
423	$self->{parent}->update
424	if $self->{parent};
425	}
426
427	sub connect {
428	my ($self, $signal, $cb) = @_;
429
430	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}
432
433	sub emit {
434	my ($self, $signal, @args) = @_;
435
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437	}	591	}
438		592
439	sub DESTROY {	593	sub DESTROY {
440	my ($self) = @_;	594	my ($self) = @_;
441		595
…		…
456	my $class = shift;	610	my $class = shift;
457		611
458	# range [value, low, high, page]	612	# range [value, low, high, page]
459		613
460	$class->SUPER::new (	614	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	615	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	616	#active_bg => [1, 1, 1, 0.5],
463	@_	617	@_
464	)	618	)
465	}	619	}
466		620
467	sub _draw {	621	sub _draw {
468	my ($self) = @_;	622	my ($self) = @_;
469		623
		624	my $color = $FOCUS == $self && $self->{active_bg}
		625	? $self->{active_bg}
		626	: $self->{bg};
		627
		628	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
471		630
472	glEnable GL_BLEND;	631	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	633	glColor_premultiply @$color;
475		634
476	glBegin GL_QUADS;	635	glBegin GL_QUADS;
477	glVertex 0 , 0;	636	glVertex 0 , 0;
478	glVertex 0 , $h;	637	glVertex 0 , $h;
479	glVertex $w, $h;	638	glVertex $w, $h;
480	glVertex $w, 0;	639	glVertex $w, 0;
481	glEnd;	640	glEnd;
482		641
483	glDisable GL_BLEND;	642	glDisable GL_BLEND;
		643	}
484	}	644	}
485		645
486	#############################################################################	646	#############################################################################
487		647
488	package CFClient::UI::Empty;	648	package CFClient::UI::Empty;
…		…
493	my ($class, %arg) = @_;	653	my ($class, %arg) = @_;
494	$class->SUPER::new (can_events => 0, %arg);	654	$class->SUPER::new (can_events => 0, %arg);
495	}	655	}
496		656
497	sub size_request {	657	sub size_request {
498	(0, 0)	658	my ($self) = @_;
		659
		660	($self->{w} + 0, $self->{h} + 0)
499	}	661	}
500		662
501	sub draw { }	663	sub draw { }
502		664
503	#############################################################################	665	#############################################################################
…		…
507	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
508		670
509	sub new {	671	sub new {
510	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
511		673
512	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
513		675
514	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
515	children => [],	677	children => [],
516	can_events => 0,	678	can_events => 0,
517	%arg,	679	%arg,
518	);	680	);
		681
519	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
520		684
521	$self	685	$self
522	}	686	}
523		687
524	sub add {	688	sub add {
…		…
532	$self->{children} = [	696	$self->{children} = [
533	sort { $a->{z} <=> $b->{z} }	697	sort { $a->{z} <=> $b->{z} }
534	@{$self->{children}}, @widgets	698	@{$self->{children}}, @widgets
535	];	699	];
536		700
537	$self->check_size (1);	701	$self->realloc;
538	$self->update;
539	}	702	}
540		703
541	sub children {	704	sub children {
542	@{ $_[0]{children} }	705	@{ $_[0]{children} }
543	}	706	}
…		…
548	delete $child->{parent};	711	delete $child->{parent};
549	$child->hide;	712	$child->hide;
550		713
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	714	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		715
553	$self->check_size;	716	$self->realloc;
554	$self->update;
555	}	717	}
556		718
557	sub clear {	719	sub clear {
558	my ($self) = @_;	720	my ($self) = @_;
559		721
…		…
563	for (@$children) {	725	for (@$children) {
564	delete $_->{parent};	726	delete $_->{parent};
565	$_->hide;	727	$_->hide;
566	}	728	}
567		729
568	$self->check_size;	730	$self->realloc;
569	$self->update;
570	}	731	}
571		732
572	sub find_widget {	733	sub find_widget {
573	my ($self, $x, $y) = @_;	734	my ($self, $x, $y) = @_;
574		735
575	$x -= $self->{x};	736	$x -= $self->{x};
576	$y -= $self->{y};	737	$y -= $self->{y};
577		738
578	my $res;	739	my $res;
579		740
580	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
581	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
582	and return $res;	743	and return $res;
583	}	744	}
584		745
585	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
634	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
635	}	796	}
636		797
637	#############################################################################	798	#############################################################################
638		799
		800	# back-buffered drawing area
		801
639	package CFClient::UI::Window;	802	package CFClient::UI::Window;
640		803
641	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
642		805
643	use CFClient::OpenGL;	806	use CFClient::OpenGL;
…		…
661	$self->SUPER::size_allocate ($w, $h);	824	$self->SUPER::size_allocate ($w, $h);
662	$self->update;	825	$self->update;
663	}	826	}
664		827
665	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
666	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
667	}	832	}
668		833
669	sub render_child {	834	sub render_child {
670	my ($self) = @_;	835	my ($self) = @_;
671		836
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
675		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
676	$self->_render;	848	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	849	};
685	}	850	}
686		851
687	sub _draw {	852	sub _draw {
688	my ($self) = @_;	853	my ($self) = @_;
689		854
690	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
691		856
692	my $tex = $self->{texture}	857	my $tex = $self->{texture}
693	or return;	858	or return;
694		859
695	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
…		…
705		870
706	package CFClient::UI::ViewPort;	871	package CFClient::UI::ViewPort;
707		872
708	our @ISA = CFClient::UI::Window::;	873	our @ISA = CFClient::UI::Window::;
709		874
		875	sub new {
		876	my $class = shift;
		877
		878	$class->SUPER::new (
		879	scroll_x => 0,
		880	scroll_y => 1,
		881	@_,
		882	)
		883	}
		884
710	sub size_request {	885	sub size_request {
711	my ($self) = @_;	886	my ($self) = @_;
712		887
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		889
716	@$self{qw(child_w child_h)}	890	$w = 10 if $self->{scroll_x};
		891	$h = 10 if $self->{scroll_y};
		892
		893	($w, $h)
717	}	894	}
718		895
719	sub size_allocate {	896	sub size_allocate {
720	my ($self, $w, $h) = @_;	897	my ($self, $w, $h) = @_;
721		898
		899	my $child = $self->child;
		900
		901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		903
		904	$self->child->configure (0, 0, $w, $h);
722	$self->update;	905	$self->update;
723	}	906	}
724		907
725	sub set_offset {	908	sub set_offset {
726	my ($self, $x, $y) = @_;	909	my ($self, $x, $y) = @_;
…		…
760	}	943	}
761		944
762	sub _render {	945	sub _render {
763	my ($self) = @_;	946	my ($self) = @_;
764		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
765	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766		952
767	$self->SUPER::_render;	953	$self->SUPER::_render;
768	}	954	}
769		955
…		…
772	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
773		959
774	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
775		961
776	sub new {	962	sub new {
777	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
778		966
779	my $self;	967	my $self;
780		968
781	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
782	vertical => 1,	970	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	971	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	972	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	973	$self->{vp}->set_offset (0, $_[1]);
786	},	974	},
787	;	975	;
788		976
789	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	978	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	979	slider => $slider,
792	@_,	980	%arg,
793	);	981	);
794		982
795	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});
797	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
798		985
799	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
		993	}
		994
		995	sub update {
		996	my ($self) = @_;
		997
		998	$self->SUPER::update;
		999
		1000	# todo: overwrite size_allocate of child
		1001	my $child = $self->{vp}->child;
		1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1003	}
		1004
		1005	sub size_allocate {
		1006	my ($self, $w, $h) = @_;
		1007
		1008	$self->SUPER::size_allocate ($w, $h);
		1009
		1010	my $child = $self->{vp}->child;
		1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	1012	}
801		1013
802	#TODO# update range on size_allocate depending on child	1014	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	1015	# update viewport offset on scroll
804		1016
…		…
824		1036
825	if ($self->{bg}) {	1037	if ($self->{bg}) {
826	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
827		1039
828	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
829	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
830	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
831		1043
832	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
833	glVertex 0 , 0;	1045	glVertex 0 , 0;
834	glVertex 0 , $h;	1046	glVertex 0 , $h;
835	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
848		1060
849	our @ISA = CFClient::UI::Bin::;	1061	our @ISA = CFClient::UI::Bin::;
850		1062
851	use CFClient::OpenGL;	1063	use CFClient::OpenGL;
852		1064
853	my @tex =	1065	my $bg =
		1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1067	mipmap => 1, wrap => 1;
		1068
		1069	my @border =
854	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856		1072
857	sub new {	1073	sub new {
858	my $class = shift;	1074	my ($class, %arg) = @_;
859		1075
860	# TODO: user_x, user_y, overwrite moveto?	1076	my $title = delete $arg{title};
861		1077
862	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1081	border => 0.6,
866	toplevel => 1,
867	can_events => 1,	1082	can_events => 1,
868	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
869	);	1086	);
870		1087
871	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
872	align => 0,	1089	align => 0,
873	valign => 1,	1090	valign => 1,
874	text => $self->{title},	1091	text => $title,
875	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
876		1094
877	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
878	}	1103	}
879		1104
880	sub border {	1105	sub border {
881	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
882	}	1107	}
883		1108
884	sub size_request {	1109	sub size_request {
885	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
886		1114
887	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
888		1116
889	(	1117	(
890	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
893	}	1121	}
894		1122
895	sub size_allocate {	1123	sub size_allocate {
896	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
897		1125
		1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
		1131
		1132	my $border = $self->border;
		1133
898	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
900		1136
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902	if $self->{title};
903
904	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
905	}	1138	}
906		1139
907	sub button_down {	1140	sub button_down {
908	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
909		1142
…		…
925	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
926		1159
927	my $dx = $ev->{x} - $ox;	1160	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
929		1162
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1165
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933	$self->check_size;	1167	$self->realloc;
934	};	1168	};
935		1169
936	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
938	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
940	$self->{motion} = sub {	1174	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
942		1176
943	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
944		1178
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946	$self->update;	1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
947	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
948	}	1187	1
949	}	1188	}
950		1189
951	sub button_up {	1190	sub button_up {
952	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
953		1192
954	delete $self->{motion};	1193	!!delete $self->{motion}
955	}	1194	}
956		1195
957	sub mouse_motion {	1196	sub mouse_motion {
958	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
959		1198
960	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
961	}	1202	}
962		1203
963	sub _draw {	1204	sub _draw {
964	my ($self) = @_;	1205	my ($self) = @_;
965		1206
		1207	my $child = $self->{children}[0];
		1208
966	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
967	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
968		1211
969	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
970	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971		1214
972	my $border = $self->border;	1215	my $border = $self->border;
973		1216
974	glColor @{ $self->{border_bg} };	1217	glColor @{ $self->{border_bg} };
975	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);
976	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
977	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979		1222
980	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981	my $bg = $tex[0];	1224	glColor @{ $self->{bg} };
982		1225
983	# TODO: repeat texture not scale	1226	# TODO: repeat texture not scale
		1227	# solve this better(?)
984	my $rep_x = $cw / $bg->{w};	1228	$bg->{s} = $cw / $bg->{w};
985	my $rep_y = $ch / $bg->{h};	1229	$bg->{t} = $ch / $bg->{h};
986
987	glColor @{ $self->{bg} };
988
989	$bg->{s} = $rep_x;
990	$bg->{t} = $rep_y;
991	$bg->{wrap_mode} = 1;
992	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
993	}	1231	}
994		1232
995	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
996		1234
997	$self->{title}->draw if $self->{title};
998
999	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1000	}	1241	}
1001		1242
1002	#############################################################################	1243	#############################################################################
1003		1244
1004	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1012	sub new {	1253	sub new {
1013	my $class = shift;	1254	my $class = shift;
1014		1255
1015	$class->SUPER::new (	1256	$class->SUPER::new (
1016	col_expand => [],	1257	col_expand => [],
1017	@_	1258	@_,
1018	)	1259	)
		1260	}
		1261
		1262	sub children {
		1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1264	}
1020		1265
1021	sub add {	1266	sub add {
1022	my ($self, $x, $y, $child) = @_;	1267	my ($self, $x, $y, $child) = @_;
1023		1268
1024	$child->set_parent ($self);	1269	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1270	$self->{children}[$y][$x] = $child;
1026		1271
1027	$child->check_size;	1272	$self->realloc;
1028	}	1273	}
1029		1274
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1275	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1276	sub clear {
1036	my ($self) = @_;	1277	my ($self) = @_;
1037		1278
1038	my @children = $self->children;	1279	my @children = $self->children;
1039	delete $self->{children};	1280	delete $self->{children};
…		…
1041	for (@children) {	1282	for (@children) {
1042	delete $_->{parent};	1283	delete $_->{parent};
1043	$_->hide;	1284	$_->hide;
1044	}	1285	}
1045		1286
1046	$self->update;	1287	$self->realloc;
1047	}	1288	}
1048		1289
1049	sub get_wh {	1290	sub get_wh {
1050	my ($self) = @_;	1291	my ($self) = @_;
1051		1292
…		…
1082	sub size_allocate {	1323	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1084		1325
1085	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1086		1327
1087	my $req_w = sum @$ws;	1328	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1329	my $req_h = (sum @$hs) || 1;
1089		1330
1090	# TODO: nicer code && do row_expand	1331	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1332	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1333	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1334	my $col_expand = (sum @col_expand) || 1;
…		…
1147	}	1388	}
1148	}	1389	}
1149		1390
1150	#############################################################################	1391	#############################################################################
1151		1392
1152	package CFClient::UI::HBox;	1393	package CFClient::UI::Box;
1153
1154	# TODO: wrap into common Box base class
1155		1394
1156	our @ISA = CFClient::UI::Container::;	1395	our @ISA = CFClient::UI::Container::;
1157		1396
1158	sub size_request {	1397	sub size_request {
1159	my ($self) = @_;	1398	my ($self) = @_;
1160		1399
1161	my @alloc = map [$_->size_request], @{$self->{children}};	1400	$self->{vertical}
1162		1401	? (
1163	(	1402	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1164	(List::Util::sum map $_->[0], @alloc),	1403	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165	(List::Util::max map $_->[1], @alloc),	1404	)
1166	)	1405	: (
		1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1408	)
1167	}	1409	}
1168		1410
1169	sub size_allocate {	1411	sub size_allocate {
1170	my ($self, $w, $h) = @_;	1412	my ($self, $w, $h) = @_;
1171		1413
1172	($h, $w) = ($w, $h);	1414	my $space = $self->{vertical} ? $h : $w;
1173
1174	my $children = $self->{children};	1415	my $children = $self->{children};
1175		1416
1176	my @h = map $_->{req_w}, @$children;	1417	my @req;
1177		1418
1178	my $req_h = List::Util::sum @h;	1419	if ($self->{homogeneous}) {
1179		1420	@req = ($space / (@$children || 1)) x @$children;
1180	if ($req_h > $h) {
1181	# ah well, not enough space
1182	$_ *= $h / $req_h for @h;
1183	} else {	1421	} else {
		1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1423	my $req = List::Util::sum @req;
		1424
		1425	if ($req > $space) {
		1426	# ah well, not enough space
		1427	$_ *= $space / $req for @req;
		1428	} else {
1184	my $exp = List::Util::sum map $_->{expand}, @$children;	1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185	$exp ||= 1;
1186		1430
		1431	$space = ($space - $req) / $expand; # remaining space to give away
		1432
		1433	$req[$_] += $space * $children->[$_]{expand}
1187	for (0 .. $#$children) {	1434	for 0 .. $#$children;
1188	my $child = $children->[$_];
1189
1190	my $alloc_h = $h[$_];
1191	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192	$h[$_] = $alloc_h;
1193	}	1435	}
1194	}	1436	}
1195		1437
1196	CFClient::UI::harmonize \@h;	1438	CFClient::UI::harmonize \@req;
1197		1439
1198	my $y = 0;	1440	my $pos = 0;
1199	for (0 .. $#$children) {	1441	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201	my $h = $h[$_];	1442	my $alloc = $req[$_];
1202	$child->configure ($y, 0, $h, $w);	1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203		1444
1204	$y += $h;	1445	$pos += $alloc;
1205	}	1446	}
1206		1447
1207	1	1448	1
1208	}	1449	}
1209		1450
1210	#############################################################################	1451	#############################################################################
1211		1452
		1453	package CFClient::UI::HBox;
		1454
		1455	our @ISA = CFClient::UI::Box::;
		1456
		1457	sub new {
		1458	my $class = shift;
		1459
		1460	$class->SUPER::new (
		1461	vertical => 0,
		1462	@_,
		1463	)
		1464	}
		1465
		1466	#############################################################################
		1467
1212	package CFClient::UI::VBox;	1468	package CFClient::UI::VBox;
1213		1469
1214	# TODO: wrap into common Box base class
1215
1216	our @ISA = CFClient::UI::Container::;	1470	our @ISA = CFClient::UI::Box::;
1217		1471
1218	sub size_request {	1472	sub new {
1219	my ($self) = @_;	1473	my $class = shift;
1220		1474
1221	my @alloc = map [$_->size_request], @{$self->{children}};	1475	$class->SUPER::new (
1222		1476	vertical => 1,
1223	(	1477	@_,
1224	(List::Util::max map $_->[0], @alloc),
1225	(List::Util::sum map $_->[1], @alloc),
1226	)	1478	)
1227	}	1479	}
1228		1480
1229	sub size_allocate {
1230	my ($self, $w, $h) = @_;
1231
1232	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234	my $children = $self->{children};
1235
1236	my @h = map $_->{req_h}, @$children;
1237
1238	my $req_h = List::Util::sum @h;
1239
1240	if ($req_h > $h) {
1241	# ah well, not enough space
1242	$_ *= $h / $req_h for @h;
1243	} else {
1244	my $exp = List::Util::sum map $_->{expand}, @$children;
1245	$exp ||= 1;
1246
1247	for (0 .. $#$children) {
1248	my $child = $children->[$_];
1249
1250	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251	}
1252	}
1253
1254	CFClient::UI::harmonize \@h;
1255
1256	my $y = 0;
1257	for (0 .. $#$children) {
1258	my $child = $children->[$_];
1259	my $h = $h[$_];
1260	$child->configure (0, $y, $w, $h);
1261
1262	$y += $h;
1263	}
1264
1265	1
1266	}
1267
1268	#############################################################################	1481	#############################################################################
1269		1482
1270	package CFClient::UI::Label;	1483	package CFClient::UI::Label;
1271		1484
1272	our @ISA = CFClient::UI::Base::;	1485	our @ISA = CFClient::UI::DrawBG::;
1273		1486
1274	use CFClient::OpenGL;	1487	use CFClient::OpenGL;
1275		1488
1276	sub new {	1489	sub new {
1277	my ($class, %arg) = @_;	1490	my ($class, %arg) = @_;
1278		1491
1279	my $self = $class->SUPER::new (	1492	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1493	fg => [1, 1, 1],
		1494	#bg => none
		1495	#active_bg => none
1281	#font => default_font	1496	#font => default_font
1282	#text => initial text	1497	#text => initial text
1283	#markup => initial narkup	1498	#markup => initial narkup
		1499	#max_w => maximum pixel width
		1500	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1285	fontsize => 1,	1502	fontsize => 1,
1286	align => -1,	1503	align => -1,
1287	valign => -1,	1504	valign => -1,
1288	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1289	can_events => 0,	1507	can_events => 0,
1290	%arg	1508	%arg
1291	);	1509	);
1292		1510
1293	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1303	}	1521	}
1304		1522
1305	$self	1523	$self
1306	}	1524	}
1307		1525
1308	sub escape {	1526	sub escape($) {
1309	local $_ = $_[1];	1527	local $_ = $_[0];
1310		1528
1311	s/&/&amp;/g;	1529	s/&/&amp;/g;
1312	s/>/&gt;/g;	1530	s/>/&gt;/g;
1313	s/</&lt;/g;	1531	s/</&lt;/g;
1314		1532
1315	$_[1]	1533	$_
1316	}	1534	}
1317		1535
1318	sub update {	1536	sub update {
1319	my ($self) = @_;	1537	my ($self) = @_;
1320		1538
1321	delete $self->{texture};	1539	delete $self->{texture};
1322	$self->SUPER::update;	1540	$self->SUPER::update;
1323	}	1541	}
1324		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	$self->SUPER::realloc;
		1548	}
		1549
1325	sub set_text {	1550	sub set_text {
1326	my ($self, $text) = @_;	1551	my ($self, $text) = @_;
1327		1552
1328	return if $self->{text} eq "T$text";	1553	return if $self->{text} eq "T$text";
1329	$self->{text} = "T$text";	1554	$self->{text} = "T$text";
1330		1555
1331	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332	$self->{layout}->set_text ($text);	1557	$self->{layout}->set_text ($text);
		1558	delete $self->{req_h};
1333		1559
		1560	$self->realloc;
1334	$self->update;	1561	$self->update;
1335	$self->check_size;
1336	}	1562	}
1337		1563
1338	sub set_markup {	1564	sub set_markup {
1339	my ($self, $markup) = @_;	1565	my ($self, $markup) = @_;
1340		1566
…		…
1343		1569
1344	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345		1571
1346	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347	$self->{layout}->set_markup ($markup);	1573	$self->{layout}->set_markup ($markup);
		1574	delete $self->{req_h};
1348		1575
		1576	$self->realloc;
1349	$self->update;	1577	$self->update;
1350	$self->check_size;
1351	}	1578	}
1352		1579
1353	sub size_request {	1580	sub size_request {
1354	my ($self) = @_;	1581	my ($self) = @_;
1355		1582
		1583	if (exists $self->{req_h}) {
		1584	@$self{qw(req_w req_h)}
		1585	} else {
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1586	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1587	$self->{layout}->set_width ($self->{max_w} || -1);
		1588	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1591
1360	my ($w, $h) = $self->{layout}->size;	1592	my ($w, $h) = $self->{layout}->size;
1361		1593
1362	if (exists $self->{template}) {	1594	if (exists $self->{template}) {
1363	$self->{template}->set_font ($self->{font}) if $self->{font};	1595	$self->{template}->set_font ($self->{font}) if $self->{font};
1364	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365		1597
1366	my ($w2, $h2) = $self->{template}->size;	1598	my ($w2, $h2) = $self->{template}->size;
1367		1599
1368	$w = List::Util::max $w, $w2;	1600	$w = List::Util::max $w, $w2;
1369	$h = List::Util::max $h, $h2;	1601	$h = List::Util::max $h, $h2;
1370	}	1602	}
1371		1603
		1604	($w, $h)
1372	(	1605	}
1373	$w + $self->{padding} * 2,
1374	$h + $self->{padding} * 2,
1375	)
1376	}	1606	}
1377		1607
1378	sub size_allocate {	1608	sub size_allocate {
1379	my ($self, $w, $h) = @_;	1609	my ($self, $w, $h) = @_;
1380		1610
		1611	delete $self->{ox};
		1612
1381	delete $self->{texture};	1613	delete $self->{texture}
		1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382	}	1615	}
1383		1616
1384	sub set_fontsize {	1617	sub set_fontsize {
1385	my ($self, $fontsize) = @_;	1618	my ($self, $fontsize) = @_;
1386		1619
1387	$self->{fontsize} = $fontsize;	1620	$self->{fontsize} = $fontsize;
1388	delete $self->{texture};	1621	delete $self->{texture};
1389		1622
1390	$self->update;	1623	$self->realloc;
1391	$self->check_size;
1392	}	1624	}
1393		1625
1394	sub _draw {	1626	sub _draw {
1395	my ($self) = @_;	1627	my ($self) = @_;
		1628
		1629	$self->SUPER::_draw; # draw background, if applicable
1396		1630
1397	my $tex = $self->{texture} ||= do {	1631	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1632	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1633	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1634	$self->{layout}->set_width ($self->{w});
		1635	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1638
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1639	new_from_layout CFClient::Texture $self->{layout}
		1640	};
1404		1641
		1642	unless (exists $self->{ox}) {
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1645	: ($self->{w} - $tex->{w}) * 0.5);
1408		1646
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1649	: ($self->{h} - $tex->{h}) * 0.5);
1412
1413	$tex
1414	};	1650	};
1415		1651
1416	glEnable GL_TEXTURE_2D;	1652	glEnable GL_TEXTURE_2D;
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418		1654
		1655	glColor_premultiply @{$self->{fg}}
1419	if ($tex->{format} == GL_ALPHA) {	1656	if $tex->{format} == GL_ALPHA;
1420	glColor @{$self->{fg}};	1657
1421	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422	} else {
1423	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424	}
1425		1659
1426	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1427	}	1661	}
1428		1662
1429	#############################################################################	1663	#############################################################################
…		…
1444	active_fg => [0, 0, 0],	1678	active_fg => [0, 0, 0],
1445	can_hover => 1,	1679	can_hover => 1,
1446	can_focus => 1,	1680	can_focus => 1,
1447	valign => 0,	1681	valign => 0,
1448	can_events => 1,	1682	can_events => 1,
		1683	#text => ...
1449	@_	1684	@_
1450	)	1685	)
1451	}	1686	}
1452		1687
1453	sub _set_text {	1688	sub _set_text {
…		…
1455		1690
1456	delete $self->{cur_h};	1691	delete $self->{cur_h};
1457		1692
1458	return if $self->{text} eq $text;	1693	return if $self->{text} eq $text;
1459		1694
1460	delete $self->{texture};
1461
1462	$self->{last_activity} = $::NOW;	1695	$self->{last_activity} = $::NOW;
1463	$self->{text} = $text;	1696	$self->{text} = $text;
1464		1697
1465	$text =~ s/./*/g if $self->{hidden};	1698	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1699	$self->{layout}->set_text ("$text ");
		1700	delete $self->{req_h};
1467		1701
1468	$self->emit (changed => $self->{text});	1702	$self->_emit (changed => $self->{text});
		1703
		1704	$self->realloc;
		1705	$self->update;
1469	}	1706	}
1470		1707
1471	sub set_text {	1708	sub set_text {
1472	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1473		1710
1474	$self->{cursor} = length $text;	1711	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1712	$self->_set_text ($text);
1476	$self->check_size;
1477	$self->update;
1478	}	1713	}
1479		1714
1480	sub get_text {	1715	sub get_text {
1481	$_[0]{text}	1716	$_[0]{text}
1482	}	1717	}
…		…
1485	my ($self) = @_;	1720	my ($self) = @_;
1486		1721
1487	my ($w, $h) = $self->SUPER::size_request;	1722	my ($w, $h) = $self->SUPER::size_request;
1488		1723
1489	($w + 1, $h) # add 1 for cursor	1724	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1725	}
1497		1726
1498	sub key_down {	1727	sub key_down {
1499	my ($self, $ev) = @_;	1728	my ($self, $ev) = @_;
1500		1729
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1744	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1745	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1746	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1747	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1748	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1749	$self->_emit ('escape');
1521	} elsif ($uni) {	1750	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1751	substr $text, $self->{cursor}++, 0, chr $uni;
		1752	} else {
		1753	return 0;
1523	}	1754	}
1524		1755
1525	$self->_set_text ($text);	1756	$self->_set_text ($text);
1526	$self->update;	1757
		1758	$self->realloc;
		1759
		1760	1
1527	}	1761	}
1528		1762
1529	sub focus_in {	1763	sub focus_in {
1530	my ($self) = @_;	1764	my ($self) = @_;
1531		1765
…		…
1546	utf8::encode $text;	1780	utf8::encode $text;
1547	$self->{cursor} = length substr $text, 0, $idx;	1781	$self->{cursor} = length substr $text, 0, $idx;
1548		1782
1549	$self->_set_text ($self->{text});	1783	$self->_set_text ($self->{text});
1550	$self->update;	1784	$self->update;
		1785
		1786	1
1551	}	1787	}
1552		1788
1553	sub mouse_motion {	1789	sub mouse_motion {
1554	my ($self, $ev, $x, $y) = @_;	1790	my ($self, $ev, $x, $y) = @_;
1555	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1792
		1793	0
1556	}	1794	}
1557		1795
1558	sub _draw {	1796	sub _draw {
1559	my ($self) = @_;	1797	my ($self) = @_;
1560		1798
1561	local $self->{fg} = $self->{fg};	1799	local $self->{fg} = $self->{fg};
1562		1800
1563	if ($FOCUS == $self) {	1801	if ($FOCUS == $self) {
1564	glColor @{$self->{active_bg}};	1802	glColor_premultiply @{$self->{active_bg}};
1565	$self->{fg} = $self->{active_fg};	1803	$self->{fg} = $self->{active_fg};
1566	} else {	1804	} else {
1567	glColor @{$self->{bg}};	1805	glColor_premultiply @{$self->{bg}};
1568	}	1806	}
1569		1807
1570	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
1571	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1809	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572	glBegin GL_QUADS;	1810	glBegin GL_QUADS;
1573	glVertex 0 , 0;	1811	glVertex 0 , 0;
1574	glVertex 0 , $self->{h};	1812	glVertex 0 , $self->{h};
1575	glVertex $self->{w}, $self->{h};	1813	glVertex $self->{w}, $self->{h};
1576	glVertex $self->{w}, 0;	1814	glVertex $self->{w}, 0;
…		…
1611	if ($sym == 13) {	1849	if ($sym == 13) {
1612	unshift @{$self->{history}},	1850	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1851	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1852	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1853	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1854	$self->_emit (activate => $txt);
1617	$self->update;	1855	$self->update;
1618		1856
1619	} elsif ($sym == CFClient::SDLK_UP) {	1857	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1858	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1859	$self->{history_saveback} = $self->get_text;
…		…
1637	} else {	1875	} else {
1638	$self->set_text ($self->{history_saveback});	1876	$self->set_text ($self->{history_saveback});
1639	}	1877	}
1640		1878
1641	} else {	1879	} else {
1642	$self->SUPER::key_down ($ev);	1880	return $self->SUPER::key_down ($ev)
		1881	}
		1882
1643	}	1883	1
1644
1645	}	1884	}
1646		1885
1647	#############################################################################	1886	#############################################################################
1648		1887
1649	package CFClient::UI::Button;	1888	package CFClient::UI::Button;
…		…
1658		1897
1659	sub new {	1898	sub new {
1660	my $class = shift;	1899	my $class = shift;
1661		1900
1662	$class->SUPER::new (	1901	$class->SUPER::new (
1663	padding => 4,	1902	padding_x => 4,
		1903	padding_y => 4,
1664	fg => [1, 1, 1],	1904	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1905	active_fg => [0, 0, 1],
1667	can_hover => 1,	1906	can_hover => 1,
1668	align => 0,	1907	align => 0,
1669	valign => 0,	1908	valign => 0,
1670	can_events => 1,	1909	can_events => 1,
1671	@_	1910	@_
1672	)	1911	)
1673	}	1912	}
1674		1913
		1914	sub activate { }
		1915
1675	sub button_up {	1916	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1917	my ($self, $ev, $x, $y) = @_;
1677		1918
		1919	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1920	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1921	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");	1922
1681	}	1923	1
1682	}	1924	}
1683		1925
1684	sub _draw {	1926	sub _draw {
1685	my ($self) = @_;	1927	my ($self) = @_;
1686		1928
1687	local $self->{fg} = $self->{fg};	1929	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1688
1689	if ($GRAB == $self) {
1690	$self->{fg} = $self->{active_fg};
1691	}
1692		1930
1693	glEnable GL_TEXTURE_2D;	1931	glEnable GL_TEXTURE_2D;
1694	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695	glColor 0, 0, 0, 1;	1933	glColor 0, 0, 0, 1;
1696		1934
…		…
1715		1953
1716	sub new {	1954	sub new {
1717	my $class = shift;	1955	my $class = shift;
1718		1956
1719	$class->SUPER::new (	1957	$class->SUPER::new (
1720	padding => 2,	1958	padding_x => 2,
		1959	padding_y => 2,
1721	fg => [1, 1, 1],	1960	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1961	active_fg => [1, 1, 0],
		1962	bg => [0, 0, 0, 0.2],
		1963	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1964	state => 0,
1724	can_hover => 1,	1965	can_hover => 1,
1725	@_	1966	@_
1726	)	1967	)
1727	}	1968	}
1728		1969
1729	sub size_request {	1970	sub size_request {
1730	my ($self) = @_;	1971	my ($self) = @_;
1731		1972
1732	($self->{padding} * 2 + 6) x 2	1973	(6) x 2
1733	}	1974	}
1734		1975
1735	sub button_down {	1976	sub button_down {
1736	my ($self, $ev, $x, $y) = @_;	1977	my ($self, $ev, $x, $y) = @_;
1737		1978
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740	$self->{state} = !$self->{state};	1981	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1982	$self->_emit (changed => $self->{state});
		1983	} else {
		1984	return 0
		1985	}
		1986
1742	}	1987	1
1743	}	1988	}
1744		1989
1745	sub _draw {	1990	sub _draw {
1746	my ($self) = @_;	1991	my ($self) = @_;
1747		1992
1748	$self->SUPER::_draw;	1993	$self->SUPER::_draw;
1749		1994
1750	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1995	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751		1996
1752	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1997	my ($w, $h) = @$self{qw(w h)};
		1998
		1999	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753		2000
1754	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2001	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755		2002
1756	my $tex = $self->{state} ? $tex[1] : $tex[0];	2003	my $tex = $self->{state} ? $tex[1] : $tex[0];
1757		2004
…		…
1912		2159
1913	my $h1 = $self->{h} * (1 - $ycut1);	2160	my $h1 = $self->{h} * (1 - $ycut1);
1914	my $h2 = $self->{h} * (1 - $ycut2);	2161	my $h2 = $self->{h} * (1 - $ycut2);
1915		2162
1916	glEnable GL_BLEND;	2163	glEnable GL_BLEND;
1917	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1918	glEnable GL_TEXTURE_2D;	2166	glEnable GL_TEXTURE_2D;
1919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920		2168
1921	glBindTexture GL_TEXTURE_2D, $t1->{name};	2169	glBindTexture GL_TEXTURE_2D, $t1->{name};
1922	glBegin GL_QUADS;	2170	glBegin GL_QUADS;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2259	qw(s1_slider.png s1_slider_bg.png);
2012		2260
2013	sub new {	2261	sub new {
2014	my $class = shift;	2262	my $class = shift;
2015		2263
2016	# range [value, low, high, page]	2264	# range [value, low, high, page, unit]
2017		2265
2018	# TODO: 0-width page	2266	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2267	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2268	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2269	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2270	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2271	active_fg => [0, 0, 0],
		2272	bg => [0, 0, 0, 0.2],
		2273	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2274	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2275	min_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2276	min_h => $::WIDTH / 80,
2027	vertical => 0,	2277	vertical => 0,
2028	can_hover => 1,	2278	can_hover => 1,
2029	inner_pad => 5,	2279	inner_pad => 0.02,
2030	@_	2280	@_
2031	);	2281	);
2032		2282
		2283	$self->set_value ($self->{range}[0]);
		2284	$self->update;
		2285
2033	$self	2286	$self
2034	}	2287	}
2035		2288
		2289	sub changed { }
		2290
		2291	sub set_range {
		2292	my ($self, $range) = @_;
		2293
		2294	($range, $self->{range}) = ($self->{range}, $range);
		2295
		2296	$self->update
		2297	if "@$range" ne "@{$self->{range}}";
		2298	}
		2299
		2300	sub set_value {
		2301	my ($self, $value) = @_;
		2302
		2303	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2304
		2305	$hi = $lo + 1 if $hi <= $lo;
		2306
		2307	$page = $hi - $lo if $page > $hi - $lo;
		2308
		2309	$value = $lo if $value < $lo;
		2310	$value = $hi - $page if $value > $hi - $page;
		2311
		2312	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2313	if $unit;
		2314
		2315	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2316
		2317	if ($value != $old_value) {
		2318	$self->_emit (changed => $value);
		2319	$self->update;
		2320	}
		2321	}
		2322
2036	sub size_request {	2323	sub size_request {
2037	my ($self) = @_;	2324	my ($self) = @_;
2038		2325
2039	my $w = $self->{req_w};	2326	($self->{req_w}, $self->{req_h})
2040	my $h = $self->{req_h};
2041
2042	$self->{vertical} ? ($h, $w) : ($w, $h)
2043	}	2327	}
2044		2328
2045	sub button_down {	2329	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2047		2331
2048	$self->SUPER::button_down ($ev, $x, $y);	2332	$self->SUPER::button_down ($ev, $x, $y);
		2333
		2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2335
2049	$self->mouse_motion ($ev, $x, $y);	2336	$self->mouse_motion ($ev, $x, $y)
2050	}	2337	}
2051		2338
2052	sub mouse_motion {	2339	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2340	my ($self, $ev, $x, $y) = @_;
2054		2341
2055	if ($GRAB == $self) {	2342	if ($GRAB == $self) {
		2343	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2344
		2345	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2346
		2347	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2348
		2349	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2350	} else {
		2351	return 0;
		2352	}
		2353
		2354	1
		2355	}
		2356
		2357	sub update {
		2358	my ($self) = @_;
		2359
		2360	delete $self->{knob_w};
		2361	$self->SUPER::update;
		2362	}
		2363
		2364	sub _draw {
		2365	my ($self) = @_;
		2366
		2367	unless ($self->{knob_w}) {
		2368	$self->set_value ($self->{range}[0]);
		2369
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2370	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2371	my $range = ($hi - $page - $lo) || 1e-100;
2057		2372
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2373	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2374
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2375	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2376	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2377
2063	$x -= $inner_pad_px; # substract the padding	2378	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2379	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2380
2069	$self->emit (changed => $x);	2381	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2382	$self->{knob_w} = $knob_w;
2071	}	2383	}
2072	}
2073
2074	# the inner_* stuff is for generating a padding for the slider handle,
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084		2384
2085	$self->SUPER::_draw ();	2385	$self->SUPER::_draw ();
2086		2386
2087	my ($w, $h) = @$self{qw(w h)};	2387	glScale $self->{w}, $self->{h};
2088		2388
2089	if ($self->{vertical}) {	2389	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2390	# draw a vertical slider like a rotated horizontal slider
2091		2391
		2392	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2393	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2394	}
2097		2395
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2396	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2397	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2398
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2401
2122	# draw background	2402	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2403	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2404
2125	# draw handle	2405	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2406	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2407
2128	glDisable GL_TEXTURE_2D;	2408	glDisable GL_TEXTURE_2D;
2129	}	2409	}
		2410
		2411	#############################################################################
		2412
		2413	package CFClient::UI::ValSlider;
		2414
		2415	our @ISA = CFClient::UI::HBox::;
		2416
		2417	sub new {
		2418	my ($class, %arg) = @_;
		2419
		2420	my $range = delete $arg{range};
		2421
		2422	my $self = $class->SUPER::new (
		2423	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2424	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2425	to_value => sub { shift },
		2426	from_value => sub { shift },
		2427	%arg,
		2428	);
		2429
		2430	$self->{slider}->connect (changed => sub {
		2431	my ($self, $value) = @_;
		2432	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2433	$self->{parent}->emit (changed => $value);
		2434	});
		2435
		2436	# $self->{entry}->connect (changed => sub {
		2437	# my ($self, $value) = @_;
		2438	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2439	# $self->{parent}->emit (changed => $value);
		2440	# });
		2441
		2442	$self->add ($self->{slider}, $self->{entry});
		2443
		2444	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2445
		2446	$self
		2447	}
		2448
		2449	sub set_range { shift->{slider}->set_range (@_) }
		2450	sub set_value { shift->{slider}->set_value (@_) }
2130		2451
2131	#############################################################################	2452	#############################################################################
2132		2453
2133	package CFClient::UI::TextView;	2454	package CFClient::UI::TextView;
2134		2455
…		…
2164		2485
2165	$self->{fontsize} = $fontsize;	2486	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2487	$self->reflow;
2167	}	2488	}
2168		2489
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2490	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2491	my ($self, $w, $h) = @_;
2190		2492
2191	$self->SUPER::size_allocate ($w, $h);	2493	$self->SUPER::size_allocate ($w, $h);
2192		2494
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2497	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2498
2197	$self->reflow;	2499	$self->reflow;
2198	}	2500	}
2199		2501
		2502	sub text_size {
		2503	my ($self, $text, $indent) = @_;
		2504
		2505	my $layout = $self->{layout};
		2506
		2507	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2508	$layout->set_width ($self->{children}[0]{w} - $indent);
		2509	$layout->set_markup ($text);
		2510
		2511	$layout->size
		2512	}
		2513
		2514	sub reflow {
		2515	my ($self) = @_;
		2516
		2517	$self->{need_reflow}++;
		2518	$self->update;
		2519	}
		2520
		2521	sub set_offset {
		2522	my ($self, $offset) = @_;
		2523
		2524	# todo: base offset on lines or so, not on pixels
		2525	$self->{children}[1]->set_value ($offset);
		2526	}
		2527
		2528	sub clear {
		2529	my ($self) = @_;
		2530
		2531	$self->{par} = [];
		2532	$self->{height} = 0;
		2533	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2534	}
		2535
2200	sub add_paragraph {	2536	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2537	my ($self, $color, $text, $indent) = @_;
2202		2538
2203	#TODO: intelligently "reformat" paragraph	2539	for my $line (split /\n/, $text) {
2204		2540	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2541	$self->{height} += $h;
		2542	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2543	}
2208		2544
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2545	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2546	}
2214		2547
2215	sub update {	2548	sub update {
2216	my ($self) = @_;	2549	my ($self) = @_;
2217		2550
…		…
2220	return unless $self->{h} > 0;	2553	return unless $self->{h} > 0;
2221		2554
2222	delete $self->{texture};	2555	delete $self->{texture};
2223		2556
2224	$ROOT->on_post_alloc ($self, sub {	2557	$ROOT->on_post_alloc ($self, sub {
		2558	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2559
2225	if (delete $self->{need_reflow}) {	2560	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2561	my $height = 0;
2227		2562
2228	$height += $_->[0] = $self->text_height ($_->[2])	2563	my $layout = $self->{layout};
		2564
		2565	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2566
2229	for @{$self->{par}};	2567	for (@{$self->{par}}) {
		2568	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2569	$layout->set_width ($W - $_->[3]);
		2570	$layout->set_markup ($_->[4]);
		2571	my ($w, $h) = $layout->size;
		2572	$_->[0] = $w + $_->[3];
		2573	$_->[1] = $h;
		2574	}
		2575
		2576	$height += $_->[1];
		2577	}
2230		2578
2231	$self->{height} = $height;	2579	$self->{height} = $height;
2232		2580
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2581	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2582
2235	delete $self->{texture};	2583	delete $self->{texture};
2236	}	2584	}
2237		2585
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2586	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2587	glClearColor 0, 0, 0, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2588	glClear GL_COLOR_BUFFER_BIT;
2241		2589
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2590	my $top = int $self->{children}[1]{range}[0];
2246		2591
2247	my $y0 = $top;	2592	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2593	my $y1 = $top + $H;
2249		2594
2250	my $y = 0;	2595	my $y = 0;
2251		2596
2252	my $layout = $self->{layout};	2597	my $layout = $self->{layout};
2253		2598
2254	$layout->set_font ($self->{font}) if $self->{font};	2599	$layout->set_font ($self->{font}) if $self->{font};
2255		2600
		2601	glEnable GL_BLEND;
		2602	#TODO# not correct in windows where rgba is forced off
		2603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2604
2256	for my $par (@{$self->{par}}) {	2605	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2606	my $h = $par->[1];
2258		2607
2259	if ($y0 < $y + $h && $y < $y1) {	2608	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2609	$layout->set_foreground (@{ $par->[2] });
		2610	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2611	$layout->set_markup ($par->[4]);
2262		2612
2263	my ($W, $H) = $layout->size;	2613	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2614
		2615	glRasterPos $par->[3], $y - $y0;
		2616	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2617	}
2266		2618
2267	$y += $h;	2619	$y += $h;
2268	}	2620	}
2269		2621
2270	glDisable GL_TEXTURE_2D;	2622	glDisable GL_BLEND;
2271	};	2623	};
2272	});	2624	});
2273	}	2625	}
2274		2626
2275	sub _draw {	2627	sub _draw {
2276	my ($self) = @_;	2628	my ($self) = @_;
2277		2629
2278	glEnable GL_TEXTURE_2D;	2630	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2631	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2632	glColor 0, 0, 0, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2634	glDisable GL_TEXTURE_2D;
2283		2635
2284	$self->{children}[1]->draw;	2636	$self->{children}[1]->draw;
2285		2637
…		…
2335		2687
2336	sub new {	2688	sub new {
2337	my $class = shift;	2689	my $class = shift;
2338		2690
2339	my $self = $class->SUPER::new (	2691	my $self = $class->SUPER::new (
2340	state => 0,	2692	state => 0,
2341	connect_activate => \&toggle_flopper,	2693	on_activate => \&toggle_flopper,
2342	@_	2694	@_
2343	);	2695	);
2344		2696
2345	if ($self->{state}) {
2346	$self->{state} = 0;
2347	$self->toggle_flopper;
2348	}
2349
2350	$self	2697	$self
2351	}	2698	}
2352		2699
2353	sub toggle_flopper {	2700	sub toggle_flopper {
2354	my ($self) = @_;	2701	my ($self) = @_;
2355		2702
2356	# TODO: use animation	2703	$self->{other}->toggle_visibility;
2357	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");
2361	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");
2364	}
2365
2366	$self->emit (changed => $self->{state});
2367	}	2704	}
2368		2705
2369	#############################################################################	2706	#############################################################################
2370		2707
2371	package CFClient::UI::Tooltip;	2708	package CFClient::UI::Tooltip;
…		…
2384	}	2721	}
2385		2722
2386	sub set_tooltip_from {	2723	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2724	my ($self, $widget) = @_;
2388		2725
		2726	my $tooltip = $widget->{tooltip};
		2727
		2728	if ($ENV{CFPLUS_DEBUG} & 2) {
		2729	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2731	. "req $widget->{req_w} $widget->{req_h}\n"
		2732	. "visible $widget->{visible}";
		2733	}
		2734
2389	$self->add (new CFClient::UI::Label	2735	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2736	markup => $tooltip,
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2738	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2739	fg => [0, 0, 0, 1],
		2740	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2741	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2742	);
2396	}	2743	}
2397		2744
2398	sub size_request {	2745	sub size_request {
2399	my ($self) = @_;	2746	my ($self) = @_;
…		…
2405		2752
2406	sub size_allocate {	2753	sub size_allocate {
2407	my ($self, $w, $h) = @_;	2754	my ($self, $w, $h) = @_;
2408		2755
2409	$self->SUPER::size_allocate ($w - 4, $h - 4);	2756	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2757	}
		2758
		2759	sub visibility_change {
		2760	my ($self, $visible) = @_;
		2761
		2762	return unless $visible;
		2763
		2764	$self->{root}->on_post_alloc ("move_$self" => sub {
		2765	my $widget = $self->{owner}
		2766	or return;
		2767
		2768	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2769
		2770	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2771	if $x + $self->{w} > $::WIDTH;
		2772
		2773	$self->move_abs ($x, $y);
		2774	});
2410	}	2775	}
2411		2776
2412	sub _draw {	2777	sub _draw {
2413	my ($self) = @_;	2778	my ($self) = @_;
2414		2779
…		…
2431	glVertex $w, $h;	2796	glVertex $w, $h;
2432	glVertex $w, 0;	2797	glVertex $w, 0;
2433	glEnd;	2798	glEnd;
2434		2799
2435	glTranslate 2 - 0.375, 2 - 0.375;	2800	glTranslate 2 - 0.375, 2 - 0.375;
		2801
2436	$self->SUPER::_draw;	2802	$self->SUPER::_draw;
2437	}	2803	}
2438		2804
2439	#############################################################################	2805	#############################################################################
2440		2806
…		…
2445	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
2446		2812
2447	sub new {	2813	sub new {
2448	my $class = shift;	2814	my $class = shift;
2449		2815
2450	$class->SUPER::new (	2816	my $self = $class->SUPER::new (
2451	aspect => 1,	2817	aspect => 1,
		2818	can_events => 0,
2452	@_,	2819	@_,
2453	)	2820	);
		2821
		2822	if ($self->{anim} && $self->{animspeed}) {
		2823	Scalar::Util::weaken (my $widget = $self);
		2824
		2825	$self->{timer} = Event->timer (
		2826	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2827	hard => 1,
		2828	interval => $self->{animspeed},
		2829	cb => sub {
		2830	++$widget->{frame};
		2831	$widget->update;
		2832	},
		2833	);
		2834	}
		2835
		2836	$self
2454	}	2837	}
2455		2838
2456	sub size_request {	2839	sub size_request {
2457	(32, 8)	2840	(32, 8)
2458	}	2841	}
2459		2842
		2843	sub update {
		2844	my ($self) = @_;
		2845
		2846	return unless $self->{visible};
		2847
		2848	$self->SUPER::update;
		2849	}
		2850
2460	sub _draw {	2851	sub _draw {
2461	my ($self) = @_;	2852	my ($self) = @_;
2462		2853
2463	return unless $::CONN;#d# manage and cache textures differently	2854	return unless $::CONN;
		2855
		2856	my $face;
		2857
		2858	if ($self->{frame}) {
		2859	my $anim = $::CONN->{anim}[$self->{anim}];
		2860
		2861	$face = $anim->[ $self->{frame} % @$anim ]
		2862	if $anim && @$anim;
		2863	}
		2864
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2866
2466	# TODO animation
2467	if ($tex) {	2867	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2868	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2870	glColor 0, 0, 0, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2872	glDisable GL_TEXTURE_2D;
2473	}	2873	}
2474	}	2874	}
2475		2875
		2876	sub DESTROY {
		2877	my ($self) = @_;
		2878
		2879	$self->{timer}->cancel
		2880	if $self->{timer};
		2881
		2882	$self->SUPER::DESTROY;
		2883	}
		2884
2476	#############################################################################	2885	#############################################################################
2477		2886
2478	package CFClient::UI::InventoryItem;	2887	package CFClient::UI::Buttonbar;
2479		2888
2480	our @ISA = CFClient::UI::HBox::;	2889	our @ISA = CFClient::UI::HBox::;
2481		2890
2482	sub new {	2891	# TODO: should actualyl wrap buttons and other goodies.
2483	my $class = shift;
2484
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (
2495	can_hover => 1,
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,
2554	);
2555
2556	$self
2557	}
2558
2559	sub set_items {
2560	my ($self, $items) = @_;
2561
2562	$self->{scrolled}->clear;
2563	return unless $items;
2564
2565	my @items = sort {
2566	($a->{type} <=> $b->{type})
2567	or ($a->{name} cmp $b->{name})
2568	} @$items;
2569
2570	$self->{real_items} = \@items;
2571
2572	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578	}
2579
2580	$self->{scrolled}->add (@items);
2581
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}
2584
2585	sub size_request {
2586	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});
2588	}
2589		2892
2590	#############################################################################	2893	#############################################################################
2591		2894
2592	package CFClient::UI::Menu;	2895	package CFClient::UI::Menu;
2593		2896
…		…
2627		2930
2628	# popup given the event (must be a mouse button down event currently)	2931	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2932	sub popup {
2630	my ($self, $ev) = @_;	2933	my ($self, $ev) = @_;
2631		2934
2632	$self->emit ("popdown");	2935	$self->_emit ("popdown");
2633		2936
2634	# maybe save $GRAB? must be careful about events...	2937	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2938	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2939	$self->{button} = $ev->{button};
2637		2940
2638	$self->show;	2941	$self->show;
2639	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640	}	2943	}
2641		2944
2642	sub mouse_motion {	2945	sub mouse_motion {
2643	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2644		2947
2645	# TODO: should use vbox->find_widget or so	2948	# TODO: should use vbox->find_widget or so
2646	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647	$self->{hover} = $self->{item}{$HOVER};	2950	$self->{hover} = $self->{item}{$HOVER};
		2951
		2952	0
2648	}	2953	}
2649		2954
2650	sub button_up {	2955	sub button_up {
2651	my ($self, $ev, $x, $y) = @_;	2956	my ($self, $ev, $x, $y) = @_;
2652		2957
2653	if ($ev->{button} == $self->{button}) {	2958	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2959	undef $GRAB;
2655	$self->hide;	2960	$self->hide;
2656		2961
2657	$self->emit ("popdown");	2962	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2963	$self->{hover}[1]->() if $self->{hover};
		2964	} else {
		2965	return 0
		2966	}
		2967
2659	}	2968	1
2660	}	2969	}
2661		2970
2662	#############################################################################	2971	#############################################################################
2663		2972
		2973	package CFClient::UI::Multiplexer;
		2974
		2975	our @ISA = CFClient::UI::Container::;
		2976
		2977	sub new {
		2978	my $class = shift;
		2979
		2980	my $self = $class->SUPER::new (
		2981	@_,
		2982	);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986
		2987	$self
		2988	}
		2989
		2990	sub add {
		2991	my ($self, @widgets) = @_;
		2992
		2993	$self->SUPER::add (@widgets);
		2994
		2995	$self->{current} = $self->{children}[0]
		2996	if @{ $self->{children} };
		2997	}
		2998
		2999	sub set_current_page {
		3000	my ($self, $page_or_widget) = @_;
		3001
		3002	my $widget = ref $page_or_widget
		3003	? $page_or_widget
		3004	: $self->{children}[$page_or_widget];
		3005
		3006	$self->{current} = $widget;
		3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3008
		3009	$self->_emit (page_changed => $self->{current});
		3010
		3011	$self->realloc;
		3012	}
		3013
		3014	sub visible_children {
		3015	$_[0]{current}
		3016	}
		3017
		3018	sub size_request {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->size_request
		3022	}
		3023
		3024	sub size_allocate {
		3025	my ($self, $w, $h) = @_;
		3026
		3027	$self->{current}->configure (0, 0, $w, $h);
		3028	}
		3029
		3030	sub _draw {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->draw;
		3034	}
		3035
		3036	#############################################################################
		3037
		3038	package CFClient::UI::Notebook;
		3039
		3040	our @ISA = CFClient::UI::VBox::;
		3041
		3042	sub new {
		3043	my $class = shift;
		3044
		3045	my $self = $class->SUPER::new (
		3046	buttonbar => (new CFClient::UI::Buttonbar),
		3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3048	# filter => # will be put between multiplexer and $self
		3049	@_,
		3050	);
		3051
		3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3053	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3054
		3055	$self
		3056	}
		3057
		3058	sub add {
		3059	my ($self, $title, $widget, $tooltip) = @_;
		3060
		3061	Scalar::Util::weaken $self;
		3062
		3063	$self->{buttonbar}->add (new CFClient::UI::Button
		3064	markup => $title,
		3065	tooltip => $tooltip,
		3066	on_activate => sub { $self->set_current_page ($widget) },
		3067	);
		3068
		3069	$self->{multiplexer}->add ($widget);
		3070	}
		3071
		3072	sub set_current_page {
		3073	my ($self, $page) = @_;
		3074
		3075	$self->{multiplexer}->set_current_page ($page);
		3076	$self->_emit (page_changed => $self->{multiplexer}{current});
		3077	}
		3078
		3079	#############################################################################
		3080
2664	package CFClient::UI::Statusbox;	3081	package CFClient::UI::Statusbox;
2665		3082
2666	our @ISA = CFClient::UI::VBox::;	3083	our @ISA = CFClient::UI::VBox::;
2667		3084
		3085	sub new {
		3086	my $class = shift;
		3087
		3088	my $self = $class->SUPER::new (
		3089	fontsize => 0.8,
		3090	@_,
		3091	);
		3092
		3093	Scalar::Util::weaken (my $this = $self);
		3094
		3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3096
		3097	$self
		3098	}
		3099
2668	sub reorder {	3100	sub reorder {
2669	my ($self) = @_;	3101	my ($self) = @_;
2670	my $NOW = time;	3102	my $NOW = Time::HiRes::time;
		3103
		3104	# freeze display when hovering over any label
		3105	return if $CFClient::UI::TOOLTIP->{owner}
		3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3107	values %{ $self->{item} };
2671		3108
2672	while (my ($k, $v) = each %{ $self->{item} }) {	3109	while (my ($k, $v) = each %{ $self->{item} }) {
2673	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674	}	3111	}
2675		3112
…		…
2678	my @items = sort {	3115	my @items = sort {
2679	$a->{pri} <=> $b->{pri}	3116	$a->{pri} <=> $b->{pri}
2680	or $b->{id} <=> $a->{id}	3117	or $b->{id} <=> $a->{id}
2681	} values %{ $self->{item} };	3118	} values %{ $self->{item} };
2682		3119
		3120	$self->{timer}->interval (1);
		3121
2683	my $count = 10 + 1;	3122	my $count = 10 + 1;
2684	for my $item (@items) {	3123	for my $item (@items) {
2685	last unless --$count;	3124	last unless --$count;
2686		3125
2687	push @widgets, $item->{label} ||= do {	3126	my $label = $item->{label} ||= do {
2688	# TODO: doesn't handle markup well (read as: at all)	3127	# TODO: doesn't handle markup well (read as: at all)
2689	my $short = $item->{count} > 1	3128	my $short = $item->{count} > 1
2690	? "<b>$item->{count} ×</b> $item->{text}"	3129	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	3130	: $item->{text};
2692		3131
2693	for ($short) {	3132	for ($short) {
2694	s/^\s+//;	3133	s/^\s+//;
2695	s/\012.*/…/s;	3134	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	3135	}
2699		3136
2700	new CFClient::UI::Label	3137	new CFClient::UI::Label
2701	markup => $short,	3138	markup => $short,
2702	tooltip => $item->{tooltip},	3139	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	3140	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	3141	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	3142	fontsize => $item->{fontsize} || $self->{fontsize},
2706	color => $item->{color},	3143	max_w => $::WIDTH * 0.44,
		3144	fg => [@{ $item->{fg} }],
2707	can_events => 1,	3145	can_events => 1,
2708	can_hover => 1	3146	can_hover => 1
2709	};	3147	};
		3148
		3149	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3150	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3151	$label->update;
		3152	$label->set_max_size (undef, $label->{req_h} * $diff)
		3153	if $diff < 1;
		3154	$self->{timer}->interval (1/30);
		3155	} else {
		3156	$label->{fg}[3] = $item->{fg}[3] || 1;
		3157	}
		3158
		3159	push @widgets, $label;
2710	}	3160	}
2711		3161
2712	$self->clear;	3162	$self->clear;
2713	$self->SUPER::add (reverse @widgets);	3163	$self->SUPER::add (reverse @widgets);
2714	}	3164	}
…		…
2717	my ($self, $text, %arg) = @_;	3167	my ($self, $text, %arg) = @_;
2718		3168
2719	$text =~ s/^\s+//;	3169	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	3170	$text =~ s/\s+$//;
2721		3171
		3172	return unless $text;
		3173
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	3174	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723		3175
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3176	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		3177
2726	if (my $item = $self->{item}{$group}) {	3178	if (my $item = $self->{item}{$group}) {
2727	if ($item->{text} eq $text) {	3179	if ($item->{text} eq $text) {
…		…
2737	$self->{item}{$group} = {	3189	$self->{item}{$group} = {
2738	id => ++$self->{id},	3190	id => ++$self->{id},
2739	text => $text,	3191	text => $text,
2740	timeout => $timeout,	3192	timeout => $timeout,
2741	tooltip => $text,	3193	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	3194	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	3195	pri => 0,
2745	count => 1,	3196	count => 1,
2746	%arg,	3197	%arg,
2747	};	3198	};
2748	}	3199	}
2749		3200
2750	$self->reorder;	3201	$self->reorder;
2751	}	3202	}
2752		3203
		3204	sub reconfigure {
		3205	my ($self) = @_;
		3206
		3207	delete $_->{label}
		3208	for values %{ $self->{item} || {} };
		3209
		3210	$self->reorder;
		3211	$self->SUPER::reconfigure;
		3212	}
		3213
		3214	sub DESTROY {
		3215	my ($self) = @_;
		3216
		3217	$self->{timer}->cancel;
		3218
		3219	$self->SUPER::DESTROY;
		3220	}
		3221
2753	#############################################################################	3222	#############################################################################
2754		3223
2755	package CFClient::UI::Root;	3224	package CFClient::UI::Inventory;
2756		3225
2757	our @ISA = CFClient::UI::Container::;	3226	our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759	use CFClient::OpenGL;
2760		3227
2761	sub new {	3228	sub new {
2762	my $class = shift;	3229	my $class = shift;
2763		3230
2764	$class->SUPER::new (	3231	my $self = $class->SUPER::new (
		3232	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3233	@_,
		3234	);
		3235
		3236	$self
		3237	}
		3238
		3239	sub set_items {
		3240	my ($self, $items) = @_;
		3241
		3242	$self->{child}->clear;
		3243	return unless $items;
		3244
		3245	my @items = sort {
		3246	($a->{type} <=> $b->{type})
		3247	or ($a->{name} cmp $b->{name})
		3248	} @$items;
		3249
		3250	$self->{real_items} = \@items;
		3251
		3252	my $row = 0;
		3253	for my $item (@items) {
		3254	CFClient::Item::update_widgets $item;
		3255
		3256	$self->{child}->add (0, $row, $item->{face_widget});
		3257	$self->{child}->add (1, $row, $item->{desc_widget});
		3258	$self->{child}->add (2, $row, $item->{weight_widget});
		3259
		3260	$row++;
		3261	}
		3262	}
		3263
		3264	#############################################################################
		3265
		3266	package CFClient::UI::BindEditor;
		3267
		3268	our @ISA = CFClient::UI::FancyFrame::;
		3269
		3270	sub new {
		3271	my $class = shift;
		3272
		3273	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3274
		3275	$self->add (my $vb = new CFClient::UI::VBox);
		3276
		3277
		3278	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3279	text => "start recording",
		3280	tooltip => "Start/Stops recording of actions."
		3281	."All subsequent actions after the recording started will be captured."
		3282	."The actions are displayed after the record was stopped."
		3283	."To bind the action you have to click on the 'Bind' button",
		3284	on_activate => sub {
		3285	unless ($self->{recording}) {
		3286	$self->start;
		3287	} else {
		3288	$self->stop;
		3289	}
		3290	});
		3291
		3292	$vb->add (new CFClient::UI::Label text => "Actions:");
		3293	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3294
		3295	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3296	$vb->add (my $hb = new CFClient::UI::HBox);
		3297	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "bind",
		3300	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3301	on_activate => sub {
		3302	$self->ask_for_bind;
		3303	});
		3304
		3305	$vb->add (my $hb = new CFClient::UI::HBox);
		3306	$hb->add (new CFClient::UI::Button
		3307	text => "ok",
		3308	expand => 1,
		3309	tooltip => "This closes the binding editor and saves the binding",
		3310	on_activate => sub {
		3311	$self->hide;
		3312	$self->commit;
		3313	});
		3314
		3315	$hb->add (new CFClient::UI::Button
		3316	text => "cancel",
		3317	expand => 1,
		3318	tooltip => "This closes the binding editor without saving",
		3319	on_activate => sub {
		3320	$self->hide;
		3321	$self->{binding_cancel}->()
		3322	if $self->{binding_cancel};
		3323	});
		3324
		3325	$self->update_binding_widgets;
		3326
		3327	$self
		3328	}
		3329
		3330	sub commit {
		3331	my ($self) = @_;
		3332	my ($mod, $sym, $cmds) = $self->get_binding;
		3333	if ($sym != 0 && @$cmds > 0) {
		3334	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3335	."'. Don't forget 'Save Config'!");
		3336	$self->{binding_change}->($mod, $sym, $cmds)
		3337	if $self->{binding_change};
		3338	} else {
		3339	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3340	$self->{binding_cancel}->()
		3341	if $self->{binding_cancel};
		3342	}
		3343	}
		3344
		3345	sub start {
		3346	my ($self) = @_;
		3347
		3348	$self->{rec_btn}->set_text ("stop recording");
		3349	$self->{recording} = 1;
		3350	$self->clear_command_list;
		3351	$::CONN->start_record if $::CONN;
		3352	}
		3353
		3354	sub stop {
		3355	my ($self) = @_;
		3356
		3357	$self->{rec_btn}->set_text ("start recording");
		3358	$self->{recording} = 0;
		3359
		3360	my $rec;
		3361	$rec = $::CONN->stop_record if $::CONN;
		3362	return unless ref $rec eq 'ARRAY';
		3363	$self->set_command_list ($rec);
		3364	}
		3365
		3366
		3367	sub ask_for_bind_and_commit {
		3368	my ($self) = @_;
		3369	$self->ask_for_bind (1);
		3370	}
		3371
		3372	sub ask_for_bind {
		3373	my ($self, $commit) = @_;
		3374
		3375	CFClient::Binder::open_binding_dialog (sub {
		3376	my ($mod, $sym) = @_;
		3377	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3378	$self->update_binding_widgets;
		3379	$self->commit if $commit;
		3380	});
		3381	}
		3382
		3383	# $mod and $sym are the modifiers and key symbol
		3384	# $cmds is a array ref of strings (the commands)
		3385	# $cb is the callback that is executed on OK
		3386	# $ccb is the callback that is executed on CANCEL and
		3387	# when the binding was unsuccessful on OK
		3388	sub set_binding {
		3389	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3390
		3391	$self->clear_command_list;
		3392	$self->{recording} = 0;
		3393	$self->{rec_btn}->set_text ("start recording");
		3394
		3395	$self->{binding} = [$mod, $sym];
		3396	$self->{commands} = $cmds;
		3397
		3398	$self->{binding_change} = $cb;
		3399	$self->{binding_cancel} = $ccb;
		3400
		3401	$self->update_binding_widgets;
		3402	}
		3403
		3404	# this is a shortcut method that asks for a binding
		3405	# and then just binds it.
		3406	sub do_quick_binding {
		3407	my ($self, $cmds) = @_;
		3408	$self->set_binding (undef, undef, $cmds, sub {
		3409	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3410	});
		3411	$self->ask_for_bind (1);
		3412	}
		3413
		3414	sub update_binding_widgets {
		3415	my ($self) = @_;
		3416	my ($mod, $sym, $cmds) = $self->get_binding;
		3417	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3418	$self->set_command_list ($cmds);
		3419	}
		3420
		3421	sub get_binding {
		3422	my ($self) = @_;
		3423	return (
		3424	$self->{binding}->[0],
		3425	$self->{binding}->[1],
		3426	[ grep { defined $_ } @{$self->{commands}} ]
		3427	);
		3428	}
		3429
		3430	sub clear_command_list {
		3431	my ($self) = @_;
		3432	$self->{cmdbox}->clear ();
		3433	}
		3434
		3435	sub set_command_list {
		3436	my ($self, $cmds) = @_;
		3437
		3438	$self->{cmdbox}->clear ();
		3439	$self->{commands} = $cmds;
		3440
		3441	my $idx = 0;
		3442
		3443	for (@$cmds) {
		3444	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3445
		3446	my $i = $idx;
		3447	$hb->add (new CFClient::UI::Label text => $_);
		3448	$hb->add (new CFClient::UI::Button
		3449	text => "delete",
		3450	tooltip => "Deletes the action from the record",
		3451	on_activate => sub {
		3452	$self->{cmdbox}->remove ($hb);
		3453	$cmds->[$i] = undef;
		3454	});
		3455
		3456
		3457	$idx++
		3458	}
		3459	}
		3460
		3461	#############################################################################
		3462
		3463	package CFClient::UI::SpellList;
		3464
		3465	our @ISA = CFClient::UI::Table::;
		3466
		3467	sub new {
		3468	my $class = shift;
		3469
		3470	my $self = $class->SUPER::new (
		3471	binding => [],
		3472	commands => [],
2765	@_,	3473	@_,
2766	)	3474	)
2767	}	3475	}
2768		3476
2769	sub configure {	3477	# XXX: Do sorting? Argl...
2770	my ($self, $x, $y, $w, $h) = @_;	3478	sub add_spell {
2771
2772	$self->{w} = $w;
2773	$self->{h} = $h;
2774	}
2775
2776	sub check_size {
2777	my ($self) = @_;	3479	my ($self, $spell) = @_;
		3480	$self->{spells}->{$spell->{name}} = $spell;
2778		3481
2779	$self->size_allocate ($self->{w}, $self->{h})	3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2780	if $self->{w};	3483	face => $spell->{face},
		3484	can_hover => 1,
		3485	can_events => 1,
		3486	tooltip => $spell->{message});
		3487
		3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3489	text => $spell->{name},
		3490	can_hover => 1,
		3491	can_events => 1,
		3492	tooltip => $spell->{message},
		3493	expand => 1);
		3494
		3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3497	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3498	expand => 1);
		3499
		3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3501	text => "bind to key",
		3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3503	}
		3504
		3505	sub rebuild_spell_list {
		3506	my ($self) = @_;
		3507	$self->{tbl_idx} = 0;
		3508	$self->add_spell ($_) for values %{$self->{spells}};
		3509	}
		3510
		3511	sub remove_spell {
		3512	my ($self, $spell) = @_;
		3513	delete $self->{spells}->{$spell->{name}};
		3514	$self->rebuild_spell_list;
		3515	}
		3516
		3517	#############################################################################
		3518
		3519	package CFClient::UI::Root;
		3520
		3521	our @ISA = CFClient::UI::Container::;
		3522
		3523	use List::Util qw(min max);
		3524
		3525	use CFClient::OpenGL;
		3526
		3527	sub new {
		3528	my $class = shift;
		3529
		3530	my $self = $class->SUPER::new (
		3531	visible => 1,
		3532	@_,
		3533	);
		3534
		3535	Scalar::Util::weaken ($self->{root} = $self);
		3536
		3537	$self
2781	}	3538	}
2782		3539
2783	sub size_request {	3540	sub size_request {
2784	my ($self) = @_;	3541	my ($self) = @_;
2785		3542
2786	($self->{w}, $self->{h})	3543	($self->{w}, $self->{h})
		3544	}
		3545
		3546	sub _to_pixel {
		3547	my ($coord, $size, $max) = @_;
		3548
		3549	$coord =
		3550	$coord eq "center" ? ($max - $size) * 0.5
		3551	: $coord eq "max" ? $max
		3552	: $coord;
		3553
		3554	$coord = 0 if $coord < 0;
		3555	$coord = $max - $size if $coord > $max - $size;
		3556
		3557	int $coord + 0.5
2787	}	3558	}
2788		3559
2789	sub size_allocate {	3560	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3561	my ($self, $w, $h) = @_;
2791		3562
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	3563	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3565
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3566	$X = $child->{force_x} if exists $child->{force_x};
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3567	$Y = $child->{force_y} if exists $child->{force_y};
		3568
		3569	$X = _to_pixel $X, $W, $self->{w};
		3570	$Y = _to_pixel $Y, $H, $self->{h};
		3571
2803	$child->configure ($X, $Y, $W, $H);	3572	$child->configure ($X, $Y, $W, $H);
2804	}	3573	}
2805	}	3574	}
2806		3575
2807	sub coord2local {	3576	sub coord2local {
…		…
2817	}	3586	}
2818		3587
2819	sub update {	3588	sub update {
2820	my ($self) = @_;	3589	my ($self) = @_;
2821		3590
2822	$self->check_size;
2823	$::WANT_REFRESH++;	3591	$::WANT_REFRESH++;
2824	}	3592	}
2825		3593
2826	sub add {	3594	sub add {
2827	my ($self, @children) = @_;	3595	my ($self, @children) = @_;
2828		3596
2829	for my $child (@children) {
2830	$child->{toplevel} = 1;	3597	$_->{is_toplevel} = 1
2831		3598	for @children;
2832	# integerise window positions
2833	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};
2835	}
2836		3599
2837	$self->SUPER::add (@children);	3600	$self->SUPER::add (@children);
		3601	}
		3602
		3603	sub remove {
		3604	my ($self, @children) = @_;
		3605
		3606	$self->SUPER::remove (@children);
		3607
		3608	delete $self->{is_toplevel}
		3609	for @children;
		3610
		3611	while (@children) {
		3612	my $w = pop @children;
		3613	push @children, $w->children;
		3614	$w->set_invisible;
		3615	}
2838	}	3616	}
2839		3617
2840	sub on_refresh {	3618	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3619	my ($self, $id, $cb) = @_;
2842		3620
…		…
2855	while ($self->{refresh_hook}) {	3633	while ($self->{refresh_hook}) {
2856	$_->()	3634	$_->()
2857	for values %{delete $self->{refresh_hook}};	3635	for values %{delete $self->{refresh_hook}};
2858	}	3636	}
2859		3637
2860	if ($self->{check_size}) {	3638	if ($self->{realloc}) {
2861	my @queue = ([], []);	3639	my %queue;
		3640	my @queue;
		3641	my $widget;
2862		3642
2863	for (;;) {	3643	outer:
2864	if ($self->{check_size}) {	3644	while () {
2865	# heuristic: check containers last	3645	if (my $realloc = delete $self->{realloc}) {
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3646	for $widget (values %$realloc) {
2867	for values %{delete $self->{check_size}}	3647	$widget->{visible} or next; # do not resize invisible widgets
		3648
		3649	$queue{$widget+0}++ and next; # duplicates are common
		3650
		3651	push @{ $queue[$widget->{visible}] }, $widget;
		3652	}
2868	}	3653	}
2869		3654
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3655	while () {
		3656	@queue or last outer;
2871		3657
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3658	$widget = pop @{ $queue[-1] || [] }
2873	? @$widget{qw(user_w user_h)}	3659	and last;
2874	: $widget->size_request;
2875
2876	if (delete $widget->{force_alloc}
2877	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879		3660
		3661	pop @queue;
		3662	}
		3663
		3664	delete $queue{$widget+0};
		3665
		3666	my ($w, $h) = $widget->size_request;
		3667
		3668	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3669	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3670
		3671	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3672	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3673
		3674	$w = $widget->{force_w} if exists $widget->{force_w};
		3675	$h = $widget->{force_h} if exists $widget->{force_h};
		3676
		3677	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3678	|| delete $widget->{force_realloc}) {
2880	$widget->{req_w} = $w;	3679	$widget->{req_w} = $w;
2881	$widget->{req_h} = $h;	3680	$widget->{req_h} = $h;
2882		3681
2883	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3682	$self->{size_alloc}{$widget+0} = $widget;
2884		3683
2885	$widget->{parent}->check_size
2886	if $widget->{parent};	3684	if (my $parent = $widget->{parent}) {
		3685	$self->{realloc}{$parent+0} = $parent
		3686	unless $queue{$parent+0};
		3687
		3688	$parent->{force_size_alloc} = 1;
		3689	$self->{size_alloc}{$parent+0} = $parent;
		3690	}
2887	}	3691	}
		3692
		3693	delete $self->{realloc}{$widget+0};
2888	}	3694	}
2889	}	3695	}
2890		3696
2891	while ($self->{size_alloc}) {	3697	while (my $size_alloc = delete $self->{size_alloc}) {
2892	for (values %{delete $self->{size_alloc}}) {	3698	my @queue = sort { $b->{visible} <=> $a->{visible} }
2893	my ($widget, $w, $h) = @$_;	3699	values %$size_alloc;
		3700
		3701	while () {
		3702	my $widget = pop @queue || last;
		3703
		3704	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894		3705
2895	$w = 0 if $w < 0;	3706	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3707	$h = 0 if $h < 0;
2897		3708
		3709	$w = int $w + 0.5;
		3710	$h = int $h + 0.5;
		3711
		3712	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3713	$widget->{old_w} = $widget->{w};
		3714	$widget->{old_h} = $widget->{h};
		3715
2898	$widget->{w} = $w;	3716	$widget->{w} = $w;
2899	$widget->{h} = $h;	3717	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);	3718
2901	$widget->emit (size_allocate => $w, $h);	3719	$widget->emit (size_allocate => $w, $h);
		3720	}
2902	}	3721	}
2903	}	3722	}
2904		3723
2905	while ($self->{post_alloc_hook}) {	3724	while ($self->{post_alloc_hook}) {
2906	$_->()	3725	$_->()
2907	for values %{delete $self->{post_alloc_hook}};	3726	for values %{delete $self->{post_alloc_hook}};
2908	}	3727	}
2909		3728
		3729
2910	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3730	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3731	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3732	glClear GL_COLOR_BUFFER_BIT;
2913		3733
2914	glMatrixMode GL_PROJECTION;	3734	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3735	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3737	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3738	glLoadIdentity;
2919		3739
		3740	{
		3741	package CFClient::UI::Base;
		3742
		3743	($draw_x, $draw_y, $draw_w, $draw_h) =
		3744	(0, 0, $self->{w}, $self->{h});
		3745	}
		3746
2920	$self->_draw;	3747	$self->_draw;
2921	}	3748	}
2922		3749
2923	#############################################################################	3750	#############################################################################
2924		3751
2925	package CFClient::UI;	3752	package CFClient::UI;
2926		3753
2927	$ROOT = new CFClient::UI::Root;	3754	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3755	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3756
2930	1	3757	1
2931		3758

Diff Legend

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