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

Diff Legend

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