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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

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

Diff Legend

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