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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

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

Diff Legend

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