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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->realloc;
61	}	61	}
62		62
63	return;	63	return;
64	}	64	}
65	}	65	}
…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	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
176	$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.]+$/;
177	$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};
178	$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};
179	$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.]+$/;
180	$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};
181	$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};
		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
182	}	189	}
183	}	190	}
184		191
185	reconfigure_widgets;	192	reconfigure_widgets;
186	}	193	}
…		…
195		202
196	sub new {	203	sub new {
197	my $class = shift;	204	my $class = shift;
198		205
199	my $self = bless {	206	my $self = bless {
200	x => 0,	207	x => "center",
201	y => 0,	208	y => "center",
202	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
203	can_events => 1,	212	can_events => 1,
204	@_	213	@_
205	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206		217
207	for (keys %$self) {	218	for (keys %$self) {
208	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
209	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
210	}	221	}
211	}	222	}
212		223
213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
220	}	234	}
221		235
222	$self	236	$self
223	}	237	}
224		238
…		…
235	return if $self->{parent};	249	return if $self->{parent};
236		250
237	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
238	}	252	}
239		253
240	sub center {
241	my ($self) = @_;
242
243	$CFClient::UI::ROOT->on_post_alloc (
244	"center_$self" => sub {
245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246	},
247	);
248
249	$self->update;
250	}
251
252	sub set_visible {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
254		256
255	return if $self->{visible};	257	return if $self->{visible};
256		258
257	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
258	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
259		261
260	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
261		263
262	$self->realloc unless exists $self->{req_w};	264	$self->realloc if !exists $self->{req_w};
263		265
264	$_->set_visible for $self->children;	266	$_->set_visible for $self->children;
265	}	267	}
266		268
267	sub set_invisible {	269	sub set_invisible {
…		…
309		311
310	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
311	if $self->{parent};	313	if $self->{parent};
312	}	314	}
313		315
314	sub move {	316	sub move_abs {
315	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
316		318
317	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
318	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
319	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
320		322
321	$self->update;	323	$self->update;
322	}	324	}
323		325
324	sub set_size {	326	sub set_size {
325	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
326		328
327	$self->{def_w} = $w;	329	$self->{force_w} = $w;
328	$self->{def_h} = $h;	330	$self->{force_h} = $h;
329		331
330	$self->realloc;	332	$self->realloc;
331	}	333	}
332		334
333	sub size_request {	335	sub size_request {
…		…
337		339
338	sub configure {	340	sub configure {
339	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
340		342
341	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
342	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
343	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
344		348
345	# use alignment to adjust x, y	349	# use alignment to adjust x, y
346		350
347	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
348	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
349
350	($w, $h) = ($w2, $h2);
351	}	353	}
352		354
353	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
354	$self->{x} = $x;	356	$self->{x} = $x;
355	$self->{y} = $y;	357	$self->{y} = $y;
356	$self->update;	358	$self->update;
357	}	359	}
358		360
359	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360	return unless $self->{visible};	362	return unless $self->{visible};
361		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
363	}	368	}
364	}	369	}
365		370
366	sub size_allocate {	371	sub size_allocate {
367	# nothing to be done	372	# nothing to be done
368	}	373	}
369		374
370	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
371	}	381	}
372		382
373	sub set_max_size {	383	sub set_max_size {
374	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
375		385
…		…
434		444
435	$::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
436	unless $FOCUS;	446	unless $FOCUS;
437	}	447	}
438		448
439	sub mouse_motion { }	449	sub mouse_motion { 0 }
440	sub button_up { }	450	sub button_up { 0 }
441	sub key_down { }	451	sub key_down { 0 }
442	sub key_up { }	452	sub key_up { 0 }
443		453
444	sub button_down {	454	sub button_down {
445	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
446		456
447	$self->focus_in;	457	$self->focus_in;
448	}
449		458
450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455		461
456	sub find_widget {	462	sub find_widget {
457	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
458		464
459	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
467		473
468	sub set_parent {	474	sub set_parent {
469	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
470		476
471	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
472
473	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
474
475	$self->realloc;
476	}	479	}
477		480
478	sub connect {	481	sub connect {
479	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
480		483
…		…
499	}	502	}
500		503
501	sub realloc {	504	sub realloc {
502	my ($self) = @_;	505	my ($self) = @_;
503		506
504	return unless $self->{visible};	507	if ($self->{visible}) {
505
506	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
507		509
508	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
509	$self->{root}->update;	511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
510	}	516	}
511		517
512	sub update {	518	sub update {
513	my ($self) = @_;	519	my ($self) = @_;
514		520
515	$self->{parent}->update	521	$self->{parent}->update
516	if $self->{parent};	522	if $self->{parent};
517	}	523	}
518		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
		535
519	sub draw {	536	sub draw {
520	my ($self) = @_;	537	my ($self) = @_;
521		538
522	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);
523		550
524	glPushMatrix;	551	glPushMatrix;
525	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
526	$self->_draw;	553	$self->_draw;
527	glPopMatrix;	554	glPopMatrix;
…		…
539	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
540	glEnd;	567	glEnd;
541	glDisable GL_BLEND;	568	glDisable GL_BLEND;
542	}	569	}
543		570
544	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
545	glPushMatrix;	572	glPushMatrix;
546	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
548	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
549	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
625	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
626	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
627	}	654	}
628		655
629	sub size_request {	656	sub size_request {
630	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
631	}	660	}
632		661
633	sub draw { }	662	sub draw { }
634		663
635	#############################################################################	664	#############################################################################
…		…
639	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
640		669
641	sub new {	670	sub new {
642	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
643		672
644	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
645		674
646	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
647	children => [],	676	children => [],
648	can_events => 0,	677	can_events => 0,
649	%arg,	678	%arg,
650	);	679	);
		680
651	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
652		683
653	$self	684	$self
654	}	685	}
655		686
656	sub add {	687	sub add {
…		…
704	$x -= $self->{x};	735	$x -= $self->{x};
705	$y -= $self->{y};	736	$y -= $self->{y};
706		737
707	my $res;	738	my $res;
708		739
709	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
710	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
711	and return $res;	742	and return $res;
712	}	743	}
713		744
714	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
756	sub size_request {	787	sub size_request {
757	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
758	}	789	}
759		790
760	sub size_allocate {	791	sub size_allocate {
761	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
762		793
763	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
764	}	795	}
765		796
766	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
767		800
768	package CFClient::UI::Window;	801	package CFClient::UI::Window;
769		802
770	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
771		804
…		…
783	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
784	$self->SUPER::update;	817	$self->SUPER::update;
785	}	818	}
786		819
787	sub size_allocate {	820	sub size_allocate {
788	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
789		822
790	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
791	$self->update	824	$self->update;
792	if $changed;
793	}	825	}
794		826
795	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
796	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
797	}	831	}
798		832
799	sub render_child {	833	sub render_child {
800	my ($self) = @_;	834	my ($self) = @_;
801		835
802	$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 {
803	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
805		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
806	$self->_render;	847	$self->_render;
807	};	848	};
808	}	849	}
809		850
810	sub _draw {	851	sub _draw {
811	my ($self) = @_;	852	my ($self) = @_;
812		853
813	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
814		855
815	my $tex = $self->{texture}	856	my $tex = $self->{texture}
816	or return;	857	or return;
817		858
818	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
841	}	882	}
842		883
843	sub size_request {	884	sub size_request {
844	my ($self) = @_;	885	my ($self) = @_;
845		886
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		888
848	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
850		891
851	($w, $h)	892	($w, $h)
852	}	893	}
853		894
854	sub size_allocate {	895	sub size_allocate {
855	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
856		897
		898	my $child = $self->child;
		899
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		902
860	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
861	$self->update;	904	$self->update;
862	}	905	}
863		906
…		…
899	}	942	}
900		943
901	sub _render {	944	sub _render {
902	my ($self) = @_;	945	my ($self) = @_;
903		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
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		951
906	$self->SUPER::_render;	952	$self->SUPER::_render;
907	}	953	}
908		954
…		…
911	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
912		958
913	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
914		960
915	sub new {	961	sub new {
916	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
917		965
918	my $self;	966	my $self;
919		967
920	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
921	vertical => 1,	969	vertical => 1,
…		…
926	;	974	;
927		975
928	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
930	slider => $slider,	978	slider => $slider,
931	@_,	979	%arg,
932	);	980	);
933		981
934	$self->{vp}->add ($self->{scrolled});
935	$self->add ($self->{vp});
936	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
937		984
938	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
939	}	992	}
940		993
941	sub update {	994	sub update {
942	my ($self) = @_;	995	my ($self) = @_;
943		996
…		…
947	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1002	}
950		1003
951	sub size_allocate {	1004	sub size_allocate {
952	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
953		1006
954	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
955		1008
956	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1011	}
959		1012
…		…
1006		1059
1007	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
1008		1061
1009	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1010		1063
1011	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 =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	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);
1014		1071
1015	sub new {	1072	sub new {
1016	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1017		1076
1018	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1080	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1081	can_events => 1,
1024	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1025	);	1085	);
1026		1086
1027	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1088	align => 0,
1029	valign => 1,	1089	valign => 1,
1030	text => $self->{title},	1090	text => $title,
1031	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1032		1093
1033	$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};
1034	}	1102	}
1035		1103
1036	sub border {	1104	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1038	}	1106	}
1039		1107
1040	sub size_request {	1108	sub size_request {
1041	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1042		1113
1043	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1044		1115
1045	(	1116	(
1046	$w + $self->border * 2,	1117	$w + $self->border * 2,
1047	$h + $self->border * 2,	1118	$h + $self->border * 2,
1048	)	1119	)
1049	}	1120	}
1050		1121
1051	sub size_allocate {	1122	sub size_allocate {
1052	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1053		1124
1054	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1055		1130
		1131	my $border = $self->border;
		1132
1056	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1057	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1058		1135
1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060	if $self->{title};
1061
1062	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1063	}	1137	}
1064		1138
1065	sub button_down {	1139	sub button_down {
1066	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1067		1141
…		…
1083	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1084		1158
1085	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1086	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1087		1161
1088	$self->{user_x} = $wx + $dx * $mx;
1089	$self->{user_y} = $wy + $dy * $my;
1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092	$self->move ($self->{user_x}, $self->{user_y});	1164
		1165	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093	$self->realloc;	1166	$self->realloc;
1094	};	1167	};
1095		1168
1096	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1100	$self->{motion} = sub {	1173	$self->{motion} = sub {
1101	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1102		1175
1103	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1104		1177
1105	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106	$self->{user_y} = $by + $y - $oy;	1179	# HACK: the next line is required to enforce placement
1107		1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108	$self->move ($self->{user_x}, $self->{user_y});
1109	$self->realloc;
1110	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1111	}	1186	1
1112	}	1187	}
1113		1188
1114	sub button_up {	1189	sub button_up {
1115	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1116		1191
1117	delete $self->{motion};	1192	!!delete $self->{motion}
1118	}	1193	}
1119		1194
1120	sub mouse_motion {	1195	sub mouse_motion {
1121	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1122		1197
1123	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1124	}	1201	}
1125		1202
1126	sub _draw {	1203	sub _draw {
1127	my ($self) = @_;	1204	my ($self) = @_;
1128		1205
		1206	my $child = $self->{children}[0];
		1207
1129	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1130	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1131		1210
1132	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1133	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134		1213
1135	my $border = $self->border;	1214	my $border = $self->border;
1136		1215
1137	glColor @{ $self->{border_bg} };	1216	glColor @{ $self->{border_bg} };
1138	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1217	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1139	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1218	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1219	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1220	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142		1221
1143	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1222	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144	my $bg = $tex[0];	1223	glColor @{ $self->{bg} };
1145		1224
1146	# TODO: repeat texture not scale	1225	# TODO: repeat texture not scale
		1226	# solve this better(?)
1147	my $rep_x = $cw / $bg->{w};	1227	$bg->{s} = $cw / $bg->{w};
1148	my $rep_y = $ch / $bg->{h};	1228	$bg->{t} = $ch / $bg->{h};
1149
1150	glColor @{ $self->{bg} };
1151
1152	$bg->{s} = $rep_x;
1153	$bg->{t} = $rep_y;
1154	$bg->{wrap_mode} = 1;
1155	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156	}	1230	}
1157		1231
1158	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1159		1233
1160	$self->{title}->draw if $self->{title};
1161
1162	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1163	}	1240	}
1164		1241
1165	#############################################################################	1242	#############################################################################
1166		1243
1167	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1241	(sum @$hs),	1318	(sum @$hs),
1242	)	1319	)
1243	}	1320	}
1244		1321
1245	sub size_allocate {	1322	sub size_allocate {
1246	my ($self, $w, $h, $changed) = @_;	1323	my ($self, $w, $h) = @_;
1247		1324
1248	my ($ws, $hs) = $self->get_wh;	1325	my ($ws, $hs) = $self->get_wh;
1249		1326
1250	my $req_w = (sum @$ws) || 1;	1327	my $req_w = (sum @$ws) || 1;
1251	my $req_h = (sum @$hs) || 1;	1328	my $req_h = (sum @$hs) || 1;
…		…
1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1330	)	1407	)
1331	}	1408	}
1332		1409
1333	sub size_allocate {	1410	sub size_allocate {
1334	my ($self, $w, $h, $changed) = @_;	1411	my ($self, $w, $h) = @_;
1335		1412
1336	my $space = $self->{vertical} ? $h : $w;	1413	my $space = $self->{vertical} ? $h : $w;
1337	my $children = $self->{children};	1414	my $children = $self->{children};
1338		1415
1339	my @req;	1416	my @req;
…		…
1422	ellipsise => 3, # end	1499	ellipsise => 3, # end
1423	layout => (new CFClient::Layout),	1500	layout => (new CFClient::Layout),
1424	fontsize => 1,	1501	fontsize => 1,
1425	align => -1,	1502	align => -1,
1426	valign => -1,	1503	valign => -1,
1427	padding => 2,	1504	padding_x => 2,
		1505	padding_y => 2,
1428	can_events => 0,	1506	can_events => 0,
1429	%arg	1507	%arg
1430	);	1508	);
1431		1509
1432	if (exists $self->{template}) {	1510	if (exists $self->{template}) {
…		…
1469		1547
1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1548	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471	$self->{layout}->set_text ($text);	1549	$self->{layout}->set_text ($text);
1472		1550
1473	$self->realloc;	1551	$self->realloc;
		1552	$self->update;
1474	}	1553	}
1475		1554
1476	sub set_markup {	1555	sub set_markup {
1477	my ($self, $markup) = @_;	1556	my ($self, $markup) = @_;
1478		1557
…		…
1483		1562
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1563	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1564	$self->{layout}->set_markup ($markup);
1486		1565
1487	$self->realloc;	1566	$self->realloc;
		1567	$self->update;
1488	}	1568	}
1489		1569
1490	sub size_request {	1570	sub size_request {
1491	my ($self) = @_;	1571	my ($self) = @_;
1492		1572
…		…
1506		1586
1507	$w = List::Util::max $w, $w2;	1587	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1588	$h = List::Util::max $h, $h2;
1509	}	1589	}
1510		1590
1511	(	1591	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1592	}
1516		1593
1517	sub size_allocate {	1594	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1595	my ($self, $w, $h) = @_;
		1596
		1597	delete $self->{ox};
1519		1598
1520	delete $self->{texture}	1599	delete $self->{texture}
1521	if $changed;	1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1601	}
1523		1602
1524	sub set_fontsize {	1603	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1526		1605
…		…
1541	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1624
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1547		1627
		1628	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1551		1632
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1636	};
1558		1637
1559	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1640
…		…
1599		1678
1600	delete $self->{cur_h};	1679	delete $self->{cur_h};
1601		1680
1602	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1603		1682
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1684	$self->{text} = $text;
1608		1685
1609	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1611		1688
1612	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1613	}	1691	}
1614		1692
1615	sub set_text {	1693	sub set_text {
1616	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1617		1695
…		…
1656	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1736	$self->_emit ('escape');
1659	} elsif ($uni) {	1737	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1661	}	1741	}
1662		1742
1663	$self->_set_text ($text);	1743	$self->_set_text ($text);
1664		1744
1665	$self->realloc;	1745	$self->realloc;
		1746
		1747	1
1666	}	1748	}
1667		1749
1668	sub focus_in {	1750	sub focus_in {
1669	my ($self) = @_;	1751	my ($self) = @_;
1670		1752
…		…
1685	utf8::encode $text;	1767	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1687		1769
1688	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1689	$self->update;	1771	$self->update;
		1772
		1773	1
1690	}	1774	}
1691		1775
1692	sub mouse_motion {	1776	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1695	}	1781	}
1696		1782
1697	sub _draw {	1783	sub _draw {
1698	my ($self) = @_;	1784	my ($self) = @_;
1699		1785
…		…
1776	} else {	1862	} else {
1777	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1778	}	1864	}
1779		1865
1780	} else {	1866	} else {
1781	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1782	}	1870	1
1783
1784	}	1871	}
1785		1872
1786	#############################################################################	1873	#############################################################################
1787		1874
1788	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1797		1884
1798	sub new {	1885	sub new {
1799	my $class = shift;	1886	my $class = shift;
1800		1887
1801	$class->SUPER::new (	1888	$class->SUPER::new (
1802	padding => 4,	1889	padding_x => 4,
		1890	padding_y => 4,
1803	fg => [1, 1, 1],	1891	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1892	active_fg => [0, 0, 1],
1805	can_hover => 1,	1893	can_hover => 1,
1806	align => 0,	1894	align => 0,
1807	valign => 0,	1895	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1817		1905
1818	$self->emit ("activate")	1906	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1821	}	1911	}
1822		1912
1823	sub _draw {	1913	sub _draw {
1824	my ($self) = @_;	1914	my ($self) = @_;
1825		1915
…		…
1854		1944
1855	sub new {	1945	sub new {
1856	my $class = shift;	1946	my $class = shift;
1857		1947
1858	$class->SUPER::new (	1948	$class->SUPER::new (
1859	padding => 2,	1949	padding_x => 2,
		1950	padding_y => 2,
1860	fg => [1, 1, 1],	1951	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1952	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1953	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1954	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1955	state => 0,
…		…
1868	}	1959	}
1869		1960
1870	sub size_request {	1961	sub size_request {
1871	my ($self) = @_;	1962	my ($self) = @_;
1872		1963
1873	($self->{padding} * 2 + 6) x 2	1964	(6) x 2
1874	}	1965	}
1875		1966
1876	sub button_down {	1967	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1968	my ($self, $ev, $x, $y) = @_;
1878		1969
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1883	}	1978	1
1884	}	1979	}
1885		1980
1886	sub _draw {	1981	sub _draw {
1887	my ($self) = @_;	1982	my ($self) = @_;
1888		1983
1889	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
1890		1985
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1986	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1987
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1988	my ($w, $h) = @$self{qw(w h)};
		1989
		1990	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1991
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1992	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1993
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1994	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1995
…		…
2163	fg => [1, 1, 1],	2260	fg => [1, 1, 1],
2164	active_fg => [0, 0, 0],	2261	active_fg => [0, 0, 0],
2165	bg => [0, 0, 0, 0.2],	2262	bg => [0, 0, 0, 0.2],
2166	active_bg => [1, 1, 1, 0.5],	2263	active_bg => [1, 1, 1, 0.5],
2167	range => [0, 0, 100, 10, 0],	2264	range => [0, 0, 100, 10, 0],
2168	req_w => $::WIDTH / 80,	2265	min_w => $::WIDTH / 80,
2169	req_h => $::WIDTH / 80,	2266	min_h => $::WIDTH / 80,
2170	vertical => 0,	2267	vertical => 0,
2171	can_hover => 1,	2268	can_hover => 1,
2172	inner_pad => 0.02,	2269	inner_pad => 0.02,
2173	@_	2270	@_
2174	);	2271	);
…		…
2214	}	2311	}
2215		2312
2216	sub size_request {	2313	sub size_request {
2217	my ($self) = @_;	2314	my ($self) = @_;
2218		2315
2219	my $w = $self->{req_w};	2316	($self->{req_w}, $self->{req_h})
2220	my $h = $self->{req_h};
2221
2222	$self->{vertical} ? ($h, $w) : ($w, $h)
2223	}	2317	}
2224		2318
2225	sub button_down {	2319	sub button_down {
2226	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2227		2321
2228	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2229		2323
2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231		2325
2232	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2233	}	2327	}
2234		2328
2235	sub mouse_motion {	2329	sub mouse_motion {
2236	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2237		2331
…		…
2241	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2242		2336
2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244		2338
2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2246	}	2344	1
2247	}	2345	}
2248		2346
2249	sub update {	2347	sub update {
2250	my ($self) = @_;	2348	my ($self) = @_;
2251		2349
2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2253	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2254		2359
2255	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2256	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2257		2362
…		…
2263	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2264	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2265		2370
2266	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2267	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2268	});	2373	}
2269
2270	$self->SUPER::update;
2271	}
2272
2273	sub _draw {
2274	my ($self) = @_;
2275		2374
2276	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2277		2376
2278	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2279		2378
…		…
2377	$self->{fontsize} = $fontsize;	2476	$self->{fontsize} = $fontsize;
2378	$self->reflow;	2477	$self->reflow;
2379	}	2478	}
2380		2479
2381	sub size_allocate {	2480	sub size_allocate {
2382	my ($self, $w, $h, $changed) = @_;	2481	my ($self, $w, $h) = @_;
2383		2482
2384	$self->SUPER::size_allocate ($w, $h, $changed);	2483	$self->SUPER::size_allocate ($w, $h);
2385
2386	return unless $changed;
2387		2484
2388	$self->{layout}->set_font ($self->{font}) if $self->{font};	2485	$self->{layout}->set_font ($self->{font}) if $self->{font};
2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2486	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390	$self->{layout}->set_width ($self->{children}[0]{w});	2487	$self->{layout}->set_width ($self->{children}[0]{w});
2391		2488
…		…
2614	}	2711	}
2615		2712
2616	sub set_tooltip_from {	2713	sub set_tooltip_from {
2617	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2618		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2619	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2620	markup => $widget->{tooltip},	2726	markup => $tooltip,
2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622	fontsize => 0.8,	2728	fontsize => 0.8,
2623	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2624	ellipsise => 0,	2730	ellipsise => 0,
2625	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2739
2634	($w + 4, $h + 4)	2740	($w + 4, $h + 4)
2635	}	2741	}
2636		2742
2637	sub size_allocate {	2743	sub size_allocate {
2638	my ($self, $w, $h, $changed) = @_;	2744	my ($self, $w, $h) = @_;
2639		2745
2640	return unless $changed;
2641
2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2747	}
		2748
		2749	sub visibility_change {
		2750	my ($self, $visible) = @_;
		2751
		2752	return unless $visible;
		2753
		2754	$self->{root}->on_post_alloc ("move_$self" => sub {
		2755	my $widget = $self->{owner}
		2756	or return;
		2757
		2758	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2759
		2760	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2761	if $x + $self->{w} > $::WIDTH;
		2762
		2763	$self->move_abs ($x, $y);
		2764	});
2643	}	2765	}
2644		2766
2645	sub _draw {	2767	sub _draw {
2646	my ($self) = @_;	2768	my ($self) = @_;
2647		2769
…		…
2664	glVertex $w, $h;	2786	glVertex $w, $h;
2665	glVertex $w, 0;	2787	glVertex $w, 0;
2666	glEnd;	2788	glEnd;
2667		2789
2668	glTranslate 2 - 0.375, 2 - 0.375;	2790	glTranslate 2 - 0.375, 2 - 0.375;
		2791
2669	$self->SUPER::_draw;	2792	$self->SUPER::_draw;
2670	}	2793	}
2671		2794
2672	#############################################################################	2795	#############################################################################
2673		2796
…		…
2749	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2750	}	2873	}
2751		2874
2752	#############################################################################	2875	#############################################################################
2753		2876
2754	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2755		2878
2756	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2757		2880
2758	sub new {	2881	# TODO: should actualyl wrap buttons and other goodies.
2759	my $class = shift;
2760
2761	my $self = $class->SUPER::new (
2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763	@_,
2764	);
2765
2766	$self
2767	}
2768
2769	sub set_items {
2770	my ($self, $items) = @_;
2771
2772	$self->{scrolled}->clear;
2773	return unless $items;
2774
2775	my @items = sort {
2776	($a->{type} <=> $b->{type})
2777	or ($a->{name} cmp $b->{name})
2778	} @$items;
2779
2780	$self->{real_items} = \@items;
2781
2782	my $row = 0;
2783	for my $item (@items) {
2784	CFClient::Item::update_widgets $item;
2785
2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790	$row++;
2791	}
2792	}
2793		2882
2794	#############################################################################	2883	#############################################################################
2795		2884
2796	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2797		2886
…		…
2838	# maybe save $GRAB? must be careful about events...	2927	# maybe save $GRAB? must be careful about events...
2839	$GRAB = $self;	2928	$GRAB = $self;
2840	$self->{button} = $ev->{button};	2929	$self->{button} = $ev->{button};
2841		2930
2842	$self->show;	2931	$self->show;
2843	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2932	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844	}	2933	}
2845		2934
2846	sub mouse_motion {	2935	sub mouse_motion {
2847	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2848		2937
2849	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2852	}	2943	}
2853		2944
2854	sub button_up {	2945	sub button_up {
2855	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2856		2947
…		…
2858	undef $GRAB;	2949	undef $GRAB;
2859	$self->hide;	2950	$self->hide;
2860		2951
2861	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2862	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2863	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2864	}	3067	}
2865		3068
2866	#############################################################################	3069	#############################################################################
2867		3070
2868	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2973	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2974	}	3177	}
2975		3178
2976	#############################################################################	3179	#############################################################################
2977		3180
		3181	package CFClient::UI::Inventory;
		3182
		3183	our @ISA = CFClient::UI::ScrolledWindow::;
		3184
		3185	sub new {
		3186	my $class = shift;
		3187
		3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
		3430	@_,
		3431	)
		3432	}
		3433
		3434	# XXX: Do sorting? Argl...
		3435	sub add_spell {
		3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
		3438
		3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
2978	package CFClient::UI::Root;	3476	package CFClient::UI::Root;
2979		3477
2980	our @ISA = CFClient::UI::Container::;	3478	our @ISA = CFClient::UI::Container::;
2981		3479
2982	use CFClient::OpenGL;	3480	use CFClient::OpenGL;
…		…
2992	Scalar::Util::weaken ($self->{root} = $self);	3490	Scalar::Util::weaken ($self->{root} = $self);
2993		3491
2994	$self	3492	$self
2995	}	3493	}
2996		3494
2997	sub configure {
2998	my ($self, $x, $y, $w, $h) = @_;
2999
3000	$self->{w} = $w;
3001	$self->{h} = $h;
3002	}
3003
3004	sub reconfigure {
3005	my ($self) = @_;
3006
3007	$self->SUPER::reconfigure;
3008
3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3010	if $self->{w};
3011	}
3012
3013	sub size_request {	3495	sub size_request {
3014	my ($self) = @_;	3496	my ($self) = @_;
3015		3497
3016	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
3017	}	3499	}
3018		3500
		3501	sub _to_pixel {
		3502	my ($coord, $size, $max) = @_;
		3503
		3504	$coord =
		3505	$coord eq "center" ? ($max - $size) * 0.5
		3506	: $coord eq "max" ? $max
		3507	: $coord;
		3508
		3509	$coord = 0 if $coord < 0;
		3510	$coord = $max - $size if $coord > $max - $size;
		3511
		3512	int $coord + 0.5
		3513	}
		3514
3019	sub size_allocate {	3515	sub size_allocate {
3020	my ($self, $w, $h, $changed) = @_;	3516	my ($self, $w, $h) = @_;
3021		3517
3022	for my $child ($self->children) {	3518	for my $child ($self->children) {
3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024		3520
3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3521	$X = $child->{force_x} if exists $child->{force_x};
3026	if exists $child->{req_x};	3522	$Y = $child->{force_y} if exists $child->{force_y};
3027		3523
3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3524	$X = _to_pixel $X, $W, $self->{w};
3029	if exists $child->{req_y};	3525	$Y = _to_pixel $Y, $H, $self->{h};
3030
3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3526
3036	$child->configure ($X, $Y, $W, $H);	3527	$child->configure ($X, $Y, $W, $H);
3037	}	3528	}
3038	}	3529	}
3039		3530
…		…
3056	}	3547	}
3057		3548
3058	sub add {	3549	sub add {
3059	my ($self, @children) = @_;	3550	my ($self, @children) = @_;
3060		3551
3061	for my $child (@children) {
3062	$child->{is_toplevel} = 1;	3552	$_->{is_toplevel} = 1
3063		3553	for @children;
3064	# integerise window positions
3065	$child->{x} = int $child->{x};
3066	$child->{y} = int $child->{y};
3067	}
3068		3554
3069	$self->SUPER::add (@children);	3555	$self->SUPER::add (@children);
3070	}	3556	}
3071		3557
3072	sub remove {	3558	sub remove {
3073	my ($self, @children) = @_;	3559	my ($self, @children) = @_;
3074		3560
3075	$self->SUPER::remove (@children);	3561	$self->SUPER::remove (@children);
		3562
		3563	delete $self->{is_toplevel}
		3564	for @children;
3076		3565
3077	while (@children) {	3566	while (@children) {
3078	my $w = pop @children;	3567	my $w = pop @children;
3079	push @children, $w->children;	3568	push @children, $w->children;
3080	$w->set_invisible;	3569	$w->set_invisible;
…		…
3100	$_->()	3589	$_->()
3101	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3102	}	3591	}
3103		3592
3104	if ($self->{realloc}) {	3593	if ($self->{realloc}) {
		3594	my %queue;
3105	my @queue;	3595	my @queue;
		3596	my $widget;
3106		3597
		3598	outer:
3107	while () {	3599	while () {
3108	if ($self->{realloc}) {	3600	if (my $realloc = delete $self->{realloc}) {
3109	#TODO use array-of-depth approach	3601	for $widget (values %$realloc) {
		3602	$widget->{visible} or next; # do not resize invisible widgets
3110		3603
3111	@queue = sort { $a->{visible} <=> $b->{visible} }	3604	$queue{$widget+0}++ and next; # duplicates are common
3112	@queue, values %{delete $self->{realloc}};	3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3113	}	3608	}
3114		3609
		3610	while () {
		3611	@queue or last outer;
		3612
		3613	$widget = pop @{ $queue[-1] || [] }
		3614	and last;
		3615
		3616	pop @queue;
		3617	}
		3618
		3619	delete $queue{$widget+0};
		3620
		3621	my ($w, $h) = $widget->size_request;
		3622
		3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3625
		3626	$w = $widget->{force_w} if exists $widget->{force_w};
		3627	$h = $widget->{force_h} if exists $widget->{force_h};
		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
		3631	$widget->{req_w} = $w;
		3632	$widget->{req_h} = $h;
		3633
		3634	$self->{size_alloc}{$widget+0} = $widget;
		3635
		3636	if (my $parent = $widget->{parent}) {
		3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
		3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
		3646	}
		3647	}
		3648
		3649	while (my $size_alloc = delete $self->{size_alloc}) {
		3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3651	values %$size_alloc;
		3652
		3653	while () {
3115	my $widget = pop @queue || last;	3654	my $widget = pop @queue || last;
3116		3655
3117	$widget->{visible} or last; # do not resize invisible widgets	3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120	? @$widget{qw(def_w def_h)}
3121	: $widget->size_request;
3122
3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125	$widget->{req_w} = $w;
3126	$widget->{req_h} = $h;
3127
3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130	push @queue, $widget->{parent}
3131	if $widget->{parent};
3132	}
3133	}
3134
3135	while (my $size_alloc = delete $self->{size_alloc}) {
3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137	values %$size_alloc;
3138
3139	while () {
3140	my ($widget, $w, $h) = @{ pop @queue or last };
3141		3657
3142	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3143	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3144		3660
		3661	$w = int $w + 0.5;
		3662	$h = int $h + 0.5;
		3663
		3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
		3667
3145	$widget->{w} = $w;	3668	$widget->{w} = $w;
3146	$widget->{h} = $h;	3669	$widget->{h} = $h;
		3670
3147	$widget->emit (size_allocate => $w, $h, 1);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3148	}	3673	}
3149	}	3674	}
3150		3675
3151	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3152	$_->()	3677	$_->()
3153	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3154	}	3679	}
		3680
3155		3681
3156	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3159		3685
…		…
3161	glLoadIdentity;	3687	glLoadIdentity;
3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3164	glLoadIdentity;	3690	glLoadIdentity;
3165		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3166	$self->_draw;	3699	$self->_draw;
3167	}	3700	}
3168		3701
3169	#############################################################################	3702	#############################################################################
3170		3703

Diff Legend

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