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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	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
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	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);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	$self->{root} = $parent->{root};
464	$self->{visible} = $parent->{visible};
465
466	# TODO: req_w _does_change after ->reconfigure
467	$self->check_size
468	unless exists $self->{req_w};
469
470	$self->show;
471	}
472
473	sub check_size {
474	my ($self, $forced) = @_;
475
476	$self->{force_alloc} = 1 if $forced;
477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
478	}
479
480	sub update {
481	my ($self) = @_;
482
483	$self->{parent}->update
484	if $self->{parent};
485	}
486
487	sub connect {
488	my ($self, $signal, $cb) = @_;
489
490	push @{ $self->{signal_cb}{$signal} }, $cb;
491	}
492
493	sub _emit {
494	my ($self, $signal, @args) = @_;
495
496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497	}
498
499	sub emit {
500	my ($self, $signal, @args) = @_;
501
502	$self->_emit ($signal, @args)
503	|| $self->$signal (@args);
504	}
505
506	sub DESTROY {	592	sub DESTROY {
507	my ($self) = @_;	593	my ($self) = @_;
508		594
509	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
510	#$self->deactivate;	596	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
568	}	654	}
569		655
570	sub size_request {	656	sub size_request {
571	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
572	}	660	}
573		661
574	sub draw { }	662	sub draw { }
575		663
576	#############################################################################	664	#############################################################################
…		…
580	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
581		669
582	sub new {	670	sub new {
583	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
584		672
585	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
586		674
587	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
588	children => [],	676	children => [],
589	can_events => 0,	677	can_events => 0,
590	%arg,	678	%arg,
591	);	679	);
		680
592	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
593		683
594	$self	684	$self
595	}	685	}
596		686
597	sub add {	687	sub add {
…		…
605	$self->{children} = [	695	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
608	];	698	];
609		699
610	$self->check_size (1);	700	$self->realloc;
611	$self->update;
612	}	701	}
613		702
614	sub children {	703	sub children {
615	@{ $_[0]{children} }	704	@{ $_[0]{children} }
616	}	705	}
…		…
621	delete $child->{parent};	710	delete $child->{parent};
622	$child->hide;	711	$child->hide;
623		712
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		714
626	$self->check_size (1);	715	$self->realloc;
627	$self->update;
628	}	716	}
629		717
630	sub clear {	718	sub clear {
631	my ($self) = @_;	719	my ($self) = @_;
632		720
…		…
636	for (@$children) {	724	for (@$children) {
637	delete $_->{parent};	725	delete $_->{parent};
638	$_->hide;	726	$_->hide;
639	}	727	}
640		728
641	$self->check_size;	729	$self->realloc;
642	$self->update;
643	}	730	}
644		731
645	sub find_widget {	732	sub find_widget {
646	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
647		734
648	$x -= $self->{x};	735	$x -= $self->{x};
649	$y -= $self->{y};	736	$y -= $self->{y};
650		737
651	my $res;	738	my $res;
652		739
653	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
654	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
655	and return $res;	742	and return $res;
656	}	743	}
657		744
658	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
734	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
735	$self->update;	822	$self->update;
736	}	823	}
737		824
738	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
739	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
740	}	829	}
741		830
742	sub render_child {	831	sub render_child {
743	my ($self) = @_;	832	my ($self) = @_;
744		833
745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
747	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
748		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
749	$self->_render;	845	$self->_render;
750	};	846	};
751	}	847	}
752		848
753	sub _draw {	849	sub _draw {
754	my ($self) = @_;	850	my ($self) = @_;
755		851
756	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
757		853
758	my $tex = $self->{texture}	854	my $tex = $self->{texture}
759	or return;	855	or return;
760		856
761	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
784	}	880	}
785		881
786	sub size_request {	882	sub size_request {
787	my ($self) = @_;	883	my ($self) = @_;
788		884
789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790		886
791	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
792	}	891	}
793		892
794	sub size_allocate {	893	sub size_allocate {
795	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
796		895
		896	my $child = $self->child;
		897
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799		900
800	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
801	$self->update;	902	$self->update;
802	}	903	}
803		904
…		…
839	}	940	}
840		941
841	sub _render {	942	sub _render {
842	my ($self) = @_;	943	my ($self) = @_;
843		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
844	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845		949
846	$self->SUPER::_render;	950	$self->SUPER::_render;
847	}	951	}
848		952
…		…
856	my $class = shift;	960	my $class = shift;
857		961
858	my $self;	962	my $self;
859		963
860	my $slider = new CFClient::UI::Slider	964	my $slider = new CFClient::UI::Slider
861	vertical => 1,	965	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	966	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	967	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	968	$self->{vp}->set_offset (0, $_[1]);
865	},	969	},
866	;	970	;
867		971
868	$self = $class->SUPER::new (	972	$self = $class->SUPER::new (
…		…
946		1050
947	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
948		1052
949	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
950		1054
951	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
952	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954		1062
955	sub new {	1063	sub new {
956	my $class = shift;	1064	my ($class, %arg) = @_;
957		1065
958	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
959		1067
960	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
961	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
962	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
963	border => 0.6,	1071	border => 0.6,
964	is_toplevel => 1,
965	can_events => 1,	1072	can_events => 1,
966	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
967	);	1076	);
968		1077
969	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
970	align => 0,	1079	align => 0,
971	valign => 1,	1080	valign => 1,
972	text => $self->{title},	1081	text => $title,
973	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
974		1084
975	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
976	}	1093	}
977		1094
978	sub border {	1095	sub border {
979	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
980	}	1097	}
981		1098
982	sub size_request {	1099	sub size_request {
983	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
984		1104
985	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
986		1106
987	(	1107	(
988	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
991	}	1111	}
992		1112
993	sub size_allocate {	1113	sub size_allocate {
994	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
995		1115
		1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
		1121
		1122	my $border = $self->border;
		1123
996	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
997	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
998		1126
999	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000	if $self->{title};
1001
1002	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1003	}	1128	}
1004		1129
1005	sub button_down {	1130	sub button_down {
1006	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1007		1132
…		…
1023	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1024		1149
1025	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1026	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1027		1152
1028	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1155
		1156	$self->realloc;
1030	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031	$self->check_size;
1032	};	1158	};
1033		1159
1034	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1035	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1038	$self->{motion} = sub {	1164	$self->{motion} = sub {
1039	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1040		1166
1041	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1042		1168
1043	$self->move ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044	$self->update;
1045	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1046	}	1175	1
1047	}	1176	}
1048		1177
1049	sub button_up {	1178	sub button_up {
1050	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1051		1180
1052	delete $self->{motion};	1181	!!delete $self->{motion}
1053	}	1182	}
1054		1183
1055	sub mouse_motion {	1184	sub mouse_motion {
1056	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1057		1186
1058	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1059	}	1190	}
1060		1191
1061	sub _draw {	1192	sub _draw {
1062	my ($self) = @_;	1193	my ($self) = @_;
1063		1194
		1195	my $child = $self->{children}[0];
		1196
1064	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1065	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1066		1199
1067	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069		1202
1070	my $border = $self->border;	1203	my $border = $self->border;
1071		1204
1072	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1073	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1074	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077		1210
1078	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1080		1213
1081	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1082	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1083	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1084
1085	glColor @{ $self->{bg} };
1086
1087	$bg->{s} = $rep_x;
1088	$bg->{t} = $rep_y;
1089	$bg->{wrap_mode} = 1;
1090	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091	}	1219	}
1092		1220
1093	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1094		1222
1095	$self->{title}->draw if $self->{title};
1096
1097	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1098	}	1229	}
1099		1230
1100	#############################################################################	1231	#############################################################################
1101		1232
1102	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1124	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1125		1256
1126	$child->set_parent ($self);	1257	$child->set_parent ($self);
1127	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1128		1259
1129	$self->check_size (1);	1260	$self->realloc;
1130	}	1261	}
1131		1262
1132	# TODO: move to container class maybe? send children a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1133	sub clear {	1264	sub clear {
1134	my ($self) = @_;	1265	my ($self) = @_;
…		…
1139	for (@children) {	1270	for (@children) {
1140	delete $_->{parent};	1271	delete $_->{parent};
1141	$_->hide;	1272	$_->hide;
1142	}	1273	}
1143		1274
1144	$self->check_size (1);	1275	$self->realloc;
1145	$self->update;
1146	}	1276	}
1147		1277
1148	sub get_wh {	1278	sub get_wh {
1149	my ($self) = @_;	1279	my ($self) = @_;
1150		1280
…		…
1246	}	1376	}
1247	}	1377	}
1248		1378
1249	#############################################################################	1379	#############################################################################
1250		1380
1251	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1252
1253	# TODO: wrap into common Box base class
1254		1382
1255	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1256		1384
1257	sub size_request {	1385	sub size_request {
1258	my ($self) = @_;	1386	my ($self) = @_;
1259		1387
1260	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1261		1389	? (
1262	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1263	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264	(List::Util::max map $_->[1], @alloc),	1392	)
1265	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1266	}	1397	}
1267		1398
1268	sub size_allocate {	1399	sub size_allocate {
1269	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1270		1401
1271	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1272
1273	my $children = $self->{children};	1403	my $children = $self->{children};
1274		1404
1275	my @h = map $_->{req_w}, @$children;	1405	my @req;
1276		1406
1277	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1278		1408	@req = ($space / (@$children || 1)) x @$children;
1279	if ($req_h > $h) {
1280	# ah well, not enough space
1281	$_ *= $h / $req_h for @h;
1282	} else {	1409	} else {
		1410	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1411	my $req = List::Util::sum @req;
		1412
		1413	if ($req > $space) {
		1414	# ah well, not enough space
		1415	$_ *= $space / $req for @req;
		1416	} else {
1283	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284	$exp ||= 1;
1285		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1286	for (0 .. $#$children) {	1422	for 0 .. $#$children;
1287	my $child = $children->[$_];
1288
1289	my $alloc_h = $h[$_];
1290	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291	$h[$_] = $alloc_h;
1292	}	1423	}
1293	}	1424	}
1294		1425
1295	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1296		1427
1297	my $y = 0;	1428	my $pos = 0;
1298	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1299	my $child = $children->[$_];
1300	my $h = $h[$_];	1430	my $alloc = $req[$_];
1301	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302		1432
1303	$y += $h;	1433	$pos += $alloc;
1304	}	1434	}
1305		1435
1306	1	1436	1
1307	}	1437	}
1308		1438
1309	#############################################################################	1439	#############################################################################
1310		1440
		1441	package CFClient::UI::HBox;
		1442
		1443	our @ISA = CFClient::UI::Box::;
		1444
		1445	sub new {
		1446	my $class = shift;
		1447
		1448	$class->SUPER::new (
		1449	vertical => 0,
		1450	@_,
		1451	)
		1452	}
		1453
		1454	#############################################################################
		1455
1311	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1312		1457
1313	# TODO: wrap into common Box base class
1314
1315	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1316		1459
1317	sub size_request {	1460	sub new {
1318	my ($self) = @_;	1461	my $class = shift;
1319		1462
1320	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1321		1464	vertical => 1,
1322	(	1465	@_,
1323	(List::Util::max map $_->[0], @alloc),
1324	(List::Util::sum map $_->[1], @alloc),
1325	)	1466	)
1326	}
1327
1328	sub size_allocate {
1329	my ($self, $w, $h) = @_;
1330
1331	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333	my $children = $self->{children};
1334
1335	my @h = map $_->{req_h}, @$children;
1336
1337	my $req_h = List::Util::sum @h;
1338
1339	if ($req_h > $h) {
1340	# ah well, not enough space
1341	$_ *= $h / $req_h for @h;
1342	} else {
1343	my $exp = List::Util::sum map $_->{expand}, @$children;
1344	$exp ||= 1;
1345
1346	for (0 .. $#$children) {
1347	my $child = $children->[$_];
1348
1349	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350	}
1351	}
1352
1353	CFClient::UI::harmonize \@h;
1354
1355	my $y = 0;
1356	for (0 .. $#$children) {
1357	my $child = $children->[$_];
1358	my $h = $h[$_];
1359	$child->configure (0, $y, $w, $h);
1360
1361	$y += $h;
1362	}
1363
1364	1
1365	}	1467	}
1366		1468
1367	#############################################################################	1469	#############################################################################
1368		1470
1369	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1386	ellipsise => 3, # end	1488	ellipsise => 3, # end
1387	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1388	fontsize => 1,	1490	fontsize => 1,
1389	align => -1,	1491	align => -1,
1390	valign => -1,	1492	valign => -1,
1391	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1392	can_events => 0,	1495	can_events => 0,
1393	%arg	1496	%arg
1394	);	1497	);
1395		1498
1396	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1432	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1433		1536
1434	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1436		1539
		1540	$self->realloc;
1437	$self->update;	1541	$self->update;
1438	$self->check_size;
1439	}	1542	}
1440		1543
1441	sub set_markup {	1544	sub set_markup {
1442	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1443		1546
…		…
1447	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448		1551
1449	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1451		1554
		1555	$self->realloc;
1452	$self->update;	1556	$self->update;
1453	$self->check_size;
1454	}	1557	}
1455		1558
1456	sub size_request {	1559	sub size_request {
1457	my ($self) = @_;	1560	my ($self) = @_;
1458		1561
…		…
1472		1575
1473	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1474	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1475	}	1578	}
1476		1579
1477	(	1580	($w, $h)
1478	$w + $self->{padding} * 2,
1479	$h + $self->{padding} * 2,
1480	)
1481	}	1581	}
1482		1582
1483	sub size_allocate {	1583	sub size_allocate {
1484	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1485		1585
		1586	delete $self->{ox};
		1587
1486	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487	}	1590	}
1488		1591
1489	sub set_fontsize {	1592	sub set_fontsize {
1490	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1491		1594
1492	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1493	delete $self->{texture};	1596	delete $self->{texture};
1494		1597
1495	$self->update;	1598	$self->realloc;
1496	$self->check_size;
1497	}	1599	}
1498		1600
1499	sub _draw {	1601	sub _draw {
1500	my ($self) = @_;	1602	my ($self) = @_;
1501		1603
…		…
1507	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1508	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1613
1512	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1513		1616
		1617	unless (exists $self->{ox}) {
1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1517		1621
1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1521
1522	$tex
1523	};	1625	};
1524		1626
1525	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1526	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527		1629
…		…
1581	sub set_text {	1683	sub set_text {
1582	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1583		1685
1584	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1585	$self->_set_text ($text);	1687	$self->_set_text ($text);
1586	$self->update;	1688
1587	$self->check_size;	1689	$self->realloc;
1588	}	1690	}
1589		1691
1590	sub get_text {	1692	sub get_text {
1591	$_[0]{text}	1693	$_[0]{text}
1592	}	1694	}
…		…
1622	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1623	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1624	$self->_emit ('escape');	1726	$self->_emit ('escape');
1625	} elsif ($uni) {	1727	} elsif ($uni) {
1626	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1627	}	1731	}
1628		1732
1629	$self->_set_text ($text);	1733	$self->_set_text ($text);
1630	$self->update;	1734
1631	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1632	}	1738	}
1633		1739
1634	sub focus_in {	1740	sub focus_in {
1635	my ($self) = @_;	1741	my ($self) = @_;
1636		1742
…		…
1651	utf8::encode $text;	1757	utf8::encode $text;
1652	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1653		1759
1654	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1655	$self->update;	1761	$self->update;
		1762
		1763	1
1656	}	1764	}
1657		1765
1658	sub mouse_motion {	1766	sub mouse_motion {
1659	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1660	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1661	}	1771	}
1662		1772
1663	sub _draw {	1773	sub _draw {
1664	my ($self) = @_;	1774	my ($self) = @_;
1665		1775
…		…
1742	} else {	1852	} else {
1743	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1744	}	1854	}
1745		1855
1746	} else {	1856	} else {
1747	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1748	}	1860	1
1749
1750	}	1861	}
1751		1862
1752	#############################################################################	1863	#############################################################################
1753		1864
1754	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1763		1874
1764	sub new {	1875	sub new {
1765	my $class = shift;	1876	my $class = shift;
1766		1877
1767	$class->SUPER::new (	1878	$class->SUPER::new (
1768	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1769	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1770	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1771	can_hover => 1,	1883	can_hover => 1,
1772	align => 0,	1884	align => 0,
1773	valign => 0,	1885	valign => 0,
…		…
1782	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1783		1895
1784	$self->emit ("activate")	1896	$self->emit ("activate")
1785	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1786	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1787	}	1901	}
1788		1902
1789	sub _draw {	1903	sub _draw {
1790	my ($self) = @_;	1904	my ($self) = @_;
1791		1905
…		…
1820		1934
1821	sub new {	1935	sub new {
1822	my $class = shift;	1936	my $class = shift;
1823		1937
1824	$class->SUPER::new (	1938	$class->SUPER::new (
1825	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1826	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1827	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1828	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1829	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1830	state => 0,	1945	state => 0,
…		…
1834	}	1949	}
1835		1950
1836	sub size_request {	1951	sub size_request {
1837	my ($self) = @_;	1952	my ($self) = @_;
1838		1953
1839	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1840	}	1955	}
1841		1956
1842	sub button_down {	1957	sub button_down {
1843	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1844		1959
1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1848	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1849	}	1968	1
1850	}	1969	}
1851		1970
1852	sub _draw {	1971	sub _draw {
1853	my ($self) = @_;	1972	my ($self) = @_;
1854		1973
1855	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1856		1975
1857	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858		1977
1859	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860		1981
1861	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862		1983
1863	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1864		1985
…		…
2129	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2130	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2131	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2132	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2133	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2134	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2135	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2136	vertical => 0,	2257	vertical => 0,
2137	can_hover => 1,	2258	can_hover => 1,
2138	inner_pad => 0.02,	2259	inner_pad => 0.02,
2139	@_	2260	@_
2140	);	2261	);
…		…
2143	$self->update;	2264	$self->update;
2144		2265
2145	$self	2266	$self
2146	}	2267	}
2147		2268
		2269	sub changed { }
		2270
2148	sub set_range {	2271	sub set_range {
2149	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2150		2273
2151	($range, $self->{range}) = ($self->{range}, $range);	2274	($range, $self->{range}) = ($self->{range}, $range);
2152		2275
…		…
2178	}	2301	}
2179		2302
2180	sub size_request {	2303	sub size_request {
2181	my ($self) = @_;	2304	my ($self) = @_;
2182		2305
2183	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2184	my $h = $self->{req_h};
2185
2186	$self->{vertical} ? ($h, $w) : ($w, $h)
2187	}	2307	}
2188		2308
2189	sub button_down {	2309	sub button_down {
2190	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2191		2311
2192	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2193		2313
2194	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195		2315
2196	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2197	}	2317	}
2198		2318
2199	sub mouse_motion {	2319	sub mouse_motion {
2200	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2201		2321
…		…
2205	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2206		2326
2207	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208		2328
2209	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2210	}	2334	1
2211	}	2335	}
2212		2336
2213	sub update {	2337	sub update {
2214	my ($self) = @_;	2338	my ($self) = @_;
2215		2339
…		…
2542		2666
2543	sub new {	2667	sub new {
2544	my $class = shift;	2668	my $class = shift;
2545		2669
2546	my $self = $class->SUPER::new (	2670	my $self = $class->SUPER::new (
2547	state => 0,	2671	state => 0,
2548	connect_activate => \&toggle_flopper,	2672	on_activate => \&toggle_flopper,
2549	@_	2673	@_
2550	);	2674	);
2551		2675
2552	if ($self->{state}) {
2553	$self->{state} = 0;
2554	$self->toggle_flopper;
2555	}
2556
2557	$self	2676	$self
2558	}	2677	}
2559		2678
2560	sub toggle_flopper {	2679	sub toggle_flopper {
2561	my ($self) = @_;	2680	my ($self) = @_;
2562		2681
2563	# TODO: use animation	2682	$self->{other}->toggle_visibility;
2564	if ($self->{state} = !$self->{state}) {
2565	$CFClient::UI::ROOT->add ($self->{other});
2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2567	$self->_emit ("open");
2568	} else {
2569	$CFClient::UI::ROOT->remove ($self->{other});
2570	$self->_emit ("close");
2571	}
2572
2573	$self->_emit (changed => $self->{state});
2574	}	2683	}
2575		2684
2576	#############################################################################	2685	#############################################################################
2577		2686
2578	package CFClient::UI::Tooltip;	2687	package CFClient::UI::Tooltip;
…		…
2591	}	2700	}
2592		2701
2593	sub set_tooltip_from {	2702	sub set_tooltip_from {
2594	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2595		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2596	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2597	markup => $widget->{tooltip},	2715	markup => $tooltip,
2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599	fontsize => 0.8,	2717	fontsize => 0.8,
2600	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2601	ellipsise => 0,	2719	ellipsise => 0,
2602	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2613		2731
2614	sub size_allocate {	2732	sub size_allocate {
2615	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2616		2734
2617	$self->SUPER::size_allocate ($w - 4, $h - 4);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2618	}	2754	}
2619		2755
2620	sub _draw {	2756	sub _draw {
2621	my ($self) = @_;	2757	my ($self) = @_;
2622		2758
…		…
2639	glVertex $w, $h;	2775	glVertex $w, $h;
2640	glVertex $w, 0;	2776	glVertex $w, 0;
2641	glEnd;	2777	glEnd;
2642		2778
2643	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2644	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2645	}	2782	}
2646		2783
2647	#############################################################################	2784	#############################################################################
2648		2785
…		…
2724	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2725	}	2862	}
2726		2863
2727	#############################################################################	2864	#############################################################################
2728		2865
2729	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2730		2867
2731	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2732		2869
2733	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2734	my $class = shift;
2735
2736	my $self = $class->SUPER::new (
2737	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738	@_,
2739	);
2740
2741	$self
2742	}
2743
2744	sub set_items {
2745	my ($self, $items) = @_;
2746
2747	$self->{scrolled}->clear;
2748	return unless $items;
2749
2750	my @items = sort {
2751	($a->{type} <=> $b->{type})
2752	or ($a->{name} cmp $b->{name})
2753	} @$items;
2754
2755	$self->{real_items} = \@items;
2756
2757	my $row = 0;
2758	for my $item (@items) {
2759	CFClient::Item::update_widgets $item;
2760
2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765	$row++;
2766	}
2767	}
2768
2769	sub size_request {
2770	my ($self) = @_;
2771	($self->{req_w}, $self->{req_h});
2772	}
2773		2871
2774	#############################################################################	2872	#############################################################################
2775		2873
2776	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2777		2875
…		…
2818	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2819	$GRAB = $self;	2917	$GRAB = $self;
2820	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2821		2919
2822	$self->show;	2920	$self->show;
2823	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824	}	2922	}
2825		2923
2826	sub mouse_motion {	2924	sub mouse_motion {
2827	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2828		2926
2829	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2830	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2832	}	2932	}
2833		2933
2834	sub button_up {	2934	sub button_up {
2835	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2836		2936
…		…
2838	undef $GRAB;	2938	undef $GRAB;
2839	$self->hide;	2939	$self->hide;
2840		2940
2841	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2842	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2843	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2844	}	3054	}
2845		3055
2846	#############################################################################	3056	#############################################################################
2847		3057
2848	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2953	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2954	}	3164	}
2955		3165
2956	#############################################################################	3166	#############################################################################
2957		3167
2958	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
2959		3169
2960	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962	use CFClient::OpenGL;
2963		3171
2964	sub new {	3172	sub new {
2965	my $class = shift;	3173	my $class = shift;
2966		3174
2967	$class->SUPER::new (	3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
2968	@_,	3418	@_,
2969	)	3419	)
2970	}	3420	}
2971		3421
2972	sub configure {	3422	# XXX: Do sorting? Argl...
2973	my ($self, $x, $y, $w, $h) = @_;	3423	sub add_spell {
2974
2975	$self->{w} = $w;
2976	$self->{h} = $h;
2977	}
2978
2979	sub check_size {
2980	my ($self) = @_;	3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
2981		3426
2982	$self->size_allocate ($self->{w}, $self->{h})	3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983	if $self->{w};	3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
		3464	package CFClient::UI::Root;
		3465
		3466	our @ISA = CFClient::UI::Container::;
		3467
		3468	use CFClient::OpenGL;
		3469
		3470	sub new {
		3471	my $class = shift;
		3472
		3473	my $self = $class->SUPER::new (
		3474	visible => 1,
		3475	@_,
		3476	);
		3477
		3478	Scalar::Util::weaken ($self->{root} = $self);
		3479
		3480	$self
2984	}	3481	}
2985		3482
2986	sub size_request {	3483	sub size_request {
2987	my ($self) = @_;	3484	my ($self) = @_;
2988		3485
2989	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
		3487	}
		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
2990	}	3501	}
2991		3502
2992	sub size_allocate {	3503	sub size_allocate {
2993	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
2994		3505
2995	for my $child ($self->children) {	3506	for my $child ($self->children) {
2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997		3508
2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
2999	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3000		3511
3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3002	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
3003
3004	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006		3514
3007	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3008	}	3516	}
3009	}	3517	}
3010		3518
…		…
3021	}	3529	}
3022		3530
3023	sub update {	3531	sub update {
3024	my ($self) = @_;	3532	my ($self) = @_;
3025		3533
3026	$self->check_size;
3027	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3028	}	3535	}
3029		3536
3030	sub add {	3537	sub add {
3031	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3032		3539
3033	for (my @widgets = @children; my $w = pop @widgets; ) {
3034	push @widgets, $w->children;
3035	$w->{root} = $self;
3036	$w->{visible} = 1;
3037	}
3038
3039	for my $child (@children) {
3040	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3041		3541	for @children;
3042	# integerise window positions
3043	$child->{x} = int $child->{x};
3044	$child->{y} = int $child->{y};
3045	}
3046		3542
3047	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3048	}	3544	}
3049		3545
3050	sub remove {	3546	sub remove {
3051	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3052		3548
3053	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3054		3553
3055	while (@children) {	3554	while (@children) {
3056	my $w = pop @children;	3555	my $w = pop @children;
3057	push @children, $w->children;	3556	push @children, $w->children;
3058	$w->set_invisible;	3557	$w->set_invisible;
…		…
3077	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3078	$_->()	3577	$_->()
3079	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3080	}	3579	}
3081		3580
3082	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
3083	my @queue = ([], []);	3582	my %queue;
		3583	my @queue;
		3584	my $widget;
3084		3585
3085	for (;;) {	3586	outer:
3086	if ($self->{check_size}) {	3587	while () {
3087	# heuristic: check containers last	3588	if (my $realloc = delete $self->{realloc}) {
3088	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3589	for $widget (values %$realloc) {
3089	for values %{delete $self->{check_size}}	3590	$widget->{visible} or next; # do not resize invisible widgets
		3591
		3592	$queue{$widget+0}++ and next; # duplicates are common
		3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3090	}	3596	}
3091		3597
3092	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3598	while () {
		3599	@queue or last outer;
3093		3600
3094	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3601	$widget = pop @{ $queue[-1] || [] }
3095	? @$widget{qw(user_w user_h)}	3602	and last;
3096	: $widget->size_request;
3097
3098	if (delete $widget->{force_alloc}
3099	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3102	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3103	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3104		3621
3105	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3106		3623
3107	$widget->{parent}->check_size
3108	if $widget->{parent};	3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
3109	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3110	}	3634	}
3111	}	3635	}
3112		3636
3113	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3114	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3115	my ($widget, $w, $h) = @$_;	3639	values %$size_alloc;
		3640
		3641	while () {
		3642	my $widget = pop @queue || last;
		3643
		3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116		3645
3117	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3118	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3119		3648
		3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3120	$widget->{w} = $w;	3656	$widget->{w} = $w;
3121	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3122	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3123	}	3661	}
3124	}	3662	}
3125		3663
3126	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3127	$_->()	3665	$_->()
3128	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3129	}	3667	}
		3668
3130		3669
3131	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3134		3673
…		…
3136	glLoadIdentity;	3675	glLoadIdentity;
3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3139	glLoadIdentity;	3678	glLoadIdentity;
3140		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3141	$self->_draw;	3687	$self->_draw;
3142	}	3688	}
3143		3689
3144	#############################################################################	3690	#############################################################################
3145		3691

Diff Legend

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