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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.189 by root, Mon May 8 22:17:24 2006 UTC

…		…
14	our $BUTTON_STATE;	14	our $BUTTON_STATE;
15		15
16	sub check_tooltip {	16	sub check_tooltip {
17	if (!$GRAB) {	17	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	19	if (length $widget->{tooltip}) {
20		20
21	if ($TOOLTIP->{owner} != $widget) {	21	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	22	$TOOLTIP->{owner} = $widget;
23		23
24	my $tip = $widget->{tooltip};	24	my $tip = $widget->{tooltip};
25		25
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	26	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		27
28	$TOOLTIP->set_text ($widget->{tooltip});	28	$TOOLTIP->set_markup ($widget->{tooltip});
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));	29
30	$TOOLTIP->show;	30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
31	}	39	}
32		40
33	return;	41	return;
34	}	42	}
35	}	43	}
…		…
39	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
40	}	48	}
41		49
42	# class methods for events	50	# class methods for events
43	sub feed_sdl_key_down_event {	51	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		53	if $FOCUS;
45	}	54	}
46		55
47	sub feed_sdl_key_up_event {	56	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		58	if $FOCUS;
49	}	59	}
50		60
51	sub feed_sdl_button_down_event {	61	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	62	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	63	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	71	check_tooltip;
62	}	72	}
63		73
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		75
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	76	if ($GRAB) {
		77	($x, $y) = $GRAB->coord2local ($x, $y);
		78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		79	}
67	}	80	}
68		81
69	sub feed_sdl_button_up_event {	82	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	83	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	84	my ($x, $y) = ($ev->{x}, $ev->{y});
72		85
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		87
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		89
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	90	if ($GRAB) {
		91	($x, $y) = $GRAB->coord2local ($x, $y);
		92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		93	}
78		94
79	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	97	$grab->update if $grab;
82	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		115
100	check_tooltip;	116	check_tooltip;
101	}	117	}
102		118
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	119	if ($HOVER) {
		120	($x, $y) = $HOVER->coord2local ($x, $y);
		121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		122	}
104	}	123	}
105		124
106	# convert position array to integers	125	# convert position array to integers
107	sub harmonize {	126	sub harmonize {
108	my ($vals) = @_;	127	my ($vals) = @_;
…		…
126		145
127	sub new {	146	sub new {
128	my $class = shift;	147	my $class = shift;
129		148
130	my $self = bless {	149	my $self = bless {
131	x => 0,	150	x => 0,
132	y => 0,	151	y => 0,
133	z => 0,	152	z => 0,
134	can_events => 1,	153	can_events => 1,
135	@_	154	@_
136	}, $class;	155	}, $class;
137		156
138	for (keys %$self) {	157	for (keys %$self) {
…		…
142	}	161	}
143		162
144	$self	163	$self
145	}	164	}
146		165
		166	sub destroy {
		167	my ($self) = @_;
		168
		169	$self->hide;
		170	%$self = ();
		171	}
		172
147	sub show {	173	sub show {
148	my ($self) = @_;	174	my ($self) = @_;
149		175
150	return if $self->{parent};	176	return if $self->{parent};
151		177
…		…
153	}	179	}
154		180
155	sub hide {	181	sub hide {
156	my ($self) = @_;	182	my ($self) = @_;
157		183
158	return unless $self->{parent};	184	undef $GRAB if $GRAB == $self;
		185	undef $HOVER if $HOVER == $self;
159		186
160	$self->{parent}->remove ($self);	187	$self->{parent}->remove ($self)
		188	if $self->{parent};
161	}	189	}
162		190
163	sub move {	191	sub move {
164	my ($self, $x, $y, $z) = @_;	192	my ($self, $x, $y, $z) = @_;
165		193
…		…
168	$self->{z} = $z if defined $z;	196	$self->{z} = $z if defined $z;
169		197
170	$self->update;	198	$self->update;
171	}	199	}
172		200
173	sub needs_redraw {	201	sub set_size {
174	0	202	my ($self, $w, $h) = @_;
		203
		204	$self->{user_w} = $w;
		205	$self->{user_h} = $h;
		206
		207	$self->check_size;
175	}	208	}
176		209
177	sub size_request {	210	sub size_request {
178	require Carp;	211	require Carp;
179	Carp::confess "size_request is abstract";	212	Carp::confess "size_request is abstract";
…		…
204	$self->{w} = $w;	237	$self->{w} = $w;
205	$self->{h} = $h;	238	$self->{h} = $h;
206		239
207	$self->size_allocate ($w, $h);	240	$self->size_allocate ($w, $h);
208	$self->update;	241	$self->update;
		242	$self->emit (size_allocate => $w, $h);
209	}	243	}
210	}	244	}
211		245
212	sub size_allocate {	246	sub size_allocate {
213	# nothing to be done	247	# nothing to be done
		248	}
		249
		250	sub children {
		251	}
		252
		253	# call when resolution changes etc.
		254	sub reconfigure {
		255	my ($self) = @_;
		256
		257	$_->reconfigure
		258	for $self->children;
		259
		260	$self->check_size;
		261	$self->size_allocate ($self->{w}, $self->{h});
		262	$self->update;
214	}	263	}
215		264
216	sub set_max_size {	265	sub set_max_size {
217	my ($self, $w, $h) = @_;	266	my ($self, $w, $h) = @_;
218		267
…		…
221	}	270	}
222		271
223	# return top left coordinates	272	# return top left coordinates
224	sub _topleft {	273	sub _topleft {
225	my ($self, $x, $y) = @_;	274	my ($self, $x, $y) = @_;
		275
		276	$self->{parent}
		277	or Carp::confess "no parent widget in _topleft\n";#d#
226		278
227	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228	}	280	}
229		281
230	# translate global coordinates to local coordinate system	282	# translate global coordinates to local coordinate system
…		…
308	glVertex $x + $self->{w}, $y + $self->{h};	360	glVertex $x + $self->{w}, $y + $self->{h};
309	glVertex $x , $y + $self->{h};	361	glVertex $x , $y + $self->{h};
310	glEnd;	362	glEnd;
311	glDisable GL_BLEND;	363	glDisable GL_BLEND;
312	}	364	}
		365
		366	if ($ENV{PCLIENT_DEBUG}) {
		367	glPushMatrix;
		368	glColor 1, 1, 0, 1;
		369	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		370	glBegin GL_LINE_LOOP;
		371	glVertex 0 , 0;
		372	glVertex $self->{w}, 0;
		373	glVertex $self->{w}, $self->{h};
		374	glVertex 0 , $self->{h};
		375	glEnd;
		376	glPopMatrix;
		377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		378	}
313	}	379	}
314		380
315	sub _draw {	381	sub _draw {
316	my ($self) = @_;	382	my ($self) = @_;
317		383
…		…
337	}	403	}
338		404
339	sub check_size {	405	sub check_size {
340	my ($self) = @_;	406	my ($self) = @_;
341		407
342	return unless $self->{parent};	408	$self->_check_size;
		409	return;
		410	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
343		411
344	my ($w, $h) = $self->size_request;	412	$check_size->{$self} = $self;
345		413
		414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
		415	while (%$check_size) {
		416	my @widgets = values %$check_size;
		417	$_->_check_size
		418	for @widgets;
		419	}
		420	});
		421	}
		422
		423	sub _check_size {
		424	my ($self) = @_;
		425
		426	delete $CFClient::UI::ROOT->{_check_size}{$self};
		427
		428	$self->{parent}
		429	or return 1;
		430
		431	my ($w, $h) = $self->{user_w} && $self->{user_h}
		432	? @$self{qw(user_w user_h)}
		433	: $self->size_request;
		434
346	if ($w != $self->{req_w} || $h != $self->{req_h}) {	435	if ($w != $self->{req_w} || $h != $self->{req_h}) {
347	$self->{req_w} = $w;	436	$self->{req_w} = $w;
348	$self->{req_h} = $h;	437	$self->{req_h} = $h;
349		438
350	$self->{parent}->check_size;	439	$self->{parent}->_check_size
		440	or $self->size_allocate (
		441	(List::Util::max $self->{w}, $w),
		442	(List::Util::max $self->{h}, $h),
		443	);
		444
		445	1
		446	} else {
		447	0
351	}	448	}
352	}	449	}
353		450
354	sub update {	451	sub update {
355	my ($self) = @_;	452	my ($self) = @_;
356		453
357	$self->{parent}->update	454	my $update = $CFClient::UI::ROOT->{_update} ||= {};
358	if $self->{parent};	455
		456	$update->{$self} = $self;
		457
		458	$CFClient::UI::ROOT->on_refresh (_update => sub {
		459	while (%$update) {
		460	my @widgets = values %$update;
		461	%$update = ();
		462
		463	$_->{parent} && $_->{parent}->update
		464	for @widgets;
		465	}
		466	});
359	}	467	}
360		468
361	sub connect {	469	sub connect {
362	my ($self, $signal, $cb) = @_;	470	my ($self, $signal, $cb) = @_;
363		471
…		…
365	}	473	}
366		474
367	sub emit {	475	sub emit {
368	my ($self, $signal, @args) = @_;	476	my ($self, $signal, @args) = @_;
369		477
370	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	478	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371	$cb->($self, @args);
372	}
373	}	479	}
374		480
375	sub DESTROY {	481	sub DESTROY {
376	my ($self) = @_;	482	my ($self) = @_;
377		483
…		…
444	sub new {	550	sub new {
445	my ($class, %arg) = @_;	551	my ($class, %arg) = @_;
446		552
447	my $children = delete $arg{children} || [];	553	my $children = delete $arg{children} || [];
448		554
449	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	555	my $self = $class->SUPER::new (
		556	children => [],
		557	can_events => 0,
		558	%arg,
		559	);
450	$self->add ($_) for @$children;	560	$self->add ($_) for @$children;
451		561
452	$self	562	$self
453	}	563	}
454		564
455	sub add {	565	sub add {
456	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
457		567
458	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
459		570
460	use sort 'stable';	571	use sort 'stable';
461		572
462	$self->{children} = [	573	$self->{children} = [
463	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
464	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
465	];	576	];
466		577
467	$child->check_size;	578	$_->check_size
		579	for @widgets;
		580
		581	$self->update;
		582	}
		583
		584	sub children {
		585	@{ $_[0]{children} }
468	}	586	}
469		587
470	sub remove {	588	sub remove {
471	my ($self, $child) = @_;	589	my ($self, $child) = @_;
472		590
473	delete $child->{parent};	591	delete $child->{parent};
		592	$child->hide;
474		593
475	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	594	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		595
		596	$self->check_size;
		597	$self->update;
		598	}
		599
		600	sub clear {
		601	my ($self) = @_;
		602
		603	my $children = delete $self->{children};
		604	$self->{children} = [];
		605
		606	for (@$children) {
		607	delete $_->{parent};
		608	$_->hide;
		609	}
476		610
477	$self->check_size;	611	$self->check_size;
478	$self->update;	612	$self->update;
479	}	613	}
480		614
…		…
558	}	692	}
559		693
560	sub update {	694	sub update {
561	my ($self) = @_;	695	my ($self) = @_;
562		696
563	# we want to do this delayed...	697	$ROOT->on_refresh ($self => sub { $self->render_child });
564	$self->render_chld;
565	$self->SUPER::update;	698	$self->SUPER::update;
566	}
567
568	sub render_chld {
569	my ($self) = @_;
570
571	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572	glClearColor 0, 0, 0, 1;
573	glClear GL_COLOR_BUFFER_BIT;
574	$self->child->draw;
575	};
576	}	699	}
577		700
578	sub size_allocate {	701	sub size_allocate {
579	my ($self, $w, $h) = @_;	702	my ($self, $w, $h) = @_;
580		703
581	$self->child->configure (0, 0, $w, $h);	704	$self->SUPER::size_allocate ($w, $h);
		705	$self->update;
		706	}
582		707
		708	sub _render {
		709	$_[0]{children}[0]->draw;
		710	}
		711
		712	sub render_child {
		713	my ($self) = @_;
		714
		715	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		716	glClearColor 0, 0, 0, 0;
		717	glClear GL_COLOR_BUFFER_BIT;
		718
583	$self->render_chld;	719	$self->_render;
		720	# glColorMask 1, 1, 1, 0;
		721	# glEnable GL_BLEND;
		722	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		723	# glRasterPos 0, 0;
		724	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		725	# glDisable GL_BLEND;
		726	# glColorMask 1, 1, 1, 1;
		727	};
584	}	728	}
585		729
586	sub _draw {	730	sub _draw {
587	my ($self) = @_;	731	my ($self) = @_;
588		732
…		…
590		734
591	my $tex = $self->{texture}	735	my $tex = $self->{texture}
592	or return;	736	or return;
593		737
594	glEnable GL_BLEND;	738	glEnable GL_BLEND;
595	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596	glEnable GL_TEXTURE_2D;	740	glEnable GL_TEXTURE_2D;
597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		742	glColor 0, 0, 0, 1;
598		743
599	$tex->draw_quad (0, 0, $w, $h);	744	$tex->draw_quad (0, 0, $w, $h);
600		745
601	glDisable GL_BLEND;	746	glDisable GL_BLEND;
602	glDisable GL_TEXTURE_2D;	747	glDisable GL_TEXTURE_2D;
…		…
606		751
607	package CFClient::UI::ViewPort;	752	package CFClient::UI::ViewPort;
608		753
609	our @ISA = CFClient::UI::Window::;	754	our @ISA = CFClient::UI::Window::;
610		755
611	sub new { die }
612
613	sub size_request {	756	sub size_request {
614	my ($self) = @_;	757	my ($self) = @_;
615		758
616	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	759	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	760	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
618		761
619	@$self{qw(child_w child_h)}	762	@$self{qw(child_w child_h)}
620	}	763	}
621		764
622	sub _draw {	765	sub size_allocate {
623	my ($self) = @_;	766	my ($self, $w, $h) = @_;
624		767
625	$self->{children}[1]->draw;	768	$self->update;
626	}	769	}
627		770
		771	sub set_offset {
		772	my ($self, $x, $y) = @_;
		773
		774	$self->{view_x} = int $x;
		775	$self->{view_y} = int $y;
		776
		777	$self->update;
		778	}
		779
		780	# hmm, this does not work for topleft of $self... but we should not aks for that
		781	sub _topleft {
		782	my ($self, $x, $y) = @_;
		783
		784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
		785	}
		786
		787	sub find_widget {
		788	my ($self, $x, $y) = @_;
		789
		790	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		791	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		792	) {
		793	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		794	} else {
		795	$self->CFClient::UI::Base::find_widget ($x, $y)
		796	}
		797	}
		798
		799	sub _render {
		800	my ($self) = @_;
		801
		802	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		803
		804	$self->SUPER::_render;
		805	}
		806
		807	#############################################################################
		808
		809	package CFClient::UI::ScrolledWindow;
		810
		811	our @ISA = CFClient::UI::HBox::;
		812
		813	sub new {
		814	my $class = shift;
		815
		816	my $self;
		817
		818	my $slider = new CFClient::UI::Slider
		819	vertical => 1,
		820	range => [0, 0, 1, 0.01], # HACK fix
		821	connect_changed => sub {
		822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		823	},
		824	;
		825
		826	$self = $class->SUPER::new (
		827	vp => (new CFClient::UI::ViewPort),
		828	slider => $slider,
		829	@_,
		830	);
		831
		832	$self->{vp}->add ($self->{scrolled});
		833	$self->add ($self->{vp});
		834	$self->add ($self->{slider});
		835
		836	$self
		837	}
		838
		839	#TODO# update range on size_allocate depeneing on child
		840	# update viewport offset on scroll
628		841
629	#############################################################################	842	#############################################################################
630		843
631	package CFClient::UI::Frame;	844	package CFClient::UI::Frame;
632		845
…		…
643	border => 0.8,	856	border => 0.8,
644	@_	857	@_
645	);	858	);
646		859
647	$self	860	$self
648	}
649
650	sub set_size {
651	my ($self, $w, $h) = @_;
652	$self->{req_w} = $w;
653	$self->{req_h} = $h;
654	$self->check_size;
655	}
656
657	sub size_request {
658	my ($self) = @_;
659	($self->{req_w}, $self->{req_h})
660	}
661
662	sub size_allocate {
663	my ($self, $w, $h) = @_;
664	$self->{w} = $w;
665	$self->{h} = $h;
666	$self->child->configure (0, 0, $w, $h);
667	}	861	}
668		862
669	sub _draw {	863	sub _draw {
670	my ($self) = @_;	864	my ($self) = @_;
671		865
…		…
706	my $class = shift;	900	my $class = shift;
707		901
708	# TODO: user_x, user_y, overwrite moveto?	902	# TODO: user_x, user_y, overwrite moveto?
709		903
710	my $self = $class->SUPER::new (	904	my $self = $class->SUPER::new (
711	bg => [1, 1, 1, 1],	905	bg => [1, 1, 1, 1],
712	border_bg => [1, 1, 1, 1],	906	border_bg => [1, 1, 1, 1],
713	border => 0.8,	907	border => 0.6,
714	can_events => 1,	908	can_events => 1,
715	@_	909	@_
716	);	910	);
717		911
718	$self->{title} &&= new CFClient::UI::Label	912	$self->{title} &&= new CFClient::UI::Label
719	align => 0,	913	align => 0,
720	valign => 1,	914	valign => 1,
721	text => $self->{title},	915	text => $self->{title},
722	fontsize => 1;	916	fontsize => $self->{border};
723		917
724	$self	918	$self
725	}	919	}
726		920
727	sub border {	921	sub border {
728	int $_[0]{border} * $::FONTSIZE	922	int $_[0]{border} * $::FONTSIZE
729	}	923	}
730		924
731	sub size_request {	925	sub size_request {
732	my ($self) = @_;	926	my ($self) = @_;
733
734	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735		927
736	my ($w, $h) = $self->SUPER::size_request;	928	my ($w, $h) = $self->SUPER::size_request;
737		929
738	(	930	(
739	$w + $self->border * 2,	931	$w + $self->border * 2,
…		…
754	}	946	}
755		947
756	sub button_down {	948	sub button_down {
757	my ($self, $ev, $x, $y) = @_;	949	my ($self, $ev, $x, $y) = @_;
758		950
		951	my ($w, $h) = @$self{qw(w h)};
759	my $border = $self->border;	952	my $border = $self->border;
760		953
761	if ($x < $self->{w} && $x >= $self->{w} - $border	954	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762	&& $y < $self->{h} && $y >= $self->{h} - $border) {	955	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763		956
		957	if ($lr & $td) {
		958	my ($wx, $wy) = ($self->{x}, $self->{y});
764	my ($ox, $oy) = ($ev->{x}, $ev->{y});	959	my ($ox, $oy) = ($ev->{x}, $ev->{y});
765	my ($bw, $bh) = ($self->{w}, $self->{h});	960	my ($bw, $bh) = ($self->{w}, $self->{h});
766		961
		962	my $mx = $x < $border;
		963	my $my = $y < $border;
		964
767	$self->{motion} = sub {	965	$self->{motion} = sub {
768	my ($ev, $x, $y) = @_;	966	my ($ev, $x, $y) = @_;
769		967
770	($x, $y) = ($ev->{x}, $ev->{y});	968	my $dx = $ev->{x} - $ox;
		969	my $dy = $ev->{y} - $oy;
771		970
772	$self->{user_w} = $bw + $x - $ox;	971	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773	$self->{user_h} = $bh + $y - $oy;	972	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		973	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
774	$self->check_size;	974	$self->check_size;
775	};	975	};
776		976
777	} elsif ($x >= 0 && $x < $self->{w}	977	} elsif ($lr ^ $td) {
778	&& $y >= 0 && $y < $border) {
779
780	my ($ox, $oy) = ($ev->{x}, $ev->{y});	978	my ($ox, $oy) = ($ev->{x}, $ev->{y});
781	my ($bx, $by) = ($self->{x}, $self->{y});	979	my ($bx, $by) = ($self->{x}, $self->{y});
782		980
783	$self->{motion} = sub {	981	$self->{motion} = sub {
784	my ($ev, $x, $y) = @_;	982	my ($ev, $x, $y) = @_;
…		…
820	$tex[1]->draw_quad (0, 0, $w, $border);	1018	$tex[1]->draw_quad (0, 0, $w, $border);
821	$tex[3]->draw_quad (0, $border, $border, $ch);	1019	$tex[3]->draw_quad (0, $border, $border, $ch);
822	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
823	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);
824		1022
		1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825	my $bg = $tex[0];	1024	my $bg = $tex[0];
826		1025
827	# TODO: repeat texture not scale	1026	# TODO: repeat texture not scale
828	my $rep_x = $cw / $bg->{w};	1027	my $rep_x = $cw / $bg->{w};
829	my $rep_y = $ch / $bg->{h};	1028	my $rep_y = $ch / $bg->{h};
830		1029
831	glColor @{ $self->{bg} };	1030	glColor @{ $self->{bg} };
832		1031
833	$bg->{s} = $rep_x;	1032	$bg->{s} = $rep_x;
834	$bg->{t} = $rep_y;	1033	$bg->{t} = $rep_y;
835	$bg->{wrap_mode} = 1;	1034	$bg->{wrap_mode} = 1;
836	$bg->draw_quad ($border, $border, $cw, $ch);	1035	$bg->draw_quad ($border, $border, $cw, $ch);
837		1036
838	glDisable GL_TEXTURE_2D;	1037	glDisable GL_TEXTURE_2D;
839	glDisable GL_BLEND;	1038	glDisable GL_BLEND;
		1039	}
840		1040
841	$self->{title}->draw if $self->{title};	1041	$self->{title}->draw if $self->{title};
		1042
842	$self->child->draw;	1043	$self->child->draw;
843	}	1044	}
844		1045
845	#############################################################################	1046	#############################################################################
846		1047
…		…
868	$self->{children}[$y][$x] = $child;	1069	$self->{children}[$y][$x] = $child;
869		1070
870	$child->check_size;	1071	$child->check_size;
871	}	1072	}
872		1073
		1074	sub children {
		1075	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1076	}
		1077
873	# TODO: move to container class maybe? send childs a signal on removal?	1078	# TODO: move to container class maybe? send childs a signal on removal?
874	sub clear {	1079	sub clear {
875	my ($self) = @_;	1080	my ($self) = @_;
876		1081
		1082	my @children = $self->children;
877	delete $self->{children};	1083	delete $self->{children};
		1084
		1085	for (@children) {
		1086	delete $_->{parent};
		1087	$_->hide;
		1088	}
		1089
878	$self->update;	1090	$self->update;
879	}	1091	}
880		1092
881	sub get_wh {	1093	sub get_wh {
882	my ($self) = @_;	1094	my ($self) = @_;
…		…
1105		1317
1106	sub new {	1318	sub new {
1107	my ($class, %arg) = @_;	1319	my ($class, %arg) = @_;
1108		1320
1109	my $self = $class->SUPER::new (	1321	my $self = $class->SUPER::new (
1110	fg => [1, 1, 1],	1322	fg => [1, 1, 1],
1111	#font => default_font	1323	#font => default_font
1112	fontsize => 1,	1324	fontsize => 1,
1113	text => "",	1325	text => "",
1114	align => -1,	1326	align => -1,
1115	valign => -1,	1327	valign => -1,
1116	padding => 2,	1328	padding => 2,
1117	layout => new CFClient::Layout,	1329	layout => new CFClient::Layout,
1118	can_events => 0,	1330	can_events => 0,
1119	%arg	1331	%arg
1120	);	1332	);
1121		1333
1122	if (exists $self->{template}) {	1334	if (exists $self->{template}) {
…		…
1129	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130		1342
1131	$self	1343	$self
1132	}	1344	}
1133		1345
1134	sub escape_text {	1346	sub escape {
1135	local $_ = $_[1];	1347	local $_ = $_[1];
1136		1348
1137	s/&/&amp;/g;	1349	s/&/&amp;/g;
1138	s/>/&gt;/g;	1350	s/>/&gt;/g;
1139	s/</&lt;/g;	1351	s/</&lt;/g;
1140		1352
1141	$_[1]	1353	$_[1]
1142	}	1354	}
1143		1355
		1356	sub update {
		1357	my ($self) = @_;
		1358
		1359	delete $self->{texture};
		1360	$self->SUPER::update;
		1361	}
		1362
1144	sub set_text {	1363	sub set_text {
1145	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1146		1365
		1366	return if $self->{text} eq "T$text";
		1367	$self->{text} = "T$text";
		1368
1147	$self->{layout}->set_text ($text);	1369	$self->{layout}->set_text ($text);
1148		1370
1149	delete $self->{texture};	1371	delete $self->{texture};
		1372	$self->update;
1150	$self->check_size;	1373	$self->check_size;
1151	$self->update;
1152	}	1374	}
1153		1375
1154	sub set_markup {	1376	sub set_markup {
1155	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1156		1378
		1379	return if $self->{text} eq "M$markup";
		1380	$self->{text} = "M$markup";
		1381
1157	$self->{layout}->set_markup ($markup);	1382	$self->{layout}->set_markup ($markup);
1158		1383
1159	delete $self->{texture};	1384	delete $self->{texture};
		1385	$self->update;
1160	$self->check_size;	1386	$self->check_size;
1161	$self->update;
1162	}	1387	}
1163		1388
1164	sub size_request {	1389	sub size_request {
1165	my ($self) = @_;	1390	my ($self) = @_;
1166		1391
…		…
1195	sub set_fontsize {	1420	sub set_fontsize {
1196	my ($self, $fontsize) = @_;	1421	my ($self, $fontsize) = @_;
1197		1422
1198	$self->{fontsize} = $fontsize;	1423	$self->{fontsize} = $fontsize;
1199	delete $self->{texture};	1424	delete $self->{texture};
		1425
		1426	$self->update;
1200	$self->check_size;	1427	$self->check_size;
1201	$self->update;
1202	}	1428	}
1203		1429
1204	sub _draw {	1430	sub _draw {
1205	my ($self) = @_;	1431	my ($self) = @_;
1206		1432
…		…
1246		1472
1247	sub new {	1473	sub new {
1248	my $class = shift;	1474	my $class = shift;
1249		1475
1250	$class->SUPER::new (	1476	$class->SUPER::new (
1251	fg => [1, 1, 1],	1477	fg => [1, 1, 1],
1252	bg => [0, 0, 0, 0.2],	1478	bg => [0, 0, 0, 0.2],
1253	active_bg => [1, 1, 1, 0.5],	1479	active_bg => [1, 1, 1, 0.5],
1254	active_fg => [0, 0, 0],	1480	active_fg => [0, 0, 0],
1255	can_hover => 1,	1481	can_hover => 1,
1256	can_focus => 1,	1482	can_focus => 1,
1257	valign => 0,	1483	valign => 0,
1258	can_events => 1,	1484	can_events => 1,
1259	@_	1485	@_
1260	)	1486	)
1261	}	1487	}
1262		1488
…		…
1416	my ($self, $ev) = @_;	1642	my ($self, $ev) = @_;
1417		1643
1418	my $sym = $ev->{sym};	1644	my $sym = $ev->{sym};
1419		1645
1420	if ($sym == 13) {	1646	if ($sym == 13) {
		1647	unshift @{$self->{history}},
		1648	my $txt = $self->get_text;
		1649	$self->{history_pointer} = -1;
		1650	$self->{history_saveback} = '';
1421	$self->emit (activate => $self->get_text);	1651	$self->emit (activate => $txt);
1422	$self->update;	1652	$self->update;
		1653
		1654	} elsif ($sym == CFClient::SDLK_UP) {
		1655	if ($self->{history_pointer} < 0) {
		1656	$self->{history_saveback} = $self->get_text;
		1657	}
		1658	if (@{$self->{history} || []} > 0) {
		1659	$self->{history_pointer}++;
		1660	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1661	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1662	}
		1663	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1664	}
		1665
		1666	} elsif ($sym == CFClient::SDLK_DOWN) {
		1667	$self->{history_pointer}--;
		1668	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1669
		1670	if ($self->{history_pointer} >= 0) {
		1671	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1672	} else {
		1673	$self->set_text ($self->{history_saveback});
		1674	}
1423		1675
1424	} else {	1676	} else {
1425	$self->SUPER::key_down ($ev);	1677	$self->SUPER::key_down ($ev);
1426	}	1678	}
1427		1679
…		…
1441		1693
1442	sub new {	1694	sub new {
1443	my $class = shift;	1695	my $class = shift;
1444		1696
1445	$class->SUPER::new (	1697	$class->SUPER::new (
1446	padding => 4,	1698	padding => 4,
1447	fg => [1, 1, 1],	1699	fg => [1, 1, 1],
1448	bg => [1, 1, 1, 0.2],	1700	bg => [1, 1, 1, 0.2],
1449	active_fg => [0, 0, 1],	1701	active_fg => [0, 0, 1],
1450	can_hover => 1,	1702	can_hover => 1,
1451	align => 0,	1703	align => 0,
1452	valign => 0,	1704	valign => 0,
1453	can_events => 1,	1705	can_events => 1,
1454	@_	1706	@_
1455	)	1707	)
1456	}	1708	}
1457		1709
…		…
1616		1868
1617	package CFClient::UI::VGauge;	1869	package CFClient::UI::VGauge;
1618		1870
1619	our @ISA = CFClient::UI::Base::;	1871	our @ISA = CFClient::UI::Base::;
1620		1872
		1873	use List::Util qw(min max);
		1874
1621	use CFClient::OpenGL;	1875	use CFClient::OpenGL;
1622		1876
1623	my %tex = (	1877	my %tex = (
1624	food => [	1878	food => [
1625	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1880	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627	],	1881	],
1628	grace => [	1882	grace => [
1629	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1883	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1884	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631	],	1885	],
1632	hp => [	1886	hp => [
1633	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1887	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1888	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635	],	1889	],
1636	mana => [	1890	mana => [
1637	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1891	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1892	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639	],	1893	],
1640	);	1894	);
1641		1895
1642	# eg. VGauge->new (gauge => 'food'), default gauge: food	1896	# eg. VGauge->new (gauge => 'food'), default gauge: food
1643	sub new {	1897	sub new {
…		…
1662	}	1916	}
1663		1917
1664	sub set_max {	1918	sub set_max {
1665	my ($self, $max) = @_;	1919	my ($self, $max) = @_;
1666		1920
		1921	return if $self->{max_val} == $max;
		1922
1667	$self->{max_val} = $max;	1923	$self->{max_val} = $max;
		1924	$self->update;
1668	}	1925	}
1669		1926
1670	sub set_value {	1927	sub set_value {
1671	my ($self, $val, $max) = @_;	1928	my ($self, $val, $max) = @_;
1672		1929
1673	$self->set_max ($max)	1930	$self->set_max ($max)
1674	if defined $max;	1931	if defined $max;
1675		1932
1676	$max = $self->{max_val};	1933	return if $self->{val} == $val;
		1934
1677	$self->{val} = $val;	1935	$self->{val} = $val;
1678
1679	$self->update;	1936	$self->update;
1680	}	1937	}
1681		1938
1682	sub _draw {	1939	sub _draw {
1683	my ($self) = @_;	1940	my ($self) = @_;
1684		1941
1685	my $tex = $tex{$self->{type}};	1942	my $tex = $tex{$self->{type}};
		1943	my ($t1, $t2, $t3) = @$tex;
1686		1944
1687	my ($w, $h) = ($self->{w}, $self->{h});	1945	my ($w, $h) = ($self->{w}, $self->{h});
1688		1946
1689	if ($self->{vertical}) {	1947	if ($self->{vertical}) {
1690	glRotate 90, 0, 0, 1;	1948	glRotate 90, 0, 0, 1;
…		…
1692		1950
1693	($w, $h) = ($h, $w);	1951	($w, $h) = ($h, $w);
1694	}	1952	}
1695		1953
1696	my $ycut = $self->{val} / ($self->{max_val} || 1);	1954	my $ycut = $self->{val} / ($self->{max_val} || 1);
1697	$ycut = 1 if $self->{val} > $self->{max_val};
1698		1955
1699	my $t1 = $tex->[0];	1956	my $ycut1 = max 0, min 1, $ycut;
1700	my $t2 = $tex->[1];	1957	my $ycut2 = max 0, min 1, $ycut - 1;
		1958
		1959	my $h1 = $self->{h} * (1 - $ycut1);
		1960	my $h2 = $self->{h} * (1 - $ycut2);
1701		1961
1702	glEnable GL_BLEND;	1962	glEnable GL_BLEND;
1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1963	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704	glEnable GL_TEXTURE_2D;	1964	glEnable GL_TEXTURE_2D;
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1965	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706		1966
1707	my $h1 = $self->{h} - $ycut * $self->{h};
1708	my $h2 = $ycut * $self->{h};
1709
1710	glBindTexture GL_TEXTURE_2D, $t1->{name};	1967	glBindTexture GL_TEXTURE_2D, $t1->{name};
1711	glBegin GL_QUADS;	1968	glBegin GL_QUADS;
1712	glTexCoord 0 , 0; glVertex 0 , 0;	1969	glTexCoord 0 , 0; glVertex 0 , 0;
1713	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;	1970	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;	1971	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715	glTexCoord $t1->{s}, 0; glVertex $w, 0;	1972	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716	glEnd;	1973	glEnd;
1717		1974
		1975	my $ycut1 = List::Util::min 1, $ycut;
1718	glBindTexture GL_TEXTURE_2D, $t2->{name};	1976	glBindTexture GL_TEXTURE_2D, $t2->{name};
1719	glBegin GL_QUADS;	1977	glBegin GL_QUADS;
1720	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;	1978	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;	1979	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;	1980	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;	1981	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724	glEnd;	1982	glEnd;
		1983
		1984	if ($t3) {
		1985	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1986	glBegin GL_QUADS;
		1987	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1988	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1989	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1990	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1991	glEnd;
		1992	}
1725		1993
1726	glDisable GL_BLEND;	1994	glDisable GL_BLEND;
1727	glDisable GL_TEXTURE_2D;	1995	glDisable GL_TEXTURE_2D;
1728	}	1996	}
1729		1997
…		…
1735		2003
1736	sub new {	2004	sub new {
1737	my ($class, %arg) = @_;	2005	my ($class, %arg) = @_;
1738		2006
1739	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1740	tooltip => $arg{type},	2008	tooltip => $arg{type},
		2009	can_hover => 1,
		2010	can_events => 1,
1741	%arg,	2011	%arg,
1742	);	2012	);
1743		2013
1744	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	2014	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	2015	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	2016	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747		2017
1748	$self	2018	$self
1749	}	2019	}
1750		2020
1751	sub set_fontsize {	2021	sub set_fontsize {
…		…
1753		2023
1754	$self->{value}->set_fontsize ($fsize);	2024	$self->{value}->set_fontsize ($fsize);
1755	$self->{max} ->set_fontsize ($fsize);	2025	$self->{max} ->set_fontsize ($fsize);
1756	}	2026	}
1757		2027
		2028	sub set_max {
		2029	my ($self, $max) = @_;
		2030
		2031	$self->{gauge}->set_max ($max);
		2032	$self->{max}->set_text ($max);
		2033	}
		2034
1758	sub set_value {	2035	sub set_value {
1759	my ($self, $val, $max) = @_;	2036	my ($self, $val, $max) = @_;
1760		2037
1761	$self->set_max ($max)	2038	$self->set_max ($max)
1762	if defined $max;	2039	if defined $max;
1763		2040
1764	$self->{gauge}->set_value ($val, $max);	2041	$self->{gauge}->set_value ($val, $max);
1765	$self->{value}->set_text ($val);	2042	$self->{value}->set_text ($val);
1766	}
1767
1768	sub set_max {
1769	my ($self, $max) = @_;
1770
1771	$self->{gauge}->set_max ($max);
1772	$self->{max}->set_text ($max);
1773	}	2043	}
1774		2044
1775	#############################################################################	2045	#############################################################################
1776		2046
1777	package CFClient::UI::Slider;	2047	package CFClient::UI::Slider;
…		…
1796	# TODO: calculations are off	2066	# TODO: calculations are off
1797	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
1798	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
1799	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
1800	range => [0, 0, 100, 10],	2070	range => [0, 0, 100, 10],
1801	req_w => 20,	2071	req_w => $::WIDTH / 80,
1802	req_h => 20,	2072	req_h => $::WIDTH / 80,
1803	vertical => 0,	2073	vertical => 0,
1804	can_hover => 1,	2074	can_hover => 1,
1805	inner_pad => 5,	2075	inner_pad => 5,
1806	@_	2076	@_
1807	);	2077	);
…		…
1917		2187
1918	sub new {	2188	sub new {
1919	my $class = shift;	2189	my $class = shift;
1920		2190
1921	my $self = $class->SUPER::new (	2191	my $self = $class->SUPER::new (
1922	fontsize => 1,	2192	fontsize => 1,
		2193	can_events => 0,
1923	#font => default_font	2194	#font => default_font
1924	@_,	2195	@_,
1925		2196
1926	layout => (new CFClient::Layout),	2197	layout => (new CFClient::Layout),
1927	par => [],	2198	par => [],
1928	height => 0,	2199	height => 0,
1929	children => [	2200	children => [
1930	(new CFClient::UI::Empty expand => 1),	2201	(new CFClient::UI::Empty expand => 1),
1931	(new CFClient::UI::Slider vertical => 1),	2202	(new CFClient::UI::Slider vertical => 1),
1932	],	2203	],
1933	);	2204	);
1934		2205
1935	$self->{children}[1]->connect (changed => sub {	2206	$self->{children}[1]->connect (changed => sub { $self->update });
1936	$self->update;
1937	});
1938		2207
1939	$self	2208	$self
1940	}	2209	}
1941		2210
1942	sub set_fontsize {	2211	sub set_fontsize {
…		…
1950	my ($self, $text) = @_;	2219	my ($self, $text) = @_;
1951		2220
1952	my $layout = $self->{layout};	2221	my $layout = $self->{layout};
1953		2222
1954	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955	$layout->set_width ($self->{w});	2224	$layout->set_width ($self->{children}[0]{w});
1956	$layout->set_text ($text);	2225	$layout->set_text ($text);
1957		2226
1958	($layout->size)[1]	2227	($layout->size)[1]
1959	}	2228	}
1960		2229
…		…
2013	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014		2283
2015	delete $self->{texture};	2284	delete $self->{texture};
2016	}	2285	}
2017		2286
2018	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2287	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019	glClearColor 0, 0, 0, 1;	2288	glClearColor 0, 0, 0, 0;
2020	glClear GL_COLOR_BUFFER_BIT;	2289	glClear GL_COLOR_BUFFER_BIT;
2021		2290
2022	glEnable GL_BLEND;	2291	glEnable GL_BLEND;
2023	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024	glEnable GL_TEXTURE_2D;	2293	glEnable GL_TEXTURE_2D;
…		…
2056	}	2325	}
2057		2326
2058	sub _draw {	2327	sub _draw {
2059	my ($self) = @_;	2328	my ($self) = @_;
2060		2329
2061	if ($self->{texture}) {	2330	glEnable GL_BLEND;
		2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2062	glEnable GL_TEXTURE_2D;	2332	glEnable GL_TEXTURE_2D;
2063	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2334	glColor 1, 1, 1, 1;
2064	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065	glDisable GL_TEXTURE_2D;	2336	glDisable GL_TEXTURE_2D;
2066	}	2337	glDisable GL_BLEND;
2067		2338
2068	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
2069		2340
2070	}	2341	}
2071		2342
…		…
2119		2390
2120	sub new {	2391	sub new {
2121	my $class = shift;	2392	my $class = shift;
2122		2393
2123	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
2124	state => 0,	2395	state => 0,
2125	connect_activate => \&toggle_flopper,	2396	connect_activate => \&toggle_flopper,
2126	can_events => 1,
2127	@_	2397	@_
2128	);	2398	);
2129		2399
2130	if ($self->{state}) {	2400	if ($self->{state}) {
2131	$self->{state} = 0;	2401	$self->{state} = 0;
…		…
2166	@_,	2436	@_,
2167	can_events => 0,	2437	can_events => 0,
2168	)	2438	)
2169	}	2439	}
2170		2440
2171	sub set_text {	2441	sub set_markup {
2172	my ($self, $text) = @_;	2442	my ($self, $text) = @_;
2173		2443
2174	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175	$self->{label}->set_text ($text);	2445	$self->{label}->set_markup ($text);
2176	$self->add ($self->{label});	2446	$self->add ($self->{label});
2177	}	2447	}
2178		2448
2179	sub size_request {	2449	sub size_request {
2180	my ($self) = @_;	2450	my ($self) = @_;
2181		2451
2182	$self->child->set_max_size ($::WIDTH * 0.2);	2452	$self->child->set_max_size ($::WIDTH * 0.3);
2183		2453
2184	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185		2455
2186	($w + 4, $h + 4)	2456	($w + 4, $h + 4)
		2457	}
		2458
		2459	sub size_allocate {
		2460	my ($self, $w, $h) = @_;
		2461
		2462	$self->SUPER::size_allocate ($w - 4, $h - 4);
2187	}	2463	}
2188		2464
2189	sub _draw {	2465	sub _draw {
2190	my ($self) = @_;	2466	my ($self) = @_;
2191		2467
…		…
2216	$self->SUPER::_draw;	2492	$self->SUPER::_draw;
2217	}	2493	}
2218		2494
2219	#############################################################################	2495	#############################################################################
2220		2496
		2497	package CFClient::UI::Face;
		2498
		2499	our @ISA = CFClient::UI::Base::;
		2500
		2501	use CFClient::OpenGL;
		2502
		2503	sub new {
		2504	my $class = shift;
		2505
		2506	$class->SUPER::new (
		2507	aspect => 1,
		2508	@_,
		2509	)
		2510	}
		2511
		2512	sub size_request {
		2513	(32, 8)
		2514	}
		2515
		2516	sub _draw {
		2517	my ($self) = @_;
		2518
		2519	return unless $::CONN;#d# manage and cache textures differently
		2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2521
		2522	# TODO animation
		2523	if ($tex) {
		2524	glEnable GL_BLEND;
		2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2526	glEnable GL_TEXTURE_2D;
		2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2528	glColor 1, 1, 1, 1;
		2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2530	glDisable GL_TEXTURE_2D;
		2531	glDisable GL_BLEND;
		2532	}
		2533	}
		2534
		2535	#############################################################################
		2536
		2537	package CFClient::UI::InventoryItem;
		2538
		2539	our @ISA = CFClient::UI::HBox::;
		2540
		2541	sub new {
		2542	my $class = shift;
		2543
		2544	my %args = @_;
		2545
		2546	my $item = $args{item};
		2547
		2548	my $desc = $item->{nrof} < 2
		2549	? $item->{name}
		2550	: "$item->{nrof} $item->{name_pl}";
		2551
		2552
		2553	my $self = $class->SUPER::new (
		2554	can_hover => 1,
		2555	can_events => 1,
		2556	tooltip => (CFClient::UI::Label->escape ($desc)
		2557	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2558	connect_button_down => sub {
		2559	my ($self, $ev, $x, $y) = @_;
		2560
		2561	# todo: maybe put examine on 1? but should just be a tooltip :(
		2562	if ($ev->{button} == 1) {
		2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2564	} elsif ($ev->{button} == 2) {
		2565	$::CONN->send ("apply $item->{tag}");
		2566	} elsif ($ev->{button} == 3) {
		2567	CFClient::UI::Menu->new (
		2568	items => [
		2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2570	[
		2571	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2572	sub { $::CONN->send ("lock $item->{tag}") },
		2573	],
		2574	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2575	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2577	],
		2578	)->popup ($ev);
		2579	}
		2580
		2581	1
		2582	},
		2583	%args
		2584	);
		2585	$self->add(new CFClient::UI::Face
		2586	can_events => 0,
		2587	face => $item->{face},
		2588	anim => $item->{anim},
		2589	animspeed => $item->{animspeed});
		2590	$self->add(new CFClient::UI::Label
		2591	can_events => 0,
		2592	text => $desc);
		2593
		2594	$self
		2595	}
		2596
		2597	#############################################################################
		2598
		2599	package CFClient::UI::Inventory;
		2600
		2601	our @ISA = CFClient::UI::ScrolledWindow::;
		2602
		2603	sub new {
		2604	my $class = shift;
		2605
		2606	my $self = $class->SUPER::new (
		2607	scrolled => (new CFClient::UI::VBox),
		2608	@_,
		2609	);
		2610
		2611	$self
		2612	}
		2613
		2614	sub set_items {
		2615	my ($self, $items) = @_;
		2616
		2617	$self->{scrolled}->clear;
		2618	return unless $items;
		2619
		2620	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2621
		2622	$self->{real_items} = \@items;
		2623
		2624	for my $item (@items) {
		2625	my $desc = $item->{nrof} < 2
		2626	? $item->{name}
		2627	: "$item->{nrof} $item->{name_pl}";
		2628
		2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2630	}
		2631
		2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2633	}
		2634
		2635	sub size_request {
		2636	my ($self) = @_;
		2637	($self->{req_w}, $self->{req_h});
		2638	}
		2639
		2640	#############################################################################
		2641
		2642	package CFClient::UI::Menu;
		2643
		2644	our @ISA = CFClient::UI::FancyFrame::;
		2645
		2646	use CFClient::OpenGL;
		2647
		2648	sub new {
		2649	my $class = shift;
		2650
		2651	my $self = $class->SUPER::new (
		2652	items => [],
		2653	z => 100,
		2654	@_,
		2655	);
		2656
		2657	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2658
		2659	for my $item (@{ $self->{items} }) {
		2660	my ($widget, $cb) = @$item;
		2661
		2662	# handle various types of items, only text for now
		2663	if (!ref $widget) {
		2664	$widget = new CFClient::UI::Label
		2665	can_hover => 1,
		2666	can_events => 1,
		2667	text => $widget;
		2668	}
		2669
		2670	$self->{item}{$widget} = $item;
		2671
		2672	$self->{vbox}->add ($widget);
		2673	}
		2674
		2675	$self
		2676	}
		2677
		2678	# popup given the event (must be a mouse button down event currently)
		2679	sub popup {
		2680	my ($self, $ev) = @_;
		2681
		2682	$self->emit ("popdown");
		2683
		2684	# maybe save $GRAB? must be careful about events...
		2685	$GRAB = $self;
		2686	$self->{button} = $ev->{button};
		2687
		2688	$self->show;
		2689	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2690	}
		2691
		2692	sub mouse_motion {
		2693	my ($self, $ev, $x, $y) = @_;
		2694
		2695	# TODO: should use vbox->find_widget or so
		2696	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2697	$self->{hover} = $self->{item}{$HOVER};
		2698	}
		2699
		2700	sub button_up {
		2701	my ($self, $ev, $x, $y) = @_;
		2702
		2703	if ($ev->{button} == $self->{button}) {
		2704	undef $GRAB;
		2705	$self->hide;
		2706
		2707	$self->emit ("popdown");
		2708	$self->{hover}[1]->() if $self->{hover};
		2709	}
		2710	}
		2711
		2712	#############################################################################
		2713
2221	package CFClient::UI::Root;	2714	package CFClient::UI::Root;
2222		2715
2223	our @ISA = CFClient::UI::Container::;	2716	our @ISA = CFClient::UI::Container::;
2224		2717
2225	use CFClient::OpenGL;	2718	use CFClient::OpenGL;
2226		2719
2227	sub check_size {	2720	sub check_size {
2228	my ($self) = @_;	2721	my ($self) = @_;
2229		2722
2230	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2723	$self->configure (0, 0, $self->{w}, $self->{h});
2231	}	2724	}
2232		2725
2233	sub size_request {	2726	sub size_request {
2234	($::WIDTH, $::HEIGHT)	2727	my ($self) = @_;
		2728
		2729	($self->{w}, $self->{h})
		2730	}
		2731
		2732	sub size_allocate {
		2733	my ($self, $w, $h) = @_;
		2734
		2735	my $old_w = $self->{old_w};
		2736	my $old_h = $self->{old_h};
		2737
		2738	if ($old_w && $old_h) {
		2739	for my $child ($self->children) {
		2740	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2741	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2742	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2743	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2744	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2745	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2748	}
		2749	}
		2750
		2751	$self->{old_w} = $w;
		2752	$self->{old_h} = $h;
2235	}	2753	}
2236		2754
2237	sub configure {	2755	sub configure {
2238	my ($self, $x, $y, $w, $h) = @_;	2756	my ($self, $x, $y, $w, $h) = @_;
2239		2757
2240	$self->SUPER::configure ($x, $y, $w, $h);	2758	$self->SUPER::configure ($x, $y, $w, $h);
2241		2759
2242	for my $child (@{$self->{children}}) {	2760	for my $child ($self->children) {
2243	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244		2762
2245	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2246	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2764	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247	$child->configure ($X, $Y, $W,$H);	2765	$child->configure ($X, $Y, $W, $H);
2248	}	2766	}
2249	}	2767	}
2250		2768
2251	sub _topleft {	2769	sub _topleft {
2252	my ($self, $x, $y) = @_;	2770	my ($self, $x, $y) = @_;

Diff Legend

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