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.253 by root, Sun May 28 23:28:12 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) {
45	$TOOLTIP->hide;	51	$TOOLTIP->hide;
46		52
47	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
48		54
…		…
165	sub rescale_widgets {	171	sub rescale_widgets {
166	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
167		173
168	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
169	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
170	$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.]+$/;
171	$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};
172	$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};
173	$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.]+$/;
174	$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};
175	$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
176	}	189	}
177	}	190	}
178		191
179	reconfigure_widgets;	192	reconfigure_widgets;
180	}	193	}
…		…
189		202
190	sub new {	203	sub new {
191	my $class = shift;	204	my $class = shift;
192		205
193	my $self = bless {	206	my $self = bless {
194	x => 0,	207	x => "center",
195	y => 0,	208	y => "center",
196	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
197	can_events => 1,	212	can_events => 1,
198	@_	213	@_
199	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200		217
201	for (keys %$self) {	218	for (keys %$self) {
202	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
203	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
204	}	221	}
205	}	222	}
206		223
207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212	$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};
213	$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};
214	}	234	}
215		235
216	$self	236	$self
217	}	237	}
218		238
…		…
227	my ($self) = @_;	247	my ($self) = @_;
228		248
229	return if $self->{parent};	249	return if $self->{parent};
230		250
231	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
232	}
233
234	sub center {
235	my ($self) = @_;
236
237	$CFClient::UI::ROOT->on_post_alloc (
238	"center_$self" => sub {
239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240	},
241	);
242
243	$self->update;
244	}	252	}
245		253
246	sub set_visible {	254	sub set_visible {
247	my ($self) = @_;	255	my ($self) = @_;
248		256
…		…
303		311
304	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
305	if $self->{parent};	313	if $self->{parent};
306	}	314	}
307		315
308	sub move {	316	sub move_abs {
309	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
310		318
311	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
312	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
313	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
314		322
315	$self->update;	323	$self->update;
316	}	324	}
317		325
318	sub set_size {	326	sub set_size {
319	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
320		328
321	$self->{def_w} = $w;	329	$self->{force_w} = $w;
322	$self->{def_h} = $h;	330	$self->{force_h} = $h;
323		331
324	$self->realloc;	332	$self->realloc;
325	}	333	}
326		334
327	sub size_request {	335	sub size_request {
…		…
331		339
332	sub configure {	340	sub configure {
333	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
334		342
335	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
336	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
337	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
338		348
339	# use alignment to adjust x, y	349	# use alignment to adjust x, y
340		350
341	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
342	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
343
344	($w, $h) = ($w2, $h2);
345	}	353	}
346		354
347	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
348	$self->{x} = $x;	356	$self->{x} = $x;
349	$self->{y} = $y;	357	$self->{y} = $y;
350	$self->update;	358	$self->update;
351	}	359	}
352		360
353	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354	return unless $self->{visible};	362	return unless $self->{visible};
355		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
357	}	368	}
358	}	369	}
359		370
360	sub size_allocate {	371	sub size_allocate {
361	# nothing to be done	372	# nothing to be done
362	}	373	}
363		374
364	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
365	}	381	}
366		382
367	sub set_max_size {	383	sub set_max_size {
368	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
369		385
…		…
428		444
429	$::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
430	unless $FOCUS;	446	unless $FOCUS;
431	}	447	}
432		448
433	sub mouse_motion { }	449	sub mouse_motion { 0 }
434	sub button_up { }	450	sub button_up { 0 }
435	sub key_down { }	451	sub key_down { 0 }
436	sub key_up { }	452	sub key_up { 0 }
437		453
438	sub button_down {	454	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
440		456
441	$self->focus_in;	457	$self->focus_in;
442	}
443		458
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449		461
450	sub find_widget {	462	sub find_widget {
451	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
452		464
453	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
461		473
462	sub set_parent {	474	sub set_parent {
463	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
464		476
465	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
466
467	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
468	}	479	}
469		480
470	sub connect {	481	sub connect {
471	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
492		503
493	sub realloc {	504	sub realloc {
494	my ($self) = @_;	505	my ($self) = @_;
495		506
496	if ($self->{visible}) {	507	if ($self->{visible}) {
497	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
498		509
499	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
500	$self->{root}->update;	511	$self->{root}->update;
501	} else {	512	} else {
502	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
503	}	515	}
504	}	516	}
505		517
506	sub update {	518	sub update {
507	my ($self) = @_;	519	my ($self) = @_;
508		520
509	$self->{parent}->update	521	$self->{parent}->update
510	if $self->{parent};	522	if $self->{parent};
511	}	523	}
512		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
513	sub draw {	536	sub draw {
514	my ($self) = @_;	537	my ($self) = @_;
515		538
516	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);
517		550
518	glPushMatrix;	551	glPushMatrix;
519	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
520	$self->_draw;
521	glPopMatrix;
522		553
523	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
524	my ($x, $y) = @$self{qw(x y)};
525
526	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527	glEnable GL_BLEND;	556	glEnable GL_BLEND;
528	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529	glBegin GL_QUADS;	558	glBegin GL_QUADS;
530	glVertex $x , $y;	559	glVertex 0 , 0;
531	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
532	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
533	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
534	glEnd;	563	glEnd;
535	glDisable GL_BLEND;	564	glDisable GL_BLEND;
536	}	565	}
537		566
538	if ($ENV{PCLIENT_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
539	glPushMatrix;	568	glPushMatrix;
540	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
542	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
543	glVertex 0 , 0;	572	glVertex 0 , 0;
544	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
545	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
546	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
547	glEnd;	576	glEnd;
548	glPopMatrix;	577	glPopMatrix;
549	#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;
550	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
551	}	583	}
552		584
553	sub _draw {	585	sub _draw {
554	my ($self) = @_;	586	my ($self) = @_;
555		587
…		…
593		625
594	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
595	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
596		628
597	glEnable GL_BLEND;	629	glEnable GL_BLEND;
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599	glColor @$color;	631	glColor_premultiply @$color;
600		632
601	glBegin GL_QUADS;	633	glBegin GL_QUADS;
602	glVertex 0 , 0;	634	glVertex 0 , 0;
603	glVertex 0 , $h;	635	glVertex 0 , $h;
604	glVertex $w, $h;	636	glVertex $w, $h;
…		…
619	my ($class, %arg) = @_;	651	my ($class, %arg) = @_;
620	$class->SUPER::new (can_events => 0, %arg);	652	$class->SUPER::new (can_events => 0, %arg);
621	}	653	}
622		654
623	sub size_request {	655	sub size_request {
624	(0, 0)	656	my ($self) = @_;
		657
		658	($self->{w} + 0, $self->{h} + 0)
625	}	659	}
626		660
627	sub draw { }	661	sub draw { }
628		662
629	#############################################################################	663	#############################################################################
…		…
633	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
634		668
635	sub new {	669	sub new {
636	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
637		671
638	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
639		673
640	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
641	children => [],	675	children => [],
642	can_events => 0,	676	can_events => 0,
643	%arg,	677	%arg,
644	);	678	);
		679
645	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
646		682
647	$self	683	$self
648	}	684	}
649		685
650	sub add {	686	sub add {
…		…
698	$x -= $self->{x};	734	$x -= $self->{x};
699	$y -= $self->{y};	735	$y -= $self->{y};
700		736
701	my $res;	737	my $res;
702		738
703	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
705	and return $res;	741	and return $res;
706	}	742	}
707		743
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
750	sub size_request {	786	sub size_request {
751	$_[0]{children}[0]->size_request	787	$_[0]{children}[0]->size_request
752	}	788	}
753		789
754	sub size_allocate {	790	sub size_allocate {
755	my ($self, $w, $h, $changed) = @_;	791	my ($self, $w, $h) = @_;
756		792
757	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
758	}	794	}
759		795
760	#############################################################################	796	#############################################################################
		797
		798	# back-buffered drawing area
761		799
762	package CFClient::UI::Window;	800	package CFClient::UI::Window;
763		801
764	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
765		803
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	815	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	816	$self->SUPER::update;
779	}	817	}
780		818
781	sub size_allocate {	819	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	820	my ($self, $w, $h) = @_;
783		821
784	$self->SUPER::size_allocate ($w, $h, $changed);	822	$self->SUPER::size_allocate ($w, $h);
785	$self->update	823	$self->update;
786	if $changed;
787	}	824	}
788		825
789	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
790	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
791	}	830	}
792		831
793	sub render_child {	832	sub render_child {
794	my ($self) = @_;	833	my ($self) = @_;
795		834
796	$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 {
797	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
799		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
800	$self->_render;	846	$self->_render;
801	};	847	};
802	}	848	}
803		849
804	sub _draw {	850	sub _draw {
805	my ($self) = @_;	851	my ($self) = @_;
806		852
807	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
808		854
809	my $tex = $self->{texture}	855	my $tex = $self->{texture}
810	or return;	856	or return;
811		857
812	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814	glColor 1, 1, 1, 1;	860	glColor 0, 0, 0, 1;
815		861
816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817		863
818	glDisable GL_TEXTURE_2D;	864	glDisable GL_TEXTURE_2D;
819	}	865	}
…		…
835	}	881	}
836		882
837	sub size_request {	883	sub size_request {
838	my ($self) = @_;	884	my ($self) = @_;
839		885
840	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)};
841		887
842	$w = 10 if $self->{scroll_x};	888	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	889	$h = 10 if $self->{scroll_y};
844		890
845	($w, $h)	891	($w, $h)
846	}	892	}
847		893
848	sub size_allocate {	894	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	895	my ($self, $w, $h) = @_;
850		896
		897	my $child = $self->child;
		898
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	899	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	900	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		901
854	$self->child->configure (0, 0, $w, $h);	902	$self->child->configure (0, 0, $w, $h);
855	$self->update;	903	$self->update;
856	}	904	}
857		905
…		…
893	}	941	}
894		942
895	sub _render {	943	sub _render {
896	my ($self) = @_;	944	my ($self) = @_;
897		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
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	949	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		950
900	$self->SUPER::_render;	951	$self->SUPER::_render;
901	}	952	}
902		953
…		…
905	package CFClient::UI::ScrolledWindow;	956	package CFClient::UI::ScrolledWindow;
906		957
907	our @ISA = CFClient::UI::HBox::;	958	our @ISA = CFClient::UI::HBox::;
908		959
909	sub new {	960	sub new {
910	my $class = shift;	961	my ($class, %arg) = @_;
		962
		963	my $child = delete $arg{child};
911		964
912	my $self;	965	my $self;
913		966
914	my $slider = new CFClient::UI::Slider	967	my $slider = new CFClient::UI::Slider
915	vertical => 1,	968	vertical => 1,
…		…
920	;	973	;
921		974
922	$self = $class->SUPER::new (	975	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	976	vp => (new CFClient::UI::ViewPort expand => 1),
924	slider => $slider,	977	slider => $slider,
925	@_,	978	%arg,
926	);	979	);
927		980
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	981	$self->SUPER::add ($self->{vp}, $self->{slider});
		982	$self->add ($child) if $child;
931		983
932	$self	984	$self
		985	}
		986
		987	sub add {
		988	my ($self, $widget) = @_;
		989
		990	$self->{vp}->add ($self->{child} = $widget);
933	}	991	}
934		992
935	sub update {	993	sub update {
936	my ($self) = @_;	994	my ($self) = @_;
937		995
…		…
941	my $child = $self->{vp}->child;	999	my $child = $self->{vp}->child;
942	$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]);
943	}	1001	}
944		1002
945	sub size_allocate {	1003	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1004	my ($self, $w, $h) = @_;
947		1005
948	$self->SUPER::size_allocate ($w, $h, $changed);	1006	$self->SUPER::size_allocate ($w, $h);
949		1007
950	my $child = $self->{vp}->child;	1008	my $child = $self->{vp}->child;
951	$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]);
952	}	1010	}
953		1011
…		…
976		1034
977	if ($self->{bg}) {	1035	if ($self->{bg}) {
978	my ($w, $h) = @$self{qw(w h)};	1036	my ($w, $h) = @$self{qw(w h)};
979		1037
980	glEnable GL_BLEND;	1038	glEnable GL_BLEND;
981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1039	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982	glColor @{ $self->{bg} };	1040	glColor_premultiply @{ $self->{bg} };
983		1041
984	glBegin GL_QUADS;	1042	glBegin GL_QUADS;
985	glVertex 0 , 0;	1043	glVertex 0 , 0;
986	glVertex 0 , $h;	1044	glVertex 0 , $h;
987	glVertex $w, $h;	1045	glVertex $w, $h;
…		…
1000		1058
1001	our @ISA = CFClient::UI::Bin::;	1059	our @ISA = CFClient::UI::Bin::;
1002		1060
1003	use CFClient::OpenGL;	1061	use CFClient::OpenGL;
1004		1062
1005	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 =
1006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1068	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007	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);
1008		1070
1009	sub new {	1071	sub new {
1010	my $class = shift;	1072	my ($class, %arg) = @_;
		1073
		1074	my $title = delete $arg{title};
1011		1075
1012	my $self = $class->SUPER::new (	1076	my $self = $class->SUPER::new (
1013	bg => [1, 1, 1, 1],	1077	bg => [1, 1, 1, 1],
1014	border_bg => [1, 1, 1, 1],	1078	border_bg => [1, 1, 1, 1],
1015	border => 0.6,	1079	border => 0.6,
1016	is_toplevel => 1,
1017	can_events => 1,	1080	can_events => 1,
1018	@_	1081	min_w => 16,
		1082	min_h => 16,
		1083	%arg,
1019	);	1084	);
1020		1085
1021	$self->{title} &&= new CFClient::UI::Label	1086	$self->{title} = new CFClient::UI::Label
1022	align => 0,	1087	align => 0,
1023	valign => 1,	1088	valign => 1,
1024	text => $self->{title},	1089	text => $title,
1025	fontsize => $self->{border};	1090	fontsize => $self->{border}
		1091	if defined $title;
1026		1092
1027	$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};
1028	}	1101	}
1029		1102
1030	sub border {	1103	sub border {
1031	int $_[0]{border} * $::FONTSIZE	1104	int $_[0]{border} * $::FONTSIZE
1032	}	1105	}
1033		1106
1034	sub size_request {	1107	sub size_request {
1035	my ($self) = @_;	1108	my ($self) = @_;
		1109
		1110	$self->{title}->size_request
		1111	if $self->{title};
1036		1112
1037	my ($w, $h) = $self->SUPER::size_request;	1113	my ($w, $h) = $self->SUPER::size_request;
1038		1114
1039	(	1115	(
1040	$w + $self->border * 2,	1116	$w + $self->border * 2,
1041	$h + $self->border * 2,	1117	$h + $self->border * 2,
1042	)	1118	)
1043	}	1119	}
1044		1120
1045	sub size_allocate {	1121	sub size_allocate {
1046	my ($self, $w, $h, $changed) = @_;	1122	my ($self, $w, $h) = @_;
1047		1123
1048	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	}
1049		1129
		1130	my $border = $self->border;
		1131
1050	$h -= List::Util::max 0, $self->border * 2;	1132	$h -= List::Util::max 0, $border * 2;
1051	$w -= List::Util::max 0, $self->border * 2;	1133	$w -= List::Util::max 0, $border * 2;
1052		1134
1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054	if $self->{title};
1055
1056	$self->child->configure ($self->border, $self->border, $w, $h);	1135	$self->child->configure ($border, $border, $w, $h);
1057	}	1136	}
1058		1137
1059	sub button_down {	1138	sub button_down {
1060	my ($self, $ev, $x, $y) = @_;	1139	my ($self, $ev, $x, $y) = @_;
1061		1140
…		…
1077	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1078		1157
1079	my $dx = $ev->{x} - $ox;	1158	my $dx = $ev->{x} - $ox;
1080	my $dy = $ev->{y} - $oy;	1159	my $dy = $ev->{y} - $oy;
1081		1160
1082	$self->{user_x} = $wx + $dx * $mx;
1083	$self->{user_y} = $wy + $dy * $my;
1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1161	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1162	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086	$self->move ($self->{user_x}, $self->{user_y});	1163
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087	$self->realloc;	1165	$self->realloc;
1088	};	1166	};
1089		1167
1090	} elsif ($lr ^ $td) {	1168	} elsif ($lr ^ $td) {
1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1169	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1094	$self->{motion} = sub {	1172	$self->{motion} = sub {
1095	my ($ev, $x, $y) = @_;	1173	my ($ev, $x, $y) = @_;
1096		1174
1097	($x, $y) = ($ev->{x}, $ev->{y});	1175	($x, $y) = ($ev->{x}, $ev->{y});
1098		1176
1099	$self->{user_x} = $bx + $x - $ox;	1177	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100	$self->{user_y} = $by + $y - $oy;	1178	# HACK: the next line is required to enforce placement
1101		1179	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102	$self->move ($self->{user_x}, $self->{user_y});
1103	$self->realloc;
1104	};	1180	};
		1181	} else {
		1182	return 0;
		1183	}
		1184
1105	}	1185	1
1106	}	1186	}
1107		1187
1108	sub button_up {	1188	sub button_up {
1109	my ($self, $ev, $x, $y) = @_;	1189	my ($self, $ev, $x, $y) = @_;
1110		1190
1111	delete $self->{motion};	1191	!!delete $self->{motion}
1112	}	1192	}
1113		1193
1114	sub mouse_motion {	1194	sub mouse_motion {
1115	my ($self, $ev, $x, $y) = @_;	1195	my ($self, $ev, $x, $y) = @_;
1116		1196
1117	$self->{motion}->($ev, $x, $y) if $self->{motion};	1197	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1198
		1199	!!$self->{motion}
1118	}	1200	}
1119		1201
1120	sub _draw {	1202	sub _draw {
1121	my ($self) = @_;	1203	my ($self) = @_;
1122		1204
		1205	my $child = $self->{children}[0];
		1206
1123	my ($w, $h ) = ($self->{w}, $self->{h});	1207	my ($w, $h ) = ($self->{w}, $self->{h});
1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1208	my ($cw, $ch) = ($child->{w}, $child->{h});
1125		1209
1126	glEnable GL_TEXTURE_2D;	1210	glEnable GL_TEXTURE_2D;
1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128		1212
1129	my $border = $self->border;	1213	my $border = $self->border;
1130		1214
1131	glColor @{ $self->{border_bg} };	1215	glColor @{ $self->{border_bg} };
1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1216	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1217	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1218	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1219	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136		1220
1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1221	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138	my $bg = $tex[0];	1222	glColor @{ $self->{bg} };
1139		1223
1140	# TODO: repeat texture not scale	1224	# TODO: repeat texture not scale
		1225	# solve this better(?)
1141	my $rep_x = $cw / $bg->{w};	1226	$bg->{s} = $cw / $bg->{w};
1142	my $rep_y = $ch / $bg->{h};	1227	$bg->{t} = $ch / $bg->{h};
1143
1144	glColor @{ $self->{bg} };
1145
1146	$bg->{s} = $rep_x;
1147	$bg->{t} = $rep_y;
1148	$bg->{wrap_mode} = 1;
1149	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1228	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150	}	1229	}
1151		1230
1152	glDisable GL_TEXTURE_2D;	1231	glDisable GL_TEXTURE_2D;
1153		1232
1154	$self->{title}->draw if $self->{title};
1155
1156	$self->child->draw;	1233	$child->draw;
		1234
		1235	if ($self->{title}) {
		1236	glTranslate 0, $border - $self->{h};
		1237	$self->{title}->_draw;
		1238	}
1157	}	1239	}
1158		1240
1159	#############################################################################	1241	#############################################################################
1160		1242
1161	package CFClient::UI::Table;	1243	package CFClient::UI::Table;
…		…
1235	(sum @$hs),	1317	(sum @$hs),
1236	)	1318	)
1237	}	1319	}
1238		1320
1239	sub size_allocate {	1321	sub size_allocate {
1240	my ($self, $w, $h, $changed) = @_;	1322	my ($self, $w, $h) = @_;
1241		1323
1242	my ($ws, $hs) = $self->get_wh;	1324	my ($ws, $hs) = $self->get_wh;
1243		1325
1244	my $req_w = (sum @$ws) || 1;	1326	my $req_w = (sum @$ws) || 1;
1245	my $req_h = (sum @$hs) || 1;	1327	my $req_h = (sum @$hs) || 1;
…		…
1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1405	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1324	)	1406	)
1325	}	1407	}
1326		1408
1327	sub size_allocate {	1409	sub size_allocate {
1328	my ($self, $w, $h, $changed) = @_;	1410	my ($self, $w, $h) = @_;
1329		1411
1330	my $space = $self->{vertical} ? $h : $w;	1412	my $space = $self->{vertical} ? $h : $w;
1331	my $children = $self->{children};	1413	my $children = $self->{children};
1332		1414
1333	my @req;	1415	my @req;
…		…
1416	ellipsise => 3, # end	1498	ellipsise => 3, # end
1417	layout => (new CFClient::Layout),	1499	layout => (new CFClient::Layout),
1418	fontsize => 1,	1500	fontsize => 1,
1419	align => -1,	1501	align => -1,
1420	valign => -1,	1502	valign => -1,
1421	padding => 2,	1503	padding_x => 2,
		1504	padding_y => 2,
1422	can_events => 0,	1505	can_events => 0,
1423	%arg	1506	%arg
1424	);	1507	);
1425		1508
1426	if (exists $self->{template}) {	1509	if (exists $self->{template}) {
…		…
1502		1585
1503	$w = List::Util::max $w, $w2;	1586	$w = List::Util::max $w, $w2;
1504	$h = List::Util::max $h, $h2;	1587	$h = List::Util::max $h, $h2;
1505	}	1588	}
1506		1589
1507	(	1590	($w, $h)
1508	$w + $self->{padding} * 2,
1509	$h + $self->{padding} * 2,
1510	)
1511	}	1591	}
1512		1592
1513	sub size_allocate {	1593	sub size_allocate {
1514	my ($self, $w, $h, $changed) = @_;	1594	my ($self, $w, $h) = @_;
		1595
		1596	delete $self->{ox};
1515		1597
1516	delete $self->{texture}	1598	delete $self->{texture}
1517	if $changed;	1599	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518	}	1600	}
1519		1601
1520	sub set_fontsize {	1602	sub set_fontsize {
1521	my ($self, $fontsize) = @_;	1603	my ($self, $fontsize) = @_;
1522		1604
…		…
1537	$self->{layout}->set_width ($self->{w});	1619	$self->{layout}->set_width ($self->{w});
1538	$self->{layout}->set_ellipsise ($self->{ellipsise});	1620	$self->{layout}->set_ellipsise ($self->{ellipsise});
1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1621	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1622	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541		1623
1542	my $tex = new_from_layout CFClient::Texture $self->{layout};	1624	new_from_layout CFClient::Texture $self->{layout}
		1625	};
1543		1626
		1627	unless (exists $self->{ox}) {
1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1628	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1629	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546	: ($self->{w} - $tex->{w}) * 0.5);	1630	: ($self->{w} - $tex->{w}) * 0.5);
1547		1631
1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1632	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1633	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550	: ($self->{h} - $tex->{h}) * 0.5);	1634	: ($self->{h} - $tex->{h}) * 0.5);
1551
1552	$tex
1553	};	1635	};
1554		1636
1555	glEnable GL_TEXTURE_2D;	1637	glEnable GL_TEXTURE_2D;
1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1638	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557		1639
		1640	glColor_premultiply @{$self->{fg}}
1558	if ($tex->{format} == GL_ALPHA) {	1641	if $tex->{format} == GL_ALPHA;
1559	glColor @{$self->{fg}};	1642
1560	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1561	} else {
1562	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563	}
1564		1644
1565	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1566	}	1646	}
1567		1647
1568	#############################################################################	1648	#############################################################################
…		…
1595		1675
1596	delete $self->{cur_h};	1676	delete $self->{cur_h};
1597		1677
1598	return if $self->{text} eq $text;	1678	return if $self->{text} eq $text;
1599		1679
1600	delete $self->{texture};
1601
1602	$self->{last_activity} = $::NOW;	1680	$self->{last_activity} = $::NOW;
1603	$self->{text} = $text;	1681	$self->{text} = $text;
1604		1682
1605	$text =~ s/./*/g if $self->{hidden};	1683	$text =~ s/./*/g if $self->{hidden};
1606	$self->{layout}->set_text ("$text ");	1684	$self->{layout}->set_text ("$text ");
1607		1685
1608	$self->_emit (changed => $self->{text});	1686	$self->_emit (changed => $self->{text});
		1687	$self->update;
1609	}	1688	}
1610		1689
1611	sub set_text {	1690	sub set_text {
1612	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1613		1692
…		…
1652	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1653	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1654	$self->_emit ('escape');	1733	$self->_emit ('escape');
1655	} elsif ($uni) {	1734	} elsif ($uni) {
1656	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1657	}	1738	}
1658		1739
1659	$self->_set_text ($text);	1740	$self->_set_text ($text);
1660		1741
1661	$self->realloc;	1742	$self->realloc;
		1743
		1744	1
1662	}	1745	}
1663		1746
1664	sub focus_in {	1747	sub focus_in {
1665	my ($self) = @_;	1748	my ($self) = @_;
1666		1749
…		…
1681	utf8::encode $text;	1764	utf8::encode $text;
1682	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1683		1766
1684	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1685	$self->update;	1768	$self->update;
		1769
		1770	1
1686	}	1771	}
1687		1772
1688	sub mouse_motion {	1773	sub mouse_motion {
1689	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1690	# 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
1691	}	1778	}
1692		1779
1693	sub _draw {	1780	sub _draw {
1694	my ($self) = @_;	1781	my ($self) = @_;
1695		1782
1696	local $self->{fg} = $self->{fg};	1783	local $self->{fg} = $self->{fg};
1697		1784
1698	if ($FOCUS == $self) {	1785	if ($FOCUS == $self) {
1699	glColor @{$self->{active_bg}};	1786	glColor_premultiply @{$self->{active_bg}};
1700	$self->{fg} = $self->{active_fg};	1787	$self->{fg} = $self->{active_fg};
1701	} else {	1788	} else {
1702	glColor @{$self->{bg}};	1789	glColor_premultiply @{$self->{bg}};
1703	}	1790	}
1704		1791
1705	glEnable GL_BLEND;	1792	glEnable GL_BLEND;
1706	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1793	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707	glBegin GL_QUADS;	1794	glBegin GL_QUADS;
1708	glVertex 0 , 0;	1795	glVertex 0 , 0;
1709	glVertex 0 , $self->{h};	1796	glVertex 0 , $self->{h};
1710	glVertex $self->{w}, $self->{h};	1797	glVertex $self->{w}, $self->{h};
1711	glVertex $self->{w}, 0;	1798	glVertex $self->{w}, 0;
…		…
1772	} else {	1859	} else {
1773	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1774	}	1861	}
1775		1862
1776	} else {	1863	} else {
1777	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1778	}	1867	1
1779
1780	}	1868	}
1781		1869
1782	#############################################################################	1870	#############################################################################
1783		1871
1784	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1793		1881
1794	sub new {	1882	sub new {
1795	my $class = shift;	1883	my $class = shift;
1796		1884
1797	$class->SUPER::new (	1885	$class->SUPER::new (
1798	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1799	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1800	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1801	can_hover => 1,	1890	can_hover => 1,
1802	align => 0,	1891	align => 0,
1803	valign => 0,	1892	valign => 0,
…		…
1812	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1813		1902
1814	$self->emit ("activate")	1903	$self->emit ("activate")
1815	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1816	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1817	}	1908	}
1818		1909
1819	sub _draw {	1910	sub _draw {
1820	my ($self) = @_;	1911	my ($self) = @_;
1821		1912
1822	local $self->{fg} = $self->{fg};	1913	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824	if ($GRAB == $self) {
1825	$self->{fg} = $self->{active_fg};
1826	}
1827		1914
1828	glEnable GL_TEXTURE_2D;	1915	glEnable GL_TEXTURE_2D;
1829	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830	glColor 0, 0, 0, 1;	1917	glColor 0, 0, 0, 1;
1831		1918
…		…
1850		1937
1851	sub new {	1938	sub new {
1852	my $class = shift;	1939	my $class = shift;
1853		1940
1854	$class->SUPER::new (	1941	$class->SUPER::new (
1855	padding => 2,	1942	padding_x => 2,
		1943	padding_y => 2,
1856	fg => [1, 1, 1],	1944	fg => [1, 1, 1],
1857	active_fg => [1, 1, 0],	1945	active_fg => [1, 1, 0],
1858	bg => [0, 0, 0, 0.2],	1946	bg => [0, 0, 0, 0.2],
1859	active_bg => [1, 1, 1, 0.5],	1947	active_bg => [1, 1, 1, 0.5],
1860	state => 0,	1948	state => 0,
…		…
1864	}	1952	}
1865		1953
1866	sub size_request {	1954	sub size_request {
1867	my ($self) = @_;	1955	my ($self) = @_;
1868		1956
1869	($self->{padding} * 2 + 6) x 2	1957	(6) x 2
1870	}	1958	}
1871		1959
1872	sub button_down {	1960	sub button_down {
1873	my ($self, $ev, $x, $y) = @_;	1961	my ($self, $ev, $x, $y) = @_;
1874		1962
1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1963	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1964	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877	$self->{state} = !$self->{state};	1965	$self->{state} = !$self->{state};
1878	$self->_emit (changed => $self->{state});	1966	$self->_emit (changed => $self->{state});
		1967	} else {
		1968	return 0
		1969	}
		1970
1879	}	1971	1
1880	}	1972	}
1881		1973
1882	sub _draw {	1974	sub _draw {
1883	my ($self) = @_;	1975	my ($self) = @_;
1884		1976
1885	$self->SUPER::_draw;	1977	$self->SUPER::_draw;
1886		1978
1887	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1979	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888		1980
1889	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;
1890		1984
1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1985	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892		1986
1893	my $tex = $self->{state} ? $tex[1] : $tex[0];	1987	my $tex = $self->{state} ? $tex[1] : $tex[0];
1894		1988
…		…
2049		2143
2050	my $h1 = $self->{h} * (1 - $ycut1);	2144	my $h1 = $self->{h} * (1 - $ycut1);
2051	my $h2 = $self->{h} * (1 - $ycut2);	2145	my $h2 = $self->{h} * (1 - $ycut2);
2052		2146
2053	glEnable GL_BLEND;	2147	glEnable GL_BLEND;
2054	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;
2055	glEnable GL_TEXTURE_2D;	2150	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057		2152
2058	glBindTexture GL_TEXTURE_2D, $t1->{name};	2153	glBindTexture GL_TEXTURE_2D, $t1->{name};
2059	glBegin GL_QUADS;	2154	glBegin GL_QUADS;
…		…
2159	fg => [1, 1, 1],	2254	fg => [1, 1, 1],
2160	active_fg => [0, 0, 0],	2255	active_fg => [0, 0, 0],
2161	bg => [0, 0, 0, 0.2],	2256	bg => [0, 0, 0, 0.2],
2162	active_bg => [1, 1, 1, 0.5],	2257	active_bg => [1, 1, 1, 0.5],
2163	range => [0, 0, 100, 10, 0],	2258	range => [0, 0, 100, 10, 0],
2164	req_w => $::WIDTH / 80,	2259	min_w => $::WIDTH / 80,
2165	req_h => $::WIDTH / 80,	2260	min_h => $::WIDTH / 80,
2166	vertical => 0,	2261	vertical => 0,
2167	can_hover => 1,	2262	can_hover => 1,
2168	inner_pad => 0.02,	2263	inner_pad => 0.02,
2169	@_	2264	@_
2170	);	2265	);
…		…
2210	}	2305	}
2211		2306
2212	sub size_request {	2307	sub size_request {
2213	my ($self) = @_;	2308	my ($self) = @_;
2214		2309
2215	my $w = $self->{req_w};	2310	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2311	}
2220		2312
2221	sub button_down {	2313	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2314	my ($self, $ev, $x, $y) = @_;
2223		2315
2224	$self->SUPER::button_down ($ev, $x, $y);	2316	$self->SUPER::button_down ($ev, $x, $y);
2225		2317
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2318	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2319
2228	$self->mouse_motion ($ev, $x, $y);	2320	$self->mouse_motion ($ev, $x, $y)
2229	}	2321	}
2230		2322
2231	sub mouse_motion {	2323	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2324	my ($self, $ev, $x, $y) = @_;
2233		2325
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2329	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2330
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2331	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2332
2241	$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
2242	}	2338	1
2243	}	2339	}
2244		2340
2245	sub update {	2341	sub update {
2246	my ($self) = @_;	2342	my ($self) = @_;
2247		2343
2248	$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}) {
2249	$self->set_value ($self->{range}[0]);	2352	$self->set_value ($self->{range}[0]);
2250		2353
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2354	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2355	my $range = ($hi - $page - $lo) || 1e-100;
2253		2356
…		…
2259	$value = ($value - $lo) / $range;	2362	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2363	$value = $value * $self->{scale} + $self->{offset};
2261		2364
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2365	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2366	$self->{knob_w} = $knob_w;
2264	});	2367	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2368
2272	$self->SUPER::_draw ();	2369	$self->SUPER::_draw ();
2273		2370
2274	glScale $self->{w}, $self->{h};	2371	glScale $self->{w}, $self->{h};
2275		2372
…		…
2373	$self->{fontsize} = $fontsize;	2470	$self->{fontsize} = $fontsize;
2374	$self->reflow;	2471	$self->reflow;
2375	}	2472	}
2376		2473
2377	sub size_allocate {	2474	sub size_allocate {
2378	my ($self, $w, $h, $changed) = @_;	2475	my ($self, $w, $h) = @_;
2379		2476
2380	$self->SUPER::size_allocate ($w, $h, $changed);	2477	$self->SUPER::size_allocate ($w, $h);
2381
2382	return unless $changed;
2383		2478
2384	$self->{layout}->set_font ($self->{font}) if $self->{font};	2479	$self->{layout}->set_font ($self->{font}) if $self->{font};
2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386	$self->{layout}->set_width ($self->{children}[0]{w});	2481	$self->{layout}->set_width ($self->{children}[0]{w});
2387		2482
…		…
2471		2566
2472	delete $self->{texture};	2567	delete $self->{texture};
2473	}	2568	}
2474		2569
2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2570	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476	glClearColor 0.5, 0.5, 0.5, 0;	2571	glClearColor 0, 0, 0, 0;
2477	glClear GL_COLOR_BUFFER_BIT;	2572	glClear GL_COLOR_BUFFER_BIT;
2478		2573
2479	my $top = int $self->{children}[1]{range}[0];	2574	my $top = int $self->{children}[1]{range}[0];
2480		2575
2481	my $y0 = $top;	2576	my $y0 = $top;
…		…
2516	sub _draw {	2611	sub _draw {
2517	my ($self) = @_;	2612	my ($self) = @_;
2518		2613
2519	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2616	glColor 0, 0, 0, 1;
2522	$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});
2523	glDisable GL_TEXTURE_2D;	2618	glDisable GL_TEXTURE_2D;
2524		2619
2525	$self->{children}[1]->draw;	2620	$self->{children}[1]->draw;
2526		2621
2527	}	2622	}
…		…
2610	}	2705	}
2611		2706
2612	sub set_tooltip_from {	2707	sub set_tooltip_from {
2613	my ($self, $widget) = @_;	2708	my ($self, $widget) = @_;
2614		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
2615	$self->add (new CFClient::UI::Label	2719	$self->add (new CFClient::UI::Label
2616	markup => $widget->{tooltip},	2720	markup => $tooltip,
2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2721	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618	fontsize => 0.8,	2722	fontsize => 0.8,
2619	fg => [0, 0, 0, 1],	2723	fg => [0, 0, 0, 1],
2620	ellipsise => 0,	2724	ellipsise => 0,
2621	font => ($widget->{tooltip_font} || $::FONT_PROP),	2725	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2629		2733
2630	($w + 4, $h + 4)	2734	($w + 4, $h + 4)
2631	}	2735	}
2632		2736
2633	sub size_allocate {	2737	sub size_allocate {
2634	my ($self, $w, $h, $changed) = @_;	2738	my ($self, $w, $h) = @_;
2635		2739
2636	return unless $changed;
2637
2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2740	$self->SUPER::size_allocate ($w - 4, $h - 4);
2639	}	2741	}
2640		2742
2641	sub visibility_change {	2743	sub visibility_change {
2642	my ($self, $visible) = @_;	2744	my ($self, $visible) = @_;
2643		2745
2644	return unless $visible;	2746	return unless $visible;
2645		2747
2646	$self->{root}->on_post_alloc ("move_$self" => sub {	2748	$self->{root}->on_post_alloc ("move_$self" => sub {
2647	my $widget = $self->{owner};	2749	my $widget = $self->{owner}
		2750	or return;
2648		2751
2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2752	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650		2753
2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2754	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652	if $x + $self->{w} > $::WIDTH;	2755	if $x + $self->{w} > $::WIDTH;
2653		2756
2654	$self->move ($x, $y);	2757	$self->move_abs ($x, $y);
2655	});	2758	});
2656	}	2759	}
2657		2760
2658	sub _draw {	2761	sub _draw {
2659	my ($self) = @_;	2762	my ($self) = @_;
…		…
2746	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2849	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747		2850
2748	if ($tex) {	2851	if ($tex) {
2749	glEnable GL_TEXTURE_2D;	2852	glEnable GL_TEXTURE_2D;
2750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751	glColor 1, 1, 1, 1;	2854	glColor 0, 0, 0, 1;
2752	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2855	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753	glDisable GL_TEXTURE_2D;	2856	glDisable GL_TEXTURE_2D;
2754	}	2857	}
2755	}	2858	}
2756		2859
…		…
2763	$self->SUPER::DESTROY;	2866	$self->SUPER::DESTROY;
2764	}	2867	}
2765		2868
2766	#############################################################################	2869	#############################################################################
2767		2870
2768	package CFClient::UI::Inventory;	2871	package CFClient::UI::Buttonbar;
2769		2872
2770	our @ISA = CFClient::UI::ScrolledWindow::;	2873	our @ISA = CFClient::UI::HBox::;
2771		2874
2772	sub new {	2875	# TODO: should actualyl wrap buttons and other goodies.
2773	my $class = shift;
2774
2775	my $self = $class->SUPER::new (
2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777	@_,
2778	);
2779
2780	$self
2781	}
2782
2783	sub set_items {
2784	my ($self, $items) = @_;
2785
2786	$self->{scrolled}->clear;
2787	return unless $items;
2788
2789	my @items = sort {
2790	($a->{type} <=> $b->{type})
2791	or ($a->{name} cmp $b->{name})
2792	} @$items;
2793
2794	$self->{real_items} = \@items;
2795
2796	my $row = 0;
2797	for my $item (@items) {
2798	CFClient::Item::update_widgets $item;
2799
2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804	$row++;
2805	}
2806	}
2807		2876
2808	#############################################################################	2877	#############################################################################
2809		2878
2810	package CFClient::UI::Menu;	2879	package CFClient::UI::Menu;
2811		2880
…		…
2852	# maybe save $GRAB? must be careful about events...	2921	# maybe save $GRAB? must be careful about events...
2853	$GRAB = $self;	2922	$GRAB = $self;
2854	$self->{button} = $ev->{button};	2923	$self->{button} = $ev->{button};
2855		2924
2856	$self->show;	2925	$self->show;
2857	$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);
2858	}	2927	}
2859		2928
2860	sub mouse_motion {	2929	sub mouse_motion {
2861	my ($self, $ev, $x, $y) = @_;	2930	my ($self, $ev, $x, $y) = @_;
2862		2931
2863	# TODO: should use vbox->find_widget or so	2932	# TODO: should use vbox->find_widget or so
2864	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2933	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865	$self->{hover} = $self->{item}{$HOVER};	2934	$self->{hover} = $self->{item}{$HOVER};
		2935
		2936	0
2866	}	2937	}
2867		2938
2868	sub button_up {	2939	sub button_up {
2869	my ($self, $ev, $x, $y) = @_;	2940	my ($self, $ev, $x, $y) = @_;
2870		2941
…		…
2872	undef $GRAB;	2943	undef $GRAB;
2873	$self->hide;	2944	$self->hide;
2874		2945
2875	$self->_emit ("popdown");	2946	$self->_emit ("popdown");
2876	$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	);
2877	}	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});
2878	}	3061	}
2879		3062
2880	#############################################################################	3063	#############################################################################
2881		3064
2882	package CFClient::UI::Statusbox;	3065	package CFClient::UI::Statusbox;
…		…
2987	$self->SUPER::reconfigure;	3170	$self->SUPER::reconfigure;
2988	}	3171	}
2989		3172
2990	#############################################################################	3173	#############################################################################
2991		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
2992	package CFClient::UI::Root;	3470	package CFClient::UI::Root;
2993		3471
2994	our @ISA = CFClient::UI::Container::;	3472	our @ISA = CFClient::UI::Container::;
2995		3473
2996	use CFClient::OpenGL;	3474	use CFClient::OpenGL;
…		…
3006	Scalar::Util::weaken ($self->{root} = $self);	3484	Scalar::Util::weaken ($self->{root} = $self);
3007		3485
3008	$self	3486	$self
3009	}	3487	}
3010		3488
3011	sub configure {
3012	my ($self, $x, $y, $w, $h) = @_;
3013
3014	$self->{w} = $w;
3015	$self->{h} = $h;
3016	}
3017
3018	sub reconfigure {
3019	my ($self) = @_;
3020
3021	$self->SUPER::reconfigure;
3022
3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
3024	if $self->{w};
3025	}
3026
3027	sub size_request {	3489	sub size_request {
3028	my ($self) = @_;	3490	my ($self) = @_;
3029		3491
3030	($self->{w}, $self->{h})	3492	($self->{w}, $self->{h})
3031	}	3493	}
3032		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
3033	sub size_allocate {	3509	sub size_allocate {
3034	my ($self, $w, $h, $changed) = @_;	3510	my ($self, $w, $h) = @_;
3035		3511
3036	for my $child ($self->children) {	3512	for my $child ($self->children) {
3037	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)};
3038		3514
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3515	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3516	$Y = $child->{force_y} if exists $child->{force_y};
3041		3517
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3518	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3519	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049		3520
3050	$child->configure ($X, $Y, $W, $H);	3521	$child->configure ($X, $Y, $W, $H);
3051	}	3522	}
3052	}	3523	}
3053		3524
…		…
3070	}	3541	}
3071		3542
3072	sub add {	3543	sub add {
3073	my ($self, @children) = @_;	3544	my ($self, @children) = @_;
3074		3545
3075	for my $child (@children) {
3076	$child->{is_toplevel} = 1;	3546	$_->{is_toplevel} = 1
3077		3547	for @children;
3078	# integerise window positions
3079	$child->{x} = int $child->{x};
3080	$child->{y} = int $child->{y};
3081	}
3082		3548
3083	$self->SUPER::add (@children);	3549	$self->SUPER::add (@children);
3084	}	3550	}
3085		3551
3086	sub remove {	3552	sub remove {
3087	my ($self, @children) = @_;	3553	my ($self, @children) = @_;
3088		3554
3089	$self->SUPER::remove (@children);	3555	$self->SUPER::remove (@children);
		3556
		3557	delete $self->{is_toplevel}
		3558	for @children;
3090		3559
3091	while (@children) {	3560	while (@children) {
3092	my $w = pop @children;	3561	my $w = pop @children;
3093	push @children, $w->children;	3562	push @children, $w->children;
3094	$w->set_invisible;	3563	$w->set_invisible;
…		…
3114	$_->()	3583	$_->()
3115	for values %{delete $self->{refresh_hook}};	3584	for values %{delete $self->{refresh_hook}};
3116	}	3585	}
3117		3586
3118	if ($self->{realloc}) {	3587	if ($self->{realloc}) {
		3588	my %queue;
3119	my @queue;	3589	my @queue;
		3590	my $widget;
3120		3591
		3592	outer:
3121	while () {	3593	while () {
3122	if ($self->{realloc}) {	3594	if (my $realloc = delete $self->{realloc}) {
3123	#TODO use array-of-depth approach	3595	for $widget (values %$realloc) {
		3596	$widget->{visible} or next; # do not resize invisible widgets
3124		3597
3125	@queue = sort { $a->{visible} <=> $b->{visible} }	3598	$queue{$widget+0}++ and next; # duplicates are common
3126	@queue, values %{delete $self->{realloc}};	3599
		3600	push @{ $queue[$widget->{visible}] }, $widget;
		3601	}
3127	}	3602	}
3128		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 () {
3129	my $widget = pop @queue || last;	3648	my $widget = pop @queue || last;
3130		3649
3131	$widget->{visible} or last; # do not resize invisible widgets	3650	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134	? @$widget{qw(def_w def_h)}
3135	: $widget->size_request;
3136
3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139	$widget->{req_w} = $w;
3140	$widget->{req_h} = $h;
3141
3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144	push @queue, $widget->{parent}
3145	if $widget->{parent};
3146	}
3147	}
3148
3149	while (my $size_alloc = delete $self->{size_alloc}) {
3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151	values %$size_alloc;
3152
3153	while () {
3154	my ($widget, $w, $h) = @{ pop @queue or last };
3155		3651
3156	$w = 0 if $w < 0;	3652	$w = 0 if $w < 0;
3157	$h = 0 if $h < 0;	3653	$h = 0 if $h < 0;
3158		3654
3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3655	$w = int $w + 0.5;
		3656	$h = int $h + 0.5;
3160		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
3161	$widget->{w} = $w;	3662	$widget->{w} = $w;
3162	$widget->{h} = $h;	3663	$widget->{h} = $h;
3163		3664
3164	$widget->emit (size_allocate => $w, $h, $changed);	3665	$widget->emit (size_allocate => $w, $h);
		3666	}
3165	}	3667	}
3166	}	3668	}
3167		3669
3168	while ($self->{post_alloc_hook}) {	3670	while ($self->{post_alloc_hook}) {
3169	$_->()	3671	$_->()
3170	for values %{delete $self->{post_alloc_hook}};	3672	for values %{delete $self->{post_alloc_hook}};
3171	}	3673	}
		3674
3172		3675
3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3676	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3677	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175	glClear GL_COLOR_BUFFER_BIT;	3678	glClear GL_COLOR_BUFFER_BIT;
3176		3679
…		…
3178	glLoadIdentity;	3681	glLoadIdentity;
3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3682	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180	glMatrixMode GL_MODELVIEW;	3683	glMatrixMode GL_MODELVIEW;
3181	glLoadIdentity;	3684	glLoadIdentity;
3182		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
3183	$self->_draw;	3693	$self->_draw;
3184	}	3694	}
3185		3695
3186	#############################################################################	3696	#############################################################################
3187		3697

Diff Legend

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