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

Diff Legend

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