[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC

…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	21	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	22	}
23		23
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->{x}, $ev->{y});
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->{x}, $ev->{y});
43		43
44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
…		…
54	}	54	}
55	}	55	}
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->{x}, $ev->{y});
60		60
61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
…		…
87		87
88	package CFClient::UI::Base;	88	package CFClient::UI::Base;
89		89
90	use strict;	90	use strict;
91		91
92	use SDL::OpenGL;	92	use CFClient::OpenGL;
93		93
94	sub new {	94	sub new {
95	my $class = shift;	95	my $class = shift;
96		96
97	my $self = bless {	97	my $self = bless {
98	x => 0,	98	x => 0,
99	y => 0,	99	y => 0,
100	z => 0,	100	z => 0,
101	w => -1,	101	can_events => 1,
102	h => -1,
103	@_	102	@_
104	}, $class;	103	}, $class;
105		104
106	for (keys %$self) {	105	for (keys %$self) {
107	if (/^connect_(.*)$/) {	106	if (/^connect_(.*)$/) {
…		…
110	}	109	}
111		110
112	$self	111	$self
113	}	112	}
114		113
		114	sub show {
		115	my ($self) = @_;
		116
		117	return if $self->{parent};
		118
		119	$CFClient::UI::ROOT->add ($self);
		120	}
		121
		122	sub hide {
		123	my ($self) = @_;
		124
		125	return unless $self->{parent};
		126
		127	$self->{parent}->remove ($self);
		128	}
		129
115	sub move {	130	sub move {
116	my ($self, $x, $y, $z) = @_;	131	my ($self, $x, $y, $z) = @_;
117		132
118	$self->{x} = int $x;	133	$self->{x} = int $x;
119	$self->{y} = int $y;	134	$self->{y} = int $y;
…		…
126	0	141	0
127	}	142	}
128		143
129	sub size_request {	144	sub size_request {
130	require Carp;	145	require Carp;
131	Carp::confess "size_request is abtract";	146	Carp::confess "size_request is abstract";
132	}	147	}
133		148
134	sub configure {	149	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	150	my ($self, $x, $y, $w, $h) = @_;
136		151
		152	if ($self->{aspect}) {
		153	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		154	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		155
		156	# use alignment to adjust x, y
		157
		158	$x += int +($w - $w2) * 0.5;
		159	$y += int +($h - $h2) * 0.5;
		160
		161	($w, $h) = ($w2, $h2);
		162	}
		163
		164	if ($self->{x} != $x \|\| $self->{y} != $y) {
137	$self->{x} = $x;	165	$self->{x} = $x;
138	$self->{y} = $y;	166	$self->{y} = $y;
		167	$self->update;
		168	}
139		169
140	return unless $self->{w} != $w \|\| $self->{h} != $h;	170	if ($self->{w} != $w \|\| $self->{h} != $h) {
141
142	$self->{w} = $w;	171	$self->{w} = $w;
143	$self->{h} = $h;	172	$self->{h} = $h;
144		173
145	$self->size_allocate ($w, $h);	174	$self->size_allocate ($w, $h);
		175	$self->update;
		176	}
146	}	177	}
147		178
148	sub size_allocate {	179	sub size_allocate {
149	# nothing to be done	180	# nothing to be done
150	}	181	}
…		…
248	}	279	}
249		280
250	sub find_widget {	281	sub find_widget {
251	my ($self, $x, $y) = @_;	282	my ($self, $x, $y) = @_;
252		283
		284	return () unless $self->{can_events};
		285
253	return $self	286	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	287	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	288	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		289
257	()	290	()
…		…
264	}	297	}
265		298
266	sub check_size {	299	sub check_size {
267	my ($self) = @_;	300	my ($self) = @_;
268		301
		302	return unless $self->{parent};
		303
269	my ($w, $h) = $self->size_request;	304	my ($w, $h) = $self->size_request;
270		305
271	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {	306	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
272	$self->{req_w} = $w;	307	$self->{req_w} = $w;
273	$self->{req_h} = $h;	308	$self->{req_h} = $h;
274		309
275	$self->{parent}->check_size	310	$self->{parent}->check_size;
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);
279	$self->update;
280	}	311	}
281	}	312	}
282		313
283	sub update {	314	sub update {
284	my ($self) = @_;	315	my ($self) = @_;
…		…
288	}	319	}
289		320
290	sub connect {	321	sub connect {
291	my ($self, $signal, $cb) = @_;	322	my ($self, $signal, $cb) = @_;
292		323
293	push @{ $self->{cb}{$signal} }, $cb;	324	push @{ $self->{signal_cb}{$signal} }, $cb;
294	}	325	}
295		326
296	sub emit {	327	sub emit {
297	my ($self, $signal, @args) = @_;	328	my ($self, $signal, @args) = @_;
298		329
		330	for my $cb (@{$self->{signal_cb}{$signal} \|\| []}) {
299	$_->($self, @args)	331	$cb->($self, @args);
300	for @{$self->{cb}{$signal} \|\| []};	332	}
301	}	333	}
302		334
303	sub DESTROY {	335	sub DESTROY {
304	my ($self) = @_;	336	my ($self) = @_;
305		337
…		…
311	package CFClient::UI::DrawBG;	343	package CFClient::UI::DrawBG;
312		344
313	our @ISA = CFClient::UI::Base::;	345	our @ISA = CFClient::UI::Base::;
314		346
315	use strict;	347	use strict;
316	use SDL::OpenGL;	348	use CFClient::OpenGL;
317		349
318	sub new {	350	sub new {
319	my $class = shift;	351	my $class = shift;
320		352
321	# range [value, low, high, page]	353	# range [value, low, high, page]
…		…
350		382
351	package CFClient::UI::Empty;	383	package CFClient::UI::Empty;
352		384
353	our @ISA = CFClient::UI::Base::;	385	our @ISA = CFClient::UI::Base::;
354		386
		387	sub new {
		388	my ($class, %arg) = @_;
		389	$class->SUPER::new (can_events => 0, %arg);
		390	}
		391
355	sub size_request {	392	sub size_request {
356	(0, 0)	393	(0, 0)
357	}	394	}
358		395
359	sub draw { }	396	sub draw { }
…		…
367	sub new {	404	sub new {
368	my ($class, %arg) = @_;	405	my ($class, %arg) = @_;
369		406
370	my $children = delete $arg{children} \|\| [];	407	my $children = delete $arg{children} \|\| [];
371		408
372	my $self = $class->SUPER::new (children => [], %arg);	409	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
373	$self->add ($_) for @$children;	410	$self->add ($_) for @$children;
374		411
375	$self	412	$self
376	}	413	}
377		414
…		…
385	$self->{children} = [	422	$self->{children} = [
386	sort { $a->{z} <=> $b->{z} }	423	sort { $a->{z} <=> $b->{z} }
387	@{$self->{children}}, $child	424	@{$self->{children}}, $child
388	];	425	];
389		426
390	$self->{w} = $self->{h} = -1;
391
392	$child->check_size;	427	$child->check_size;
393	}	428	}
394		429
395	sub remove {	430	sub remove {
396	my ($self, $widget) = @_;	431	my ($self, $child) = @_;
397		432
		433	delete $child->{parent};
		434
398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	435	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399		436
400	$self->check_size;	437	$self->check_size;
401	}	438	}
402		439
403	sub find_widget {	440	sub find_widget {
…		…
435		472
436	$class->SUPER::new (children => [$child], %arg)	473	$class->SUPER::new (children => [$child], %arg)
437	}	474	}
438		475
439	sub add {	476	sub add {
440	my ($self, $widget) = @_;	477	my ($self, $child) = @_;
441		478
442	$self->{children} = [];	479	$self->{children} = [];
443		480
444	$self->SUPER::add ($widget);	481	$self->SUPER::add ($child);
445	}	482	}
446		483
447	sub remove {	484	sub remove {
448	my ($self, $widget) = @_;	485	my ($self, $widget) = @_;
449		486
…		…
469		506
470	package CFClient::UI::Window;	507	package CFClient::UI::Window;
471		508
472	our @ISA = CFClient::UI::Bin::;	509	our @ISA = CFClient::UI::Bin::;
473		510
474	use SDL::OpenGL;	511	use CFClient::OpenGL;
475		512
476	sub new {	513	sub new {
477	my ($class, %arg) = @_;	514	my ($class, %arg) = @_;
478		515
479	my $self = $class->SUPER::new (%arg);	516	my $self = $class->SUPER::new (%arg);
…		…
533	sub new { die }	570	sub new { die }
534		571
535	sub size_request {	572	sub size_request {
536	my ($self) = @_;	573	my ($self) = @_;
537		574
538	@$self{qw(child_w child_h)} = $self->child->size_request;	575	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	576	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540		577
541	@$self{qw(child_w child_h)}	578	@$self{qw(child_w child_h)}
542	}	579	}
543		580
…		…
552		589
553	package CFClient::UI::Frame;	590	package CFClient::UI::Frame;
554		591
555	our @ISA = CFClient::UI::Bin::;	592	our @ISA = CFClient::UI::Bin::;
556		593
557	use SDL::OpenGL;	594	use CFClient::OpenGL;
558
559	sub size_request {
560	my ($self) = @_;
561	my $chld = $self->child
562	or return (0, 0);
563
564	$chld->move (2, 2);
565
566	map { $_ + 4 } $chld->size_request;
567	}
568
569	sub size_allocate {
570	my ($self, $x, $y, $w, $h) = @_;
571
572	$self->child->configure (2, 2, $w - 4, $h - 4);
573	}
574
575	sub _draw {
576	my ($self) = @_;
577
578	my $chld = $self->child;
579
580	my ($w, $h) = $chld->size_request;
581
582	glBegin GL_QUADS;
583	glColor 0, 0, 0;
584	glVertex 0 , 0;
585	glVertex 0 , $h + 4;
586	glVertex $w + 4 , $h + 4;
587	glVertex $w + 4 , 0;
588	glEnd;
589
590	$chld->draw;
591	}
592
593	#############################################################################
594
595	package CFClient::UI::FancyFrame;
596
597	our @ISA = CFClient::UI::Bin::;
598
599	use SDL::OpenGL;
600
601	my @tex =
602	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604		595
605	sub new {	596	sub new {
606	my $class = shift;	597	my $class = shift;
607		598
608	# TODO: user_x, user_y, overwrite moveto?
609
610	$class->SUPER::new (	599	my $self = $class->SUPER::new (
611	bg => [1, 1, 1, 1],	600	bg => [1, 1, 1, 1],
612	border_bg => [1, 1, 1, 1],	601	border_bg => [1, 1, 1, 1],
613	border => int $::FONTSIZE * 0.8,	602	border => 0.8,
614	@_	603	@_
615	)	604	);
		605
		606	$self
		607	}
		608
		609	sub set_size {
		610	my ($self, $w, $h) = @_;
		611	$self->{req_w} = $w;
		612	$self->{req_h} = $h;
		613	$self->check_size;
616	}	614	}
617		615
618	sub size_request {	616	sub size_request {
619	my ($self) = @_;	617	my ($self) = @_;
620		618	($self->{req_w}, $self->{req_h})
621	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623	my ($w, $h) = $self->SUPER::size_request;
624
625	(
626	$w + $self->{border} * 2,
627	$h + $self->{border} * 2,
628	)
629	}	619	}
630		620
631	sub size_allocate {	621	sub size_allocate {
632	my ($self, $w, $h) = @_;	622	my ($self, $w, $h) = @_;
		623	$self->{w} = $w;
		624	$self->{h} = $h;
		625	$self->child->configure (0, 0, $w, $h);
		626	}
633		627
		628	sub _draw {
		629	my ($self) = @_;
		630
		631	my ($w, $h) = ($self->{w}, $self->{h});
		632
		633	glEnable GL_BLEND;
		634	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		635	glEnable GL_TEXTURE_2D;
		636	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		637
		638	# glBegin GL_QUADS;
		639	# glColor 0, 0, 0, 0;
		640	# glVertex 0 , 0;
		641	# glVertex 0 , $h;
		642	# glVertex $w, $h;
		643	# glVertex $w, 0;
		644	# glEnd;
		645
		646
		647	$self->child->draw;
		648	glDisable GL_BLEND;
		649	glDisable GL_TEXTURE_2D;
		650	}
		651
		652	#############################################################################
		653
		654	package CFClient::UI::FancyFrame;
		655
		656	our @ISA = CFClient::UI::Bin::;
		657
		658	use CFClient::OpenGL;
		659
		660	my @tex =
		661	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		662	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		663
		664	sub new {
		665	my $class = shift;
		666
		667	# TODO: user_x, user_y, overwrite moveto?
		668
		669	my $self = $class->SUPER::new (
		670	bg => [1, 1, 1, 1],
		671	border_bg => [1, 1, 1, 1],
		672	border => 0.8,
		673	can_events => 1,
		674	@_
		675	);
		676
		677	$self->{title} &&= new CFClient::UI::Label
		678	align => 0,
		679	valign => 1,
		680	text => $self->{title},
		681	fontsize => 1;
		682
		683	$self
		684	}
		685
		686	sub border {
		687	int $_[0]{border} * $::FONTSIZE
		688	}
		689
		690	sub size_request {
		691	my ($self) = @_;
		692
		693	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		694
		695	my ($w, $h) = $self->SUPER::size_request;
		696
		697	(
		698	$w + $self->border * 2,
		699	$h + $self->border * 2,
		700	)
		701	}
		702
		703	sub size_allocate {
		704	my ($self, $w, $h) = @_;
		705
634	$h -= List::Util::max 0, $self->{border} * 2;	706	$h -= List::Util::max 0, $self->border * 2;
635	$w -= List::Util::max 0, $self->{border} * 2;	707	$w -= List::Util::max 0, $self->border * 2;
636		708
		709	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		710	if $self->{title};
		711
637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	712	$self->child->configure ($self->border, $self->border, $w, $h);
638	}	713	}
639		714
640	sub button_down {	715	sub button_down {
641	my ($self, $ev, $x, $y) = @_;	716	my ($self, $ev, $x, $y) = @_;
642		717
		718	my $border = $self->border;
		719
643	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	720	if ($x < $self->{w} && $x >= $self->{w} - $border
644	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	721	&& $y < $self->{h} && $y >= $self->{h} - $border) {
645		722
646	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	723	my ($ox, $oy) = ($ev->{x}, $ev->{y});
647	my ($bw, $bh) = ($self->{w}, $self->{h});	724	my ($bw, $bh) = ($self->{w}, $self->{h});
648		725
649	$self->{motion} = sub {	726	$self->{motion} = sub {
650	my ($ev, $x, $y) = @_;	727	my ($ev, $x, $y) = @_;
651		728
652	($x, $y) = ($ev->motion_x, $ev->motion_y);	729	($x, $y) = ($ev->{x}, $ev->{y});
653		730
654	$self->{user_w} = $bw + $x - $ox;	731	$self->{user_w} = $bw + $x - $ox;
655	$self->{user_h} = $bh + $y - $oy;	732	$self->{user_h} = $bh + $y - $oy;
656	$self->check_size;	733	$self->check_size;
657	};	734	};
658		735
659	} elsif ($x >= 0 && $x < $self->{w}	736	} elsif ($x >= 0 && $x < $self->{w}
660	&& $y >= 0 && $y < $self->{border}) {	737	&& $y >= 0 && $y < $border) {
661		738
662	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	739	my ($ox, $oy) = ($ev->{x}, $ev->{y});
663	my ($bx, $by) = ($self->{x}, $self->{y});	740	my ($bx, $by) = ($self->{x}, $self->{y});
664		741
665	$self->{motion} = sub {	742	$self->{motion} = sub {
666	my ($ev, $x, $y) = @_;	743	my ($ev, $x, $y) = @_;
667		744
668	($x, $y) = ($ev->motion_x, $ev->motion_y);	745	($x, $y) = ($ev->{x}, $ev->{y});
669		746
670	$self->move ($bx + $x - $ox, $by + $y - $oy);	747	$self->move ($bx + $x - $ox, $by + $y - $oy);
671	$self->update;	748	$self->update;
672	};	749	};
673	}	750	}
…		…
694	glEnable GL_BLEND;	771	glEnable GL_BLEND;
695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	772	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696	glEnable GL_TEXTURE_2D;	773	glEnable GL_TEXTURE_2D;
697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	774	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698		775
		776	my $border = $self->border;
		777
699	glColor @{ $self->{border_bg} };	778	glColor @{ $self->{border_bg} };
700	$tex[1]->draw_quad (0, 0, $w, $self->{border});	779	$tex[1]->draw_quad (0, 0, $w, $border);
701	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	780	$tex[3]->draw_quad (0, $border, $border, $ch);
702	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	781	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	782	$tex[4]->draw_quad (0, $h - $border, $w, $border);
704		783
705	my $bg = $tex[0];	784	my $bg = $tex[0];
706		785
707	# TODO: repeat texture not scale	786	# TODO: repeat texture not scale
708	my $rep_x = $cw / $bg->{w};	787	my $rep_x = $cw / $bg->{w};
…		…
711	glColor @{ $self->{bg} };	790	glColor @{ $self->{bg} };
712		791
713	$bg->{s} = $rep_x;	792	$bg->{s} = $rep_x;
714	$bg->{t} = $rep_y;	793	$bg->{t} = $rep_y;
715	$bg->{wrap_mode} = 1;	794	$bg->{wrap_mode} = 1;
716	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	795	$bg->draw_quad ($border, $border, $cw, $ch);
717		796
718	glDisable GL_TEXTURE_2D;	797	glDisable GL_TEXTURE_2D;
719	glDisable GL_BLEND;	798	glDisable GL_BLEND;
720		799
		800	$self->{title}->draw if $self->{title};
721	$self->child->draw;	801	$self->child->draw;
722	}	802	}
723		803
724	#############################################################################	804	#############################################################################
725		805
…		…
727		807
728	our @ISA = CFClient::UI::Base::;	808	our @ISA = CFClient::UI::Base::;
729		809
730	use List::Util qw(max sum);	810	use List::Util qw(max sum);
731		811
732	use SDL::OpenGL;	812	use CFClient::OpenGL;
733		813
734	sub new {	814	sub new {
735	my $class = shift;	815	my $class = shift;
736		816
737	$class->SUPER::new (	817	$class->SUPER::new (
…		…
744	my ($self, $x, $y, $child) = @_;	824	my ($self, $x, $y, $child) = @_;
745		825
746	$child->set_parent ($self);	826	$child->set_parent ($self);
747	$self->{children}[$y][$x] = $child;	827	$self->{children}[$y][$x] = $child;
748		828
749	$self->{w} = $self->{h} = -1;
750
751	$child->check_size;	829	$child->check_size;
752	}	830	}
753		831
754	# TODO: move to container class maybe? send childs a signal on removal?	832	# TODO: move to container class maybe? send childs a signal on removal?
755	sub clear {	833	sub clear {
…		…
769	or next;	847	or next;
770		848
771	for my $x (0 .. $#$row) {	849	for my $x (0 .. $#$row) {
772	my $widget = $row->[$x]	850	my $widget = $row->[$x]
773	or next;	851	or next;
774	my ($w, $h) = $widget->size_request;	852	my ($w, $h) = @$widget{qw(req_w req_h)};
775		853
776	$w[$x] = max $w[$x], $w;	854	$w[$x] = max $w[$x], $w;
777	$h[$y] = max $h[$y], $h;	855	$h[$y] = max $h[$y], $h;
778	}	856	}
779	}	857	}
…		…
884		962
885	($h, $w) = ($w, $h);	963	($h, $w) = ($w, $h);
886		964
887	my $children = $self->{children};	965	my $children = $self->{children};
888		966
889	my @h = map +($_->size_request)[0], @$children;	967	my @h = map $_->{req_w}, @$children;
890		968
891	my $req_h = List::Util::sum @h;	969	my $req_h = List::Util::sum @h;
892		970
893	if ($req_h > $h) {	971	if ($req_h > $h) {
894	# ah well, not enough space	972	# ah well, not enough space
…		…
942	sub size_allocate {	1020	sub size_allocate {
943	my ($self, $w, $h) = @_;	1021	my ($self, $w, $h) = @_;
944		1022
945	my $children = $self->{children};	1023	my $children = $self->{children};
946		1024
947	my @h = map +($_->size_request)[1], @$children;	1025	my @h = map $_->{req_h}, @$children;
948		1026
949	my $req_h = List::Util::sum @h;	1027	my $req_h = List::Util::sum @h;
950		1028
951	if ($req_h > $h) {	1029	if ($req_h > $h) {
952	# ah well, not enough space	1030	# ah well, not enough space
…		…
980		1058
981	package CFClient::UI::Label;	1059	package CFClient::UI::Label;
982		1060
983	our @ISA = CFClient::UI::Base::;	1061	our @ISA = CFClient::UI::Base::;
984		1062
985	use SDL::OpenGL;	1063	use CFClient::OpenGL;
986		1064
987	sub new {	1065	sub new {
988	my ($class, %arg) = @_;	1066	my ($class, %arg) = @_;
989		1067
990	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
991	fg => [1, 1, 1],	1069	fg => [1, 1, 1],
992	fontsize => $::FONTSIZE,	1070	fontsize => 1,
993	text => "",	1071	text => "",
994	align => -1,	1072	align => -1,
995	valign => -1,	1073	valign => -1,
996	padding => 2,	1074	padding => 2,
997	layout => new CFClient::Layout,	1075	layout => new CFClient::Layout,
		1076	can_events => 0,
998	%arg	1077	%arg
999	);	1078	);
1000		1079
1001	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1080	if (exists $self->{template}) {
		1081	my $layout = new CFClient::Layout;
		1082	$layout->set_text (delete $self->{template});
		1083	$self->{template} = $layout;
		1084	}
1002		1085
1003	$self->set_text (delete $self->{text}) if exists $self->{text};	1086	$self->set_text (delete $self->{text}) if exists $self->{text};
1004	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1087	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005		1088
1006	$self	1089	$self
…		…
1020	my ($self, $text) = @_;	1103	my ($self, $text) = @_;
1021		1104
1022	$self->{layout}->set_text ($text);	1105	$self->{layout}->set_text ($text);
1023		1106
1024	delete $self->{texture};	1107	delete $self->{texture};
		1108	$self->check_size;
1025	$self->update;	1109	$self->update;
1026	}	1110	}
1027		1111
1028	sub set_markup {	1112	sub set_markup {
1029	my ($self, $markup) = @_;	1113	my ($self, $markup) = @_;
1030		1114
1031	$self->{layout}->set_markup ($markup);	1115	$self->{layout}->set_markup ($markup);
1032		1116
1033	delete $self->{texture};	1117	delete $self->{texture};
		1118	$self->check_size;
1034	$self->update;	1119	$self->update;
1035	}	1120	}
1036		1121
1037	sub size_request {	1122	sub size_request {
1038	my ($self) = @_;	1123	my ($self) = @_;
1039		1124
1040	$self->{layout}->set_width;	1125	$self->{layout}->set_width;
1041	$self->{layout}->set_height ($self->{fontsize});	1126	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042		1127
1043	my ($w, $h) = $self->{layout}->size;	1128	my ($w, $h) = $self->{layout}->size;
		1129
		1130	if (exists $self->{template}) {
		1131	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1132
		1133	my ($w2, $h2) = $self->{template}->size;
		1134
		1135	$w = List::Util::max $w, $w2;
		1136	$h = List::Util::max $h, $h2;
		1137	}
1044		1138
1045	(	1139	(
1046	$w + $self->{padding} * 2,	1140	$w + $self->{padding} * 2,
1047	$h + $self->{padding} * 2,	1141	$h + $self->{padding} * 2,
1048	)	1142	)
…		…
1052	my ($self, $w, $h) = @_;	1146	my ($self, $w, $h) = @_;
1053		1147
1054	delete $self->{texture};	1148	delete $self->{texture};
1055	}	1149	}
1056		1150
1057	sub update {	1151	sub set_fontsize {
1058	my ($self) = @_;	1152	my ($self, $fontsize) = @_;
1059		1153
1060	delete $self->{texture};	1154	$self->{fontsize} = $fontsize;
1061	$self->SUPER::update;	1155	$self->check_size;
1062	}	1156	}
1063		1157
1064	sub _draw {	1158	sub _draw {
1065	my ($self) = @_;	1159	my ($self) = @_;
1066		1160
1067	my $tex = $self->{texture} \|\|= do {	1161	my $tex = $self->{texture} \|\|= do {
1068	$self->{layout}->set_width ($self->{w});	1162	$self->{layout}->set_width ($self->{w});
1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1163	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070	new_from_layout CFClient::Texture $self->{layout}	1164	new_from_layout CFClient::Texture $self->{layout}
1071	};	1165	};
1072		1166
1073	glEnable GL_BLEND;	1167	glEnable GL_BLEND;
1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1168	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1099		1193
1100	package CFClient::UI::EntryBase;	1194	package CFClient::UI::EntryBase;
1101		1195
1102	our @ISA = CFClient::UI::Label::;	1196	our @ISA = CFClient::UI::Label::;
1103		1197
1104	use SDL;	1198	use CFClient::OpenGL;
1105	use SDL::OpenGL;
1106		1199
1107	sub new {	1200	sub new {
1108	my $class = shift;	1201	my $class = shift;
1109		1202
1110	$class->SUPER::new (	1203	$class->SUPER::new (
…		…
1113	active_bg => [1, 1, 1, 0.5],	1206	active_bg => [1, 1, 1, 0.5],
1114	active_fg => [0, 0, 0],	1207	active_fg => [0, 0, 0],
1115	can_hover => 1,	1208	can_hover => 1,
1116	can_focus => 1,	1209	can_focus => 1,
1117	valign => 0,	1210	valign => 0,
		1211	can_events => 1,
1118	@_	1212	@_
1119	)	1213	)
1120	}	1214	}
1121		1215
1122	sub _set_text {	1216	sub _set_text {
…		…
1124		1218
1125	delete $self->{cur_h};	1219	delete $self->{cur_h};
1126		1220
1127	return if $self->{text} eq $text;	1221	return if $self->{text} eq $text;
1128		1222
		1223	delete $self->{texture};
		1224
1129	$self->{last_activity} = $::NOW;	1225	$self->{last_activity} = $::NOW;
1130	$self->{text} = $text;	1226	$self->{text} = $text;
1131		1227
1132	$text =~ s/./*/g if $self->{hidden};	1228	$text =~ s/./*/g if $self->{hidden};
1133	$self->{layout}->set_text ("$text ");	1229	$self->{layout}->set_text ("$text ");
…		…
1148	}	1244	}
1149		1245
1150	sub size_allocate {	1246	sub size_allocate {
1151	my ($self, $w, $h) = @_;	1247	my ($self, $w, $h) = @_;
1152		1248
1153	$self->_set_text ($self->{text});	1249	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154	}	1250	}
1155		1251
1156	sub set_text {	1252	sub set_text {
1157	my ($self, $text) = @_;	1253	my ($self, $text) = @_;
1158		1254
…		…
1162	}	1258	}
1163		1259
1164	sub key_down {	1260	sub key_down {
1165	my ($self, $ev) = @_;	1261	my ($self, $ev) = @_;
1166		1262
1167	my $mod = $ev->key_mod;	1263	my $mod = $ev->{mod};
1168	my $sym = $ev->key_sym;	1264	my $sym = $ev->{sym};
1169
1170	my $uni = $ev->key_unicode;	1265	my $uni = $ev->{unicode};
1171		1266
1172	my $text = $self->get_text;	1267	my $text = $self->get_text;
1173		1268
1174	if ($sym == SDLK_BACKSPACE) {	1269	if ($sym == 8) {
1175	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1270	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176	} elsif ($sym == SDLK_DELETE) {	1271	} elsif ($sym == 127) {
1177	substr $text, $self->{cursor}, 1, "";	1272	substr $text, $self->{cursor}, 1, "";
1178	} elsif ($sym == SDLK_LEFT) {	1273	} elsif ($sym == CFClient::SDLK_LEFT) {
1179	--$self->{cursor} if $self->{cursor};	1274	--$self->{cursor} if $self->{cursor};
1180	} elsif ($sym == SDLK_RIGHT) {	1275	} elsif ($sym == CFClient::SDLK_RIGHT) {
1181	++$self->{cursor} if $self->{cursor} < length $self->{text};	1276	++$self->{cursor} if $self->{cursor} < length $self->{text};
1182	} elsif ($sym == SDLK_HOME) {	1277	} elsif ($sym == CFClient::SDLK_HOME) {
1183	$self->{cursor} = 0;	1278	$self->{cursor} = 0;
1184	} elsif ($sym == SDLK_END) {	1279	} elsif ($sym == CFClient::SDLK_END) {
1185	$self->{cursor} = length $text;	1280	$self->{cursor} = length $text;
1186	} elsif ($sym == SDLK_ESCAPE) {	1281	} elsif ($sym == 27) {
1187	$self->emit ('escape');	1282	$self->emit ('escape');
1188	} elsif ($uni) {	1283	} elsif ($uni) {
1189	substr $text, $self->{cursor}++, 0, chr $uni;	1284	substr $text, $self->{cursor}++, 0, chr $uni;
1190	}	1285	}
1191		1286
…		…
1266		1361
1267	package CFClient::UI::Entry;	1362	package CFClient::UI::Entry;
1268		1363
1269	our @ISA = CFClient::UI::EntryBase::;	1364	our @ISA = CFClient::UI::EntryBase::;
1270		1365
1271	use SDL;	1366	use CFClient::OpenGL;
1272	use SDL::OpenGL;
1273		1367
1274	sub key_down {	1368	sub key_down {
1275	my ($self, $ev) = @_;	1369	my ($self, $ev) = @_;
1276		1370
1277	my $sym = $ev->key_sym;	1371	my $sym = $ev->{sym};
1278		1372
1279	if ($sym == SDLK_RETURN) {	1373	if ($sym == 13) {
1280	$self->emit (activate => $self->get_text);	1374	$self->emit (activate => $self->get_text);
1281	$self->update;	1375	$self->update;
1282		1376
1283	} else {	1377	} else {
1284	$self->SUPER::key_down ($ev);	1378	$self->SUPER::key_down ($ev);
…		…
1290		1384
1291	package CFClient::UI::Button;	1385	package CFClient::UI::Button;
1292		1386
1293	our @ISA = CFClient::UI::Label::;	1387	our @ISA = CFClient::UI::Label::;
1294		1388
1295	use SDL;	1389	use CFClient::OpenGL;
1296	use SDL::OpenGL;
1297		1390
1298	my @tex =	1391	my @tex =
1299	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1392	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300	qw(b1_button_active.png);	1393	qw(b1_button_active.png);
1301		1394
1302	sub new {	1395	sub new {
1303	my $class = shift;	1396	my $class = shift;
1304		1397
…		…
1308	bg => [1, 1, 1, 0.2],	1401	bg => [1, 1, 1, 0.2],
1309	active_fg => [0, 0, 1],	1402	active_fg => [0, 0, 1],
1310	can_hover => 1,	1403	can_hover => 1,
1311	align => 0,	1404	align => 0,
1312	valign => 0,	1405	valign => 0,
		1406	can_events => 1,
1313	@_	1407	@_
1314	)	1408	)
1315	}	1409	}
1316		1410
1317	sub button_up {	1411	sub button_up {
…		…
1351	package CFClient::UI::CheckBox;	1445	package CFClient::UI::CheckBox;
1352		1446
1353	our @ISA = CFClient::UI::DrawBG::;	1447	our @ISA = CFClient::UI::DrawBG::;
1354		1448
1355	my @tex =	1449	my @tex =
1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1451	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358		1452
1359	use SDL;	1453	use CFClient::OpenGL;
1360	use SDL::OpenGL;
1361		1454
1362	sub new {	1455	sub new {
1363	my $class = shift;	1456	my $class = shift;
1364		1457
1365	$class->SUPER::new (	1458	$class->SUPER::new (
…		…
1411	glDisable GL_BLEND;	1504	glDisable GL_BLEND;
1412	}	1505	}
1413		1506
1414	#############################################################################	1507	#############################################################################
1415		1508
1416	package CFClient::UI::VGauge;	1509	package CFClient::UI::Image;
1417		1510
1418	our @ISA = CFClient::UI::Base::;	1511	our @ISA = CFClient::UI::Base::;
1419		1512
1420	use SDL::OpenGL;	1513	use CFClient::OpenGL;
		1514	use Carp qw/confess/;
1421		1515
1422	my %tex = (	1516	our %loaded_images;
1423	food => [
1424	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426	],
1427	grace => [
1428	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430	],
1431	hp => [
1432	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434	],
1435	mana => [
1436	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438	],
1439	);
1440		1517
1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
1442	sub new {	1518	sub new {
1443	my $class = shift;	1519	my $class = shift;
1444		1520
1445	my $self = $class->SUPER::new (gauge => 'food', @_);	1521	my $self = $class->SUPER::new (can_events => 0, @_);
		1522
		1523	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1524
		1525	$loaded_images{$self->{image}} \|\|=
		1526	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1527
		1528	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1529
		1530	Scalar::Util::weaken $loaded_images{$self->{image}};
		1531
		1532	$self->{aspect} = $tex->{w} / $tex->{h};
1446		1533
1447	$self	1534	$self
1448	}	1535	}
1449		1536
1450	sub size_request {	1537	sub size_request {
1451	my ($self) = @_;	1538	my ($self) = @_;
1452		1539
1453	my $tex = $tex{$self->{gauge}}[0];	1540	($self->{tex}->{w}, $self->{tex}->{h})
1454
1455	@$tex{qw(w h)}
1456	}
1457
1458	sub set_max {
1459	my ($self, $max) = @_;
1460
1461	$self->{max_val} = $max;
1462	}
1463
1464	sub set_value {
1465	my ($self, $val, $max) = @_;
1466
1467	$self->set_max ($max)
1468	if defined $max;
1469
1470	$max = $self->{max_val};
1471	$self->{val} = $val;
1472
1473	$self->update;
1474	}	1541	}
1475		1542
1476	sub _draw {	1543	sub _draw {
1477	my ($self) = @_;	1544	my ($self) = @_;
1478		1545
1479	my $tex = $tex{$self->{gauge}};	1546	my $tex = $self->{tex};
1480		1547
1481	my ($w, $h) = ($self->{w}, $self->{h});	1548	my ($w, $h) = ($self->{w}, $self->{h});
1482		1549
1483	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);	1550	if ($self->{rot90}) {
1484	$ycut = 1 if $self->{val} > $self->{max_val};	1551	glRotate 90, 0, 0, 1;
		1552	glTranslate 0, -$self->{w}, 0;
1485		1553
1486	my $t1 = $tex->[0];	1554	($w, $h) = ($h, $w);
1487	my $t2 = $tex->[1];	1555	}
1488		1556
1489	glEnable GL_BLEND;	1557	glEnable GL_BLEND;
1490	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1558	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491	glEnable GL_TEXTURE_2D;	1559	glEnable GL_TEXTURE_2D;
1492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493		1561
		1562	$tex->draw_quad (0, 0, $w, $h);
		1563
		1564	glDisable GL_BLEND;
		1565	glDisable GL_TEXTURE_2D;
		1566	}
		1567
		1568	#############################################################################
		1569
		1570	package CFClient::UI::VGauge;
		1571
		1572	our @ISA = CFClient::UI::Base::;
		1573
		1574	use CFClient::OpenGL;
		1575
		1576	my %tex = (
		1577	food => [
		1578	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1579	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1580	],
		1581	grace => [
		1582	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1583	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1584	],
		1585	hp => [
		1586	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1587	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1588	],
		1589	mana => [
		1590	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1591	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1592	],
		1593	);
		1594
		1595	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1596	sub new {
		1597	my $class = shift;
		1598
		1599	my $self = $class->SUPER::new (
		1600	type => 'food',
		1601	@_
		1602	);
		1603
		1604	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1605
		1606	$self
		1607	}
		1608
		1609	sub size_request {
		1610	my ($self) = @_;
		1611
		1612	#my $tex = $tex{$self->{type}}[0];
		1613	#@$tex{qw(w h)}
		1614	(0, 0)
		1615	}
		1616
		1617	sub set_max {
		1618	my ($self, $max) = @_;
		1619
		1620	$self->{max_val} = $max;
		1621	}
		1622
		1623	sub set_value {
		1624	my ($self, $val, $max) = @_;
		1625
		1626	$self->set_max ($max)
		1627	if defined $max;
		1628
		1629	$max = $self->{max_val};
		1630	$self->{val} = $val;
		1631
		1632	$self->update;
		1633	}
		1634
		1635	sub _draw {
		1636	my ($self) = @_;
		1637
		1638	my $tex = $tex{$self->{type}};
		1639
		1640	my ($w, $h) = ($self->{w}, $self->{h});
		1641
		1642	if ($self->{vertical}) {
		1643	glRotate 90, 0, 0, 1;
		1644	glTranslate 0, -$self->{w}, 0;
		1645
		1646	($w, $h) = ($h, $w);
		1647	}
		1648
		1649	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1650	$ycut = 1 if $self->{val} > $self->{max_val};
		1651
		1652	my $t1 = $tex->[0];
		1653	my $t2 = $tex->[1];
		1654
		1655	glEnable GL_BLEND;
		1656	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1657	glEnable GL_TEXTURE_2D;
		1658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1659
1494	my $h1 = $self->{h} - $ycut * $self->{h};	1660	my $h1 = $self->{h} - $ycut * $self->{h};
1495	my $h2 = $ycut * $self->{h};	1661	my $h2 = $ycut * $self->{h};
1496		1662
1497	my $yp = 0;
1498
1499	glBindTexture (GL_TEXTURE_2D, $t1->{name});	1663	glBindTexture GL_TEXTURE_2D, $t1->{name};
1500	glBegin (GL_QUADS);	1664	glBegin GL_QUADS;
1501	glTexCoord (0, 0); glVertex (0 , $yp);	1665	glTexCoord 0 , 0; glVertex 0 , 0;
1502	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);	1666	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1503	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);	1667	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1504	glTexCoord (1, 0); glVertex (0 + $w, $yp);	1668	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1505	glEnd ();	1669	glEnd;
1506		1670
1507	$yp += $h1;
1508
1509	glBindTexture (GL_TEXTURE_2D, $t2->{name});	1671	glBindTexture GL_TEXTURE_2D, $t2->{name};
1510	glBegin (GL_QUADS);	1672	glBegin GL_QUADS;
1511	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);	1673	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1512	glTexCoord (0, 1); glVertex (0 , $yp + $h2);	1674	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1513	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);	1675	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1514	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);	1676	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1515	glEnd ();	1677	glEnd;
1516		1678
1517	glDisable GL_BLEND;	1679	glDisable GL_BLEND;
1518	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1519	}	1681	}
1520		1682
1521	#############################################################################	1683	#############################################################################
1522		1684
		1685	package CFClient::UI::Gauge;
		1686
		1687	our @ISA = CFClient::UI::VBox::;
		1688
		1689	sub new {
		1690	my ($class, %arg) = shift;
		1691
		1692	my $self = $class->SUPER::new (
		1693	@_,
		1694	);
		1695
		1696	$self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999";
		1697	$self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999";
		1698	$self->add ($self->{value});
		1699	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
		1700	$self->add ($self->{max});
		1701
		1702	$self
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707	(($self->{max}->size_request)[0], 0)
		1708	}
		1709
		1710	sub set_fontsize {
		1711	my ($self, $fsize) = @_;
		1712
		1713	$self->{value}->set_fontsize ($fsize);
		1714	$self->{max} ->set_fontsize ($fsize);
		1715	}
		1716
		1717	sub set_value {
		1718	my ($self, $val, $max) = @_;
		1719
		1720	$self->set_max ($max)
		1721	if defined $max;
		1722
		1723	$self->{gauge}->set_value ($val, $max);
		1724	$self->{value}->set_text ($val);
		1725	}
		1726
		1727	sub set_max {
		1728	my ($self, $max) = @_;
		1729
		1730	$self->{gauge}->set_max ($max);
		1731	$self->{max}->set_text ($max);
		1732	}
		1733
		1734	#############################################################################
		1735
1523	package CFClient::UI::Slider;	1736	package CFClient::UI::Slider;
1524		1737
1525	use strict;	1738	use strict;
1526		1739
1527	use SDL::OpenGL;	1740	use CFClient::OpenGL;
1528		1741
1529	our @ISA = CFClient::UI::DrawBG::;	1742	our @ISA = CFClient::UI::DrawBG::;
1530		1743
1531	my @tex =	1744	my @tex =
1532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1745	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1542	# TODO: calculations are off	1755	# TODO: calculations are off
1543	my $self = $class->SUPER::new (	1756	my $self = $class->SUPER::new (
1544	fg => [1, 1, 1],	1757	fg => [1, 1, 1],
1545	active_fg => [0, 0, 0],	1758	active_fg => [0, 0, 0],
1546	range => [0, 0, 100, 10],	1759	range => [0, 0, 100, 10],
1547	req_w => 40,	1760	req_w => 20,
1548	req_h => 13,	1761	req_h => 20,
1549	vertical => 0,	1762	vertical => 0,
1550	can_hover => 1,	1763	can_hover => 1,
1551	inner_pad => 5,	1764	inner_pad => 5,
1552	@_	1765	@_
1553	);	1766	);
…		…
1657		1870
1658	package CFClient::UI::TextView;	1871	package CFClient::UI::TextView;
1659		1872
1660	our @ISA = CFClient::UI::HBox::;	1873	our @ISA = CFClient::UI::HBox::;
1661		1874
1662	use SDL::OpenGL;	1875	use CFClient::OpenGL;
1663		1876
1664	sub new {	1877	sub new {
1665	my $class = shift;	1878	my $class = shift;
1666		1879
1667	my $self = $class->SUPER::new (	1880	my $self = $class->SUPER::new (
1668	req_w => $::WIDTH / 6,
1669	req_h => $::HEIGHT / 6,
1670	fontsize => $::FONTSIZE,	1881	fontsize => 1,
1671	@_,	1882	@_,
1672		1883
1673	layout => (new CFClient::Layout),	1884	layout => (new CFClient::Layout),
1674	par => [],	1885	par => [],
1675	height => 0,	1886	height => 0,
…		…
1696	sub text_height {	1907	sub text_height {
1697	my ($self, $text) = @_;	1908	my ($self, $text) = @_;
1698		1909
1699	my $layout = $self->{layout};	1910	my $layout = $self->{layout};
1700		1911
1701	$layout->set_height ($self->{fontsize});	1912	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702	$layout->set_width ($self->{w});	1913	$layout->set_width ($self->{w});
1703	$layout->set_text ($text);	1914	$layout->set_text ($text);
1704		1915
1705	($layout->size)[1]	1916	($layout->size)[1]
1706	}	1917	}
…		…
1710		1921
1711	$self->{need_reflow}++;	1922	$self->{need_reflow}++;
1712	$self->update;	1923	$self->update;
1713	}	1924	}
1714		1925
1715	sub size_request {
1716	my ($self) = @_;
1717
1718	($self->{req_w}, $self->{req_h})
1719	}
1720
1721	sub size_allocate {	1926	sub size_allocate {
1722	my ($self, $w, $h) = @_;	1927	my ($self, $w, $h) = @_;
1723		1928
		1929	$self->SUPER::size_allocate ($w, $h);
		1930
1724	$self->{layout}->set_height ($self->{fontsize});	1931	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725	$self->{layout}->set_width ($self->{w});	1932	$self->{layout}->set_width ($self->{children}[0]{w});
1726		1933
1727	$self->reflow;	1934	$self->reflow;
1728	$self->update;
1729	}	1935	}
1730		1936
1731	sub add_paragraph {	1937	sub add_paragraph {
1732	my ($self, $color, $text) = @_;	1938	my ($self, $color, $text) = @_;
1733		1939
…		…
1818		2024
1819	}	2025	}
1820		2026
1821	#############################################################################	2027	#############################################################################
1822		2028
1823	package CFClient::UI::MapWidget;
1824
1825	use strict;
1826
1827	use List::Util qw(min max);
1828
1829	use SDL;
1830	use SDL::OpenGL;
1831
1832	our @ISA = CFClient::UI::Base::;
1833
1834	sub new {
1835	my $class = shift;
1836
1837	$class->SUPER::new (
1838	z => -1,
1839	can_focus => 1,
1840	list => (glGenLists 1),
1841	@_
1842	)
1843	}
1844
1845	sub key_down {
1846	print "MAPKEYDOWN\n";
1847	}
1848
1849	sub key_up {
1850	}
1851
1852	sub button_down {
1853	my ($self, $ev, $x, $y) = @_;
1854
1855	$self->focus_in;
1856
1857	if ($ev->button == 2) {
1858	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861	$self->{motion} = sub {
1862	my ($ev, $x, $y) = @_;
1863
1864	($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866	$::CFG->{map_shift_x} = $bw + $x - $ox;
1867	$::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869	$self->update;
1870	};
1871	}
1872	}
1873
1874	sub button_up {
1875	my ($self, $ev, $x, $y) = @_;
1876
1877	delete $self->{motion};
1878	}
1879
1880	sub mouse_motion {
1881	my ($self, $ev, $x, $y) = @_;
1882
1883	$self->{motion}->($ev, $x, $y) if $self->{motion};
1884	}
1885
1886	sub size_request {
1887	(
1888	1 + 32 * int $::WIDTH / 32,
1889	1 + 32 * int $::HEIGHT / 32,
1890	)
1891	}
1892
1893	sub update {
1894	my ($self) = @_;
1895
1896	$self->{need_update} = 1;
1897	$self->SUPER::update;
1898	}
1899
1900	sub draw {
1901	my ($self) = @_;
1902
1903	if (delete $self->{need_update}) {
1904	glNewList $self->{list}, GL_COMPILE;
1905
1906	if ($::MAP) {
1907	my $sw = int $::WIDTH / 32;
1908	my $sh = int $::HEIGHT / 32;
1909
1910	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913	glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917	if ($::CFG->{fow_enable}) {
1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920	glConvolutionFilter2D (
1921	GL_CONVOLUTION_2D,
1922	GL_ALPHA,
1923	3, 3,
1924	GL_ALPHA, GL_FLOAT,
1925	pack "f*",
1926	0.1, 0.1, 0.1,
1927	0.1, 0.2, 0.1,
1928	0.1, 0.1, 0.1,
1929	);
1930	glEnable GL_CONVOLUTION_2D;
1931	}
1932
1933	$self->{fow_texture} = new CFClient::Texture
1934	w => $w,
1935	h => $h,
1936	data => $data,
1937	internalformat => GL_ALPHA,
1938	format => GL_ALPHA;
1939
1940	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942	glEnable GL_BLEND;
1943	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944	glEnable GL_TEXTURE_2D;
1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947	glColor +($::CFG->{fow_intensity}) x 3, 1;
1948	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950	glDisable GL_TEXTURE_2D;
1951	glDisable GL_BLEND;
1952	}
1953
1954	# HACK BEGIN
1955	{
1956	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957	my ($w, $h) = (250, 250);
1958
1959	glEnable GL_BLEND;
1960	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961	glEnable GL_TEXTURE_2D;
1962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964	$self->{mapmap_texture} =
1965	new CFClient::Texture
1966	w => $w,
1967	h => $h,
1968	data => $::MAP->mapmap ($w, $h),
1969	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971	$self->{mapmap_texture}->draw_quad (100, 100);
1972
1973	glDisable GL_TEXTURE_2D;
1974	glDisable GL_BLEND;
1975	}
1976	# HACK END
1977	}
1978
1979	glEndList;
1980	}
1981
1982	glPushMatrix;
1983	glCallList $self->{list};
1984	glPopMatrix;
1985
1986	if ($FOCUS != $self) {
1987	glColor 64/255, 64/255, 64/255;
1988	glLogicOp GL_AND;
1989	glEnable GL_COLOR_LOGIC_OP;
1990	glBegin GL_QUADS;
1991	glVertex 0, 0;
1992	glVertex 0, $::HEIGHT;
1993	glVertex $::WIDTH, $::HEIGHT;
1994	glVertex $::WIDTH, 0;
1995	glEnd;
1996	glDisable GL_COLOR_LOGIC_OP;
1997	}
1998	}
1999
2000	my %DIR = (
2001	SDLK_KP8, [1, "north"],
2002	SDLK_KP9, [2, "northeast"],
2003	SDLK_KP6, [3, "east"],
2004	SDLK_KP3, [4, "southeast"],
2005	SDLK_KP2, [5, "south"],
2006	SDLK_KP1, [6, "southwest"],
2007	SDLK_KP4, [7, "west"],
2008	SDLK_KP7, [8, "northwest"],
2009
2010	SDLK_UP, [1, "north"],
2011	SDLK_RIGHT, [3, "east"],
2012	SDLK_DOWN, [5, "south"],
2013	SDLK_LEFT, [7, "west"],
2014	);
2015
2016	sub key_down {
2017	my ($self, $ev) = @_;
2018
2019	my $mod = $ev->key_mod;
2020	my $sym = $ev->key_sym;
2021
2022	if ($sym == SDLK_KP5) {
2023	$::CONN->user_send ("stay fire");
2024	} elsif ($sym == SDLK_a) {
2025	$::CONN->user_send ("apply");
2026	} elsif ($sym == SDLK_QUOTE) {
2027	$self->emit ('activate_console');
2028	} elsif ($sym == SDLK_SLASH) {
2029	$self->emit ('activate_console' => '/');
2030	} elsif (exists $DIR{$sym}) {
2031	if ($mod & KMOD_SHIFT) {
2032	$self->{shft}++;
2033	$::CONN->user_send ("fire $DIR{$sym}[0]");
2034	} elsif ($mod & KMOD_CTRL) {
2035	$self->{ctrl}++;
2036	$::CONN->user_send ("run $DIR{$sym}[0]");
2037	} else {
2038	$::CONN->user_send ("$DIR{$sym}[1]");
2039	}
2040	}
2041	}
2042
2043	sub key_up {
2044	my ($self, $ev) = @_;
2045
2046	my $mod = $ev->key_mod;
2047	my $sym = $ev->key_sym;
2048
2049	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050	$::CONN->user_send ("fire_stop");
2051	}
2052	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053	$::CONN->user_send ("run_stop");
2054	}
2055	}
2056
2057	#############################################################################
2058
2059	package CFClient::UI::Animator;	2029	package CFClient::UI::Animator;
2060		2030
2061	use SDL::OpenGL;	2031	use CFClient::OpenGL;
2062		2032
2063	our @ISA = CFClient::UI::Bin::;	2033	our @ISA = CFClient::UI::Bin::;
2064		2034
2065	sub moveto {	2035	sub moveto {
2066	my ($self, $x, $y) = @_;	2036	my ($self, $x, $y) = @_;
…		…
2106	my $class = shift;	2076	my $class = shift;
2107		2077
2108	my $self = $class->SUPER::new (	2078	my $self = $class->SUPER::new (
2109	state => 0,	2079	state => 0,
2110	connect_activate => \&toggle_flopper,	2080	connect_activate => \&toggle_flopper,
		2081	can_events => 1,
2111	@_	2082	@_
2112	);	2083	);
2113		2084
2114	if ($self->{state}) {	2085	if ($self->{state}) {
2115	$self->{state} = 0;	2086	$self->{state} = 0;
…		…
2139		2110
2140	package CFClient::UI::Root;	2111	package CFClient::UI::Root;
2141		2112
2142	our @ISA = CFClient::UI::Container::;	2113	our @ISA = CFClient::UI::Container::;
2143		2114
2144	use SDL::OpenGL;	2115	use CFClient::OpenGL;
2145		2116
2146	sub check_size {	2117	sub check_size {
2147	my ($self) = @_;	2118	my ($self) = @_;
2148		2119
2149	$self->configure (0, 0, $::WITH, $::HEIGHT);	2120	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2150	}	2121	}
2151		2122
2152	sub size_request {	2123	sub size_request {
2153	($::WIDTH, $::HEIGHT)	2124	($::WIDTH, $::HEIGHT)
2154	}	2125	}
…		…
2156	sub configure {	2127	sub configure {
2157	my ($self, $x, $y, $w, $h) = @_;	2128	my ($self, $x, $y, $w, $h) = @_;
2158		2129
2159	$self->SUPER::configure ($x, $y, $w, $h);	2130	$self->SUPER::configure ($x, $y, $w, $h);
2160		2131
2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2162	for @{$self->{children}};	2132	for my $child (@{$self->{children}}) {
		2133	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2134
		2135	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2136	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2137	$child->configure ($X, $Y, $W,$H);
		2138	}
2163	}	2139	}
2164		2140
2165	sub _topleft {	2141	sub _topleft {
2166	my ($self, $x, $y) = @_;	2142	my ($self, $x, $y) = @_;
2167		2143
…		…
2175	::refresh ();	2151	::refresh ();
2176	}	2152	}
2177		2153
2178	sub add {	2154	sub add {
2179	my ($self, $child) = @_;	2155	my ($self, $child) = @_;
		2156
		2157	# integerize window positions
		2158	$child->{x} = int $child->{x};
		2159	$child->{y} = int $child->{y};
2180		2160
2181	$self->SUPER::add ($child);	2161	$self->SUPER::add ($child);
2182	}	2162	}
2183		2163
2184	sub on_refresh {	2164	sub on_refresh {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC vs. Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC