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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.134 by root, Wed Apr 19 06:06:45 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
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->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->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->translate ($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->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->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->translate ($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;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
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->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->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;
65		65
66	$hover->update if $hover && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
83		96
84	my $self = bless {	97	my $self = bless {
85	x => 0,	98	x => 0,
86	y => 0,	99	y => 0,
87	z => 0,	100	z => 0,
88	w => -1,
89	h => -1,
90	@_	101	@_
91	}, $class;	102	}, $class;
92		103
93	for (keys %$self) {	104	for (keys %$self) {
94	if (/^connect_(.*)$/) {	105	if (/^connect_(.*)$/) {
…		…
97	}	108	}
98		109
99	$self	110	$self
100	}	111	}
101		112
		113	sub show {
		114	my ($self) = @_;
		115
		116	return if $self->{parent};
		117
		118	$CFClient::UI::ROOT->add ($self);
		119	}
		120
		121	sub hide {
		122	my ($self) = @_;
		123
		124	return unless $self->{parent};
		125
		126	$self->{parent}->remove ($self);
		127	}
		128
102	sub move {	129	sub move {
103	my ($self, $x, $y, $z) = @_;	130	my ($self, $x, $y, $z) = @_;
		131
104	$self->{x} = $x;	132	$self->{x} = int $x;
105	$self->{y} = $y;	133	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	134	$self->{z} = $z if defined $z;
		135
		136	$self->update;
107	}	137	}
108		138
109	sub needs_redraw {	139	sub needs_redraw {
110	0	140	0
111	}	141	}
…		…
113	sub size_request {	143	sub size_request {
114	require Carp;	144	require Carp;
115	Carp::confess "size_request is abtract";	145	Carp::confess "size_request is abtract";
116	}	146	}
117		147
118	sub _size_allocate {	148	sub configure {
119	my ($self, $x, $y, $w, $h) = @_;	149	my ($self, $x, $y, $w, $h) = @_;
120		150
121	$self->{x} = $x;	151	$self->{x} = $x;
122	$self->{y} = $y;	152	$self->{y} = $y;
123		153
124	return unless $self->{w} != $w \|\| $self->{h} != $h;	154	return unless $self->{w} != $w \|\| $self->{h} != $h;
125		155
126	$self->{w} = $w;	156	$self->{w} = $w;
127	$self->{h} = $h;	157	$self->{h} = $h;
128		158
129	1	159	$self->size_allocate ($w, $h);
		160	$self->update;
130	}	161	}
131		162
132	sub size_allocate {	163	sub size_allocate {
		164	# nothing to be done
		165	}
		166
		167	# return top left coordinates
		168	sub _topleft {
133	my ($self, $x, $y, $w, $h) = @_;	169	my ($self, $x, $y) = @_;
134		170
135	$self->_size_allocate ($x, $y, $w, $h);	171	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136	}	172	}
137		173
138	# translate global coordinates to local coordinate system	174	# translate global coordinates to local coordinate system
139	sub translate {	175	sub coord2local {
140	my ($self, $x, $y) = @_;	176	my ($self, $x, $y) = @_;
141		177
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	178	my ($X, $Y) = $self->_topleft;
		179	($x - $X, $y - $Y)
		180	}
		181
		182	# translate local coordinates to global coordinate system
		183	sub coord2global {
		184	my ($self, $x, $y) = @_;
		185
		186	my ($X, $Y) = $self->_topleft;
		187	($x + $X, $y + $Y)
143	}	188	}
144		189
145	sub focus_in {	190	sub focus_in {
146	my ($self) = @_;	191	my ($self) = @_;
147		192
148	return if $FOCUS == $self;	193	return if $FOCUS == $self;
149	return unless $self->{can_focus};	194	return unless $self->{can_focus};
150		195
151	my $focus = $FOCUS; $FOCUS = $self;	196	my $focus = $FOCUS; $FOCUS = $self;
		197
		198	$self->emit (focus_in => $focus);
		199
152	$focus->update if $focus;	200	$focus->update if $focus;
153	$FOCUS->update;	201	$FOCUS->update;
154	}	202	}
155		203
156	sub focus_out {	204	sub focus_out {
157	my ($self) = @_;	205	my ($self) = @_;
158		206
159	return unless $FOCUS == $self;	207	return unless $FOCUS == $self;
160		208
161	my $focus = $FOCUS; undef $FOCUS;	209	my $focus = $FOCUS; undef $FOCUS;
		210
		211	$self->emit (focus_out => $focus);
		212
162	$focus->update if $focus; #?	213	$focus->update if $focus; #?
163	}	214	}
164		215
165	sub mouse_motion { }	216	sub mouse_motion { }
166	sub button_up { }	217	sub button_up { }
…		…
190	glPopMatrix;	241	glPopMatrix;
191		242
192	if ($self == $HOVER && $self->{can_hover}) {	243	if ($self == $HOVER && $self->{can_hover}) {
193	my ($x, $y) = @$self{qw(x y)};	244	my ($x, $y) = @$self{qw(x y)};
194		245
195	glColor 0, 0, 1, 0.2;	246	glColor 1, 0.8, 0.5, 0.2;
196	glEnable GL_BLEND;	247	glEnable GL_BLEND;
197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	248	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198	glBegin GL_QUADS;	249	glBegin GL_QUADS;
199	glVertex $x , $y;	250	glVertex $x , $y;
200	glVertex $x + $self->{w}, $y;	251	glVertex $x + $self->{w}, $y;
…		…
220		271
221	()	272	()
222	}	273	}
223		274
224	sub set_parent {	275	sub set_parent {
225	my ($self, $par) = @_;	276	my ($self, $parent) = @_;
226		277
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	278	Scalar::Util::weaken ($self->{parent} = $parent);
229	}	279	}
230		280
231	sub get_parent {	281	sub check_size {
232	$_[0]->{parent}	282	my ($self) = @_;
		283
		284	my ($w, $h) = $self->size_request;
		285
		286	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
		287	$self->{req_w} = $w;
		288	$self->{req_h} = $h;
		289
		290	$self->{parent}->check_size
		291	if $self->{parent};
		292	}
233	}	293	}
234		294
235	sub update {	295	sub update {
236	my ($self) = @_;	296	my ($self) = @_;
237		297
…		…
240	}	300	}
241		301
242	sub connect {	302	sub connect {
243	my ($self, $signal, $cb) = @_;	303	my ($self, $signal, $cb) = @_;
244		304
245	push @{ $self->{cb}{$signal} }, $cb;	305	push @{ $self->{signal_cb}{$signal} }, $cb;
246	}	306	}
247		307
248	sub emit {	308	sub emit {
249	my ($self, $signal, @args) = @_;	309	my ($self, $signal, @args) = @_;
250		310
		311	for my $cb (@{$self->{signal_cb}{$signal} \|\| []}) {
251	$_->($self, @args)	312	$cb->($self, @args);
252	for @{$self->{cb}{$signal} \|\| []};	313	}
253	}	314	}
254		315
255	sub DESTROY {	316	sub DESTROY {
256	my ($self) = @_;	317	my ($self) = @_;
257		318
…		…
326		387
327	$self	388	$self
328	}	389	}
329		390
330	sub add {	391	sub add {
331	my ($self, $chld) = @_;	392	my ($self, $child) = @_;
332		393
333	$chld->set_parent ($self);	394	$child->set_parent ($self);
		395
		396	use sort 'stable';
334		397
335	$self->{children} = [	398	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	399	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	400	@{$self->{children}}, $child
338	];	401	];
339		402
340	$self->{w} = $self->{h} = -1;	403	$child->check_size;
341	$self->update;
342	}	404	}
343		405
344	sub remove {	406	sub remove {
345	my ($self, $widget) = @_;	407	my ($self, $child) = @_;
346		408
		409	delete $child->{parent};
		410
347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	411	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348		412
349	$self->size_allocate (0, 0, $self->{w}, $self->{h});	413	$self->check_size;
350	}	414	}
351		415
352	sub find_widget {	416	sub find_widget {
353	my ($self, $x, $y) = @_;	417	my ($self, $x, $y) = @_;
354		418
…		…
384		448
385	$class->SUPER::new (children => [$child], %arg)	449	$class->SUPER::new (children => [$child], %arg)
386	}	450	}
387		451
388	sub add {	452	sub add {
389	my ($self, $widget) = @_;	453	my ($self, $child) = @_;
390		454
391	$self->{children} = [];	455	$self->{children} = [];
392		456
393	$self->SUPER::add ($widget);	457	$self->SUPER::add ($child);
394	}	458	}
395		459
396	sub remove {	460	sub remove {
397	my ($self, $widget) = @_;	461	my ($self, $widget) = @_;
398		462
…		…
407	sub size_request {	471	sub size_request {
408	$_[0]{children}[0]->size_request	472	$_[0]{children}[0]->size_request
409	}	473	}
410		474
411	sub size_allocate {	475	sub size_allocate {
412	my ($self, $x, $y, $w, $h) = @_;	476	my ($self, $w, $h) = @_;
413		477
414	$self->_size_allocate ($x, $y, $w, $h) or return;
415
416	$self->{children}[0]->size_allocate (0, 0, $w, $h);	478	$self->{children}[0]->configure (0, 0, $w, $h);
417	}	479	}
418		480
419	#############################################################################	481	#############################################################################
420		482
421	package CFClient::UI::Window;	483	package CFClient::UI::Window;
…		…
447	$self->child->draw;	509	$self->child->draw;
448	};	510	};
449	}	511	}
450		512
451	sub size_allocate {	513	sub size_allocate {
452	my ($self, $x, $y, $w, $h) = @_;	514	my ($self, $w, $h) = @_;
453		515
454	$self->_size_allocate ($x, $y, $w, $h) or return;
455
456	$self->child->size_allocate (0, 0, $w, $h);	516	$self->child->configure (0, 0, $w, $h);
457		517
458	$self->render_chld;	518	$self->render_chld;
459	}	519	}
460		520
461	sub _draw {	521	sub _draw {
…		…
477	glDisable GL_TEXTURE_2D;	537	glDisable GL_TEXTURE_2D;
478	}	538	}
479		539
480	#############################################################################	540	#############################################################################
481		541
		542	package CFClient::UI::ViewPort;
		543
		544	our @ISA = CFClient::UI::Window::;
		545
		546	sub new { die }
		547
		548	sub size_request {
		549	my ($self) = @_;
		550
		551	@$self{qw(child_w child_h)} = $self->child->size_request;
		552	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		553
		554	@$self{qw(child_w child_h)}
		555	}
		556
		557	sub _draw {
		558	my ($self) = @_;
		559
		560	$self->{children}[1]->draw;
		561	}
		562
		563
		564	#############################################################################
		565
482	package CFClient::UI::Frame;	566	package CFClient::UI::Frame;
483		567
484	our @ISA = CFClient::UI::Bin::;	568	our @ISA = CFClient::UI::Bin::;
485		569
486	use SDL::OpenGL;	570	use SDL::OpenGL;
…		…
496	}	580	}
497		581
498	sub size_allocate {	582	sub size_allocate {
499	my ($self, $x, $y, $w, $h) = @_;	583	my ($self, $x, $y, $w, $h) = @_;
500		584
501	$self->_size_allocate ($x, $y, $w, $h) or return;
502
503	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	585	$self->child->configure (2, 2, $w - 4, $h - 4);
504	}	586	}
505		587
506	sub _draw {	588	sub _draw {
507	my ($self) = @_;	589	my ($self) = @_;
508		590
…		…
539	# TODO: user_x, user_y, overwrite moveto?	621	# TODO: user_x, user_y, overwrite moveto?
540		622
541	$class->SUPER::new (	623	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	624	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	625	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	626	border => 0.8,
545	@_	627	@_
546	)	628	)
547	}	629	}
548		630
		631	sub border {
		632	int $_[0]{border} * $::FONTSIZE
		633	}
		634
549	sub size_request {	635	sub size_request {
550	my ($self) = @_;	636	my ($self) = @_;
551		637
552	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	638	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553		639
554	my ($w, $h) = $self->SUPER::size_request;	640	my ($w, $h) = $self->SUPER::size_request;
555		641
556	(	642	(
557	$w + $self->{border} * 2,	643	$w + $self->border * 2,
558	$h + $self->{border} * 2,	644	$h + $self->border * 2,
559	)	645	)
560	}	646	}
561		647
562	sub size_allocate {	648	sub size_allocate {
563	my ($self, $x, $y, $w, $h) = @_;	649	my ($self, $w, $h) = @_;
564		650
565	$self->_size_allocate ($x, $y, $w, $h) or return;
566
567	$h -= List::Util::max 0, $self->{border} * 2;	651	$h -= List::Util::max 0, $self->border * 2;
568	$w -= List::Util::max 0, $self->{border} * 2;	652	$w -= List::Util::max 0, $self->border * 2;
569		653
570	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	654	$self->child->configure ($self->border, $self->border, $w, $h);
571	}	655	}
572		656
573	sub button_down {	657	sub button_down {
574	my ($self, $ev, $x, $y) = @_;	658	my ($self, $ev, $x, $y) = @_;
575		659
		660	my $border = $self->border;
		661
576	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	662	if ($x < $self->{w} && $x >= $self->{w} - $border
577	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	663	&& $y < $self->{h} && $y >= $self->{h} - $border) {
578		664
579	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	665	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580	my ($bw, $bh) = ($self->{w}, $self->{h});	666	my ($bw, $bh) = ($self->{w}, $self->{h});
581		667
582	$self->{motion} = sub {	668	$self->{motion} = sub {
…		…
584		670
585	($x, $y) = ($ev->motion_x, $ev->motion_y);	671	($x, $y) = ($ev->motion_x, $ev->motion_y);
586		672
587	$self->{user_w} = $bw + $x - $ox;	673	$self->{user_w} = $bw + $x - $ox;
588	$self->{user_h} = $bh + $y - $oy;	674	$self->{user_h} = $bh + $y - $oy;
589	$self->update;	675	$self->check_size;
590	};	676	};
591		677
592	} elsif ($x >= 0 && $x < $self->{w}	678	} elsif ($x >= 0 && $x < $self->{w}
593	&& $y >= 0 && $y < $self->{border}) {	679	&& $y >= 0 && $y < $border) {
594		680
595	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	681	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596	my ($bx, $by) = ($self->{x}, $self->{y});	682	my ($bx, $by) = ($self->{x}, $self->{y});
597		683
598	$self->{motion} = sub {	684	$self->{motion} = sub {
…		…
627	glEnable GL_BLEND;	713	glEnable GL_BLEND;
628	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
630	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631		717
		718	my $border = $self->border;
		719
632	glColor @{ $self->{border_bg} };	720	glColor @{ $self->{border_bg} };
633	$tex[1]->draw_quad (0, 0, $w, $self->{border});	721	$tex[1]->draw_quad (0, 0, $w, $border);
634	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	722	$tex[3]->draw_quad (0, $border, $border, $ch);
635	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	723	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	724	$tex[4]->draw_quad (0, $h - $border, $w, $border);
637		725
638	my $bg = $tex[0];	726	my $bg = $tex[0];
639		727
640	# TODO: repeat texture not scale	728	# TODO: repeat texture not scale
641	my $rep_x = $cw / $bg->{w};	729	my $rep_x = $cw / $bg->{w};
…		…
644	glColor @{ $self->{bg} };	732	glColor @{ $self->{bg} };
645		733
646	$bg->{s} = $rep_x;	734	$bg->{s} = $rep_x;
647	$bg->{t} = $rep_y;	735	$bg->{t} = $rep_y;
648	$bg->{wrap_mode} = 1;	736	$bg->{wrap_mode} = 1;
649	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	737	$bg->draw_quad ($border, $border, $cw, $ch);
650		738
651	glDisable GL_TEXTURE_2D;	739	glDisable GL_TEXTURE_2D;
652	glDisable GL_BLEND;	740	glDisable GL_BLEND;
653		741
654	$self->child->draw;	742	$self->child->draw;
…		…
672	@_	760	@_
673	)	761	)
674	}	762	}
675		763
676	sub add {	764	sub add {
677	my ($self, $x, $y, $chld) = @_;	765	my ($self, $x, $y, $child) = @_;
678		766
		767	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	768	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		769
682	$self->{w} = $self->{h} = -1;	770	$child->check_size;
		771	}
		772
		773	# TODO: move to container class maybe? send childs a signal on removal?
		774	sub clear {
		775	my ($self) = @_;
		776
		777	delete $self->{children};
683	$self->update;	778	$self->update;
684	}	779	}
685		780
686	sub get_wh {	781	sub get_wh {
687	my ($self) = @_;	782	my ($self) = @_;
…		…
715	(sum @$hs),	810	(sum @$hs),
716	)	811	)
717	}	812	}
718		813
719	sub size_allocate {	814	sub size_allocate {
720	my ($self, $x, $y, $w, $h) = @_;	815	my ($self, $w, $h) = @_;
721
722	$self->_size_allocate ($x, $y, $w, $h) or return;
723		816
724	my ($ws, $hs) = $self->get_wh;	817	my ($ws, $hs) = $self->get_wh;
725		818
726	my $req_w = sum @$ws;	819	my $req_w = sum @$ws;
727	my $req_h = sum @$hs;	820	my $req_h = sum @$hs;
…		…
733		826
734	# linearly scale sizes	827	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	828	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	829	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
737		830
738	$_ = int $_ for @$ws; #TODO: avoid rounding problems	831	CFClient::UI::harmonize $ws;
739	$_ = int $_ for @$hs; #TODO: avoid rounding problems	832	CFClient::UI::harmonize $hs;
740		833
741	my $y;	834	my $y;
742		835
743	for my $r (0 .. $#{$self->{children}}) {	836	for my $r (0 .. $#{$self->{children}}) {
744	my $row = $self->{children}[$r]	837	my $row = $self->{children}[$r]
…		…
749		842
750	for my $c (0 .. $#$row) {	843	for my $c (0 .. $#$row) {
751	my $col_w = $ws->[$c];	844	my $col_w = $ws->[$c];
752		845
753	if (my $widget = $row->[$c]) {	846	if (my $widget = $row->[$c]) {
754	$widget->size_allocate ($x, $y, $col_w, $row_h);	847	$widget->configure ($x, $y, $col_w, $row_h);
755	}	848	}
756		849
757	$x += $col_w;	850	$x += $col_w;
758	}	851	}
759		852
…		…
804	(List::Util::max map $_->[1], @alloc),	897	(List::Util::max map $_->[1], @alloc),
805	)	898	)
806	}	899	}
807		900
808	sub size_allocate {	901	sub size_allocate {
809	my ($self, $x, $y, $w, $h) = @_;	902	my ($self, $w, $h) = @_;
810
811	$self->_size_allocate ($x, $y, $w, $h);
812		903
813	($h, $w) = ($w, $h);	904	($h, $w) = ($w, $h);
814		905
815	my $children = $self->{children};	906	my $children = $self->{children};
816		907
…		…
832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	923	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833	$h[$_] = $alloc_h;	924	$h[$_] = $alloc_h;
834	}	925	}
835	}	926	}
836		927
		928	CFClient::UI::harmonize \@h;
		929
837	my $y = 0;	930	my $y = 0;
838	for (0 .. $#$children) {	931	for (0 .. $#$children) {
839	my $child = $children->[$_];	932	my $child = $children->[$_];
840	my $h = int $h[$_];	933	my $h = $h[$_];
841	$child->size_allocate ($y, 0, $h, $w);	934	$child->configure ($y, 0, $h, $w);
842		935
843	$y += $h;	936	$y += $h;
844	}	937	}
		938
		939	1
845	}	940	}
846		941
847	#############################################################################	942	#############################################################################
848		943
849	package CFClient::UI::VBox;	944	package CFClient::UI::VBox;
…		…
862	(List::Util::sum map $_->[1], @alloc),	957	(List::Util::sum map $_->[1], @alloc),
863	)	958	)
864	}	959	}
865		960
866	sub size_allocate {	961	sub size_allocate {
867	my ($self, $x, $y, $w, $h) = @_;	962	my ($self, $w, $h) = @_;
868
869	$self->_size_allocate ($x, $y, $w, $h);
870		963
871	my $children = $self->{children};	964	my $children = $self->{children};
872		965
873	my @h = map +($_->size_request)[1], @$children;	966	my @h = map +($_->size_request)[1], @$children;
874		967
…		…
886		979
887	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	980	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888	}	981	}
889	}	982	}
890		983
		984	CFClient::UI::harmonize \@h;
		985
891	my $y = 0;	986	my $y = 0;
892	for (0 .. $#$children) {	987	for (0 .. $#$children) {
893	my $child = $children->[$_];	988	my $child = $children->[$_];
894	my $h = int $h[$_];	989	my $h = $h[$_];
895	$child->size_allocate (0, $y, $w, $h);	990	$child->configure (0, $y, $w, $h);
896		991
897	$y += $h;	992	$y += $h;
898	}	993	}
		994
		995	1
899	}	996	}
900		997
901	#############################################################################	998	#############################################################################
902		999
903	package CFClient::UI::Label;	1000	package CFClient::UI::Label;
…		…
909	sub new {	1006	sub new {
910	my ($class, %arg) = @_;	1007	my ($class, %arg) = @_;
911		1008
912	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
913	fg => [1, 1, 1],	1010	fg => [1, 1, 1],
914	fontsize => $::FONTSIZE,	1011	fontsize => 1,
915	text => "",	1012	text => "",
916	align => -1,	1013	align => -1,
		1014	valign => -1,
917	padding => 2,	1015	padding => 2,
918	layout => new CFClient::Layout,	1016	layout => new CFClient::Layout,
919	%arg	1017	%arg
920	);	1018	);
921		1019
922	$self->set_text ($self->{text});	1020	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1021
		1022	$self->set_text (delete $self->{text}) if exists $self->{text};
		1023	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
923		1024
924	$self	1025	$self
925	}	1026	}
926		1027
927	sub escape_text {	1028	sub escape_text {
…		…
935	}	1036	}
936		1037
937	sub set_text {	1038	sub set_text {
938	my ($self, $text) = @_;	1039	my ($self, $text) = @_;
939		1040
940	$self->{text} = $text;
941	$self->{layout}->set_markup ($text);	1041	$self->{layout}->set_text ($text);
942		1042
943	delete $self->{texture};	1043	delete $self->{texture};
944	# $self->{w} = $self->{h} = -1;
945	$self->update;	1044	$self->update;
946	}	1045	}
947		1046
948	sub get_text {	1047	sub set_markup {
949	my ($self, $text) = @_;	1048	my ($self, $markup) = @_;
950		1049
951	$self->{text}	1050	$self->{layout}->set_markup ($markup);
		1051
		1052	delete $self->{texture};
		1053	$self->update;
952	}	1054	}
953		1055
954	sub size_request {	1056	sub size_request {
955	my ($self) = @_;	1057	my ($self) = @_;
956		1058
957	$self->{layout}->set_width;	1059	$self->{layout}->set_width;
958	$self->{layout}->set_height ($self->{fontsize});	1060	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1061
959	my ($w, $h) = $self->{layout}->size;	1062	my ($w, $h) = $self->{layout}->size;
960		1063
961	(	1064	(
962	$w + $self->{padding} * 2,	1065	$w + $self->{padding} * 2,
963	$h + $self->{padding} * 2,	1066	$h + $self->{padding} * 2,
964	)	1067	)
965	}	1068	}
966		1069
967	sub size_allocate {	1070	sub size_allocate {
968	my ($self, $x, $y, $w, $h) = @_;	1071	my ($self, $w, $h) = @_;
969
970	$self->_size_allocate ($x, $y, $w, $h) or return;
971		1072
972	delete $self->{texture};	1073	delete $self->{texture};
973	}
974
975	sub update {
976	my ($self) = @_;
977
978	delete $self->{texture};
979	$self->SUPER::update;
980	}	1074	}
981		1075
982	sub _draw {	1076	sub _draw {
983	my ($self) = @_;	1077	my ($self) = @_;
984		1078
985	my $tex = $self->{texture} \|\|= do {	1079	my $tex = $self->{texture} \|\|= do {
986	$self->{layout}->set_width ($self->{w});	1080	$self->{layout}->set_width ($self->{w});
987	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1081	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
988	new_from_layout CFClient::Texture $self->{layout}	1082	new_from_layout CFClient::Texture $self->{layout}
989	};	1083	};
990		1084
991	glEnable GL_BLEND;	1085	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1086	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993	glEnable GL_TEXTURE_2D;	1087	glEnable GL_TEXTURE_2D;
994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1088	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995		1089
996	glColor @{$self->{fg}};	1090	glColor @{$self->{fg}};
997		1091
998	my $x =	1092	$self->{ox} = int (
999	$self->{align} < 0 ? $self->{padding}	1093	$self->{align} < 0 ? $self->{padding}
1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1094	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001	: ($self->{w} - $tex->{w}) * 0.5;	1095	: ($self->{w} - $tex->{w}) * 0.5
		1096	);
1002		1097
1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1098	$self->{oy} = int (
		1099	$self->{valign} < 0 ? $self->{padding}
		1100	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1101	: ($self->{h} - $tex->{h}) * 0.5
		1102	);
		1103
		1104	$tex->draw_quad ($self->{ox}, $self->{oy});
1004		1105
1005	glDisable GL_TEXTURE_2D;	1106	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1107	glDisable GL_BLEND;
1007	}	1108	}
1008		1109
1009	#############################################################################	1110	#############################################################################
1010		1111
1011	package CFClient::UI::Entry;	1112	package CFClient::UI::EntryBase;
1012		1113
1013	our @ISA = CFClient::UI::Label::;	1114	our @ISA = CFClient::UI::Label::;
1014		1115
1015	use SDL;	1116	use SDL;
1016	use SDL::OpenGL;	1117	use SDL::OpenGL;
…		…
1023	bg => [0, 0, 0, 0.2],	1124	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1125	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1126	active_fg => [0, 0, 0],
1026	can_hover => 1,	1127	can_hover => 1,
1027	can_focus => 1,	1128	can_focus => 1,
		1129	valign => 0,
1028	@_	1130	@_
1029	)	1131	)
1030	}	1132	}
1031		1133
1032	sub _set_text {	1134	sub _set_text {
1033	my ($self, $text) = @_;	1135	my ($self, $text) = @_;
1034		1136
1035	my $old_text = $self->{text};	1137	delete $self->{cur_h};
		1138
		1139	return if $self->{text} eq $text;
		1140
		1141	delete $self->{texture};
1036		1142
1037	$self->{last_activity} = $::NOW;	1143	$self->{last_activity} = $::NOW;
1038
1039	$self->{text} = $text;	1144	$self->{text} = $text;
1040	$self->{layout}->set_width ($self->{w});
1041	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042		1145
1043	$text =~ s/./*/g if $self->{hidden};	1146	$text =~ s/./*/g if $self->{hidden};
		1147	$self->{layout}->set_text ("$text ");
1044		1148
1045	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1149	$self->emit (changed => $self->{text});
		1150	}
1046		1151
1047	$text = substr $text, 0, $self->{cursor};	1152	sub get_text {
1048	utf8::encode $text;	1153	$_[0]{text}
1049
1050	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053	if $old_text ne $self->{text};
1054	}	1154	}
1055		1155
1056	sub size_request {	1156	sub size_request {
1057	my ($self) = @_;	1157	my ($self) = @_;
1058		1158
…		…
1060		1160
1061	($w + 1, $h) # add 1 for cursor	1161	($w + 1, $h) # add 1 for cursor
1062	}	1162	}
1063		1163
1064	sub size_allocate {	1164	sub size_allocate {
1065	my ($self, $x, $y, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1066
1067	$self->SUPER::size_allocate ($x, $y, $w, $h);
1068		1166
1069	$self->_set_text ($self->{text});	1167	$self->_set_text ($self->{text});
1070	}	1168	}
1071		1169
1072	sub set_text {	1170	sub set_text {
…		…
1162		1260
1163	$self->SUPER::_draw;	1261	$self->SUPER::_draw;
1164		1262
1165	#TODO: force update every cursor change :(	1263	#TODO: force update every cursor change :(
1166	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1264	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1265
		1266	unless (exists $self->{cur_h}) {
		1267	my $text = substr $self->{text}, 0, $self->{cursor};
		1268	utf8::encode $text;
		1269
		1270	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1271	}
		1272
1167	glColor @{$self->{fg}};	1273	glColor @{$self->{fg}};
1168	glBegin GL_LINES;	1274	glBegin GL_LINES;
1169	glVertex $self->{cur_x}, $self->{cur_y};
1170	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1275	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1276	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171	glEnd;	1277	glEnd;
1172	}	1278	}
1173	}	1279	}
1174		1280
1175	package CFClient::UI::LineEntry;	1281	package CFClient::UI::Entry;
1176		1282
1177	our @ISA = CFClient::UI::Entry::;	1283	our @ISA = CFClient::UI::EntryBase::;
1178		1284
1179	use SDL;	1285	use SDL;
1180	use SDL::OpenGL;	1286	use SDL::OpenGL;
1181		1287
1182	sub key_down {	1288	sub key_down {
…		…
1212		1318
1213	$class->SUPER::new (	1319	$class->SUPER::new (
1214	padding => 4,	1320	padding => 4,
1215	fg => [1, 1, 1],	1321	fg => [1, 1, 1],
1216	bg => [1, 1, 1, 0.2],	1322	bg => [1, 1, 1, 0.2],
1217	active_fg => [1, 1, 0],	1323	active_fg => [0, 0, 1],
1218	can_hover => 1,	1324	can_hover => 1,
		1325	align => 0,
		1326	valign => 0,
1219	@_	1327	@_
1220	)	1328	)
1221	}	1329	}
1222		1330
1223	sub button_up {	1331	sub button_up {
…		…
1231		1339
1232	sub _draw {	1340	sub _draw {
1233	my ($self) = @_;	1341	my ($self) = @_;
1234		1342
1235	local $self->{fg} = $self->{fg};	1343	local $self->{fg} = $self->{fg};
1236	my $tex = $tex[0];
1237
1238	glEnable GL_BLEND;
1239	glEnable GL_TEXTURE_2D;
1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241		1344
1242	if ($GRAB == $self) {	1345	if ($GRAB == $self) {
1243	$self->{fg} = $self->{active_fg};	1346	$self->{fg} = $self->{active_fg};
1244	}	1347	}
1245		1348
1246	glBindTexture GL_TEXTURE_2D, $tex->{name};	1349	glEnable GL_BLEND;
		1350	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1351	glEnable GL_TEXTURE_2D;
1247	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1352	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1353	glColor 0, 0, 0, 1;
1248		1354
1249	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1355	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250		1356
1251	glDisable GL_TEXTURE_2D;	1357	glDisable GL_TEXTURE_2D;
1252	glDisable GL_BLEND;	1358	glDisable GL_BLEND;
1253		1359
1254	$self->SUPER::_draw;	1360	$self->SUPER::_draw;
…		…
1284	my ($self) = @_;	1390	my ($self) = @_;
1285		1391
1286	($self->{padding} * 2 + 6) x 2	1392	($self->{padding} * 2 + 6) x 2
1287	}	1393	}
1288		1394
1289	sub size_allocate {
1290	my ($self, $x, $y, $w, $h) = @_;
1291
1292	$self->_size_allocate ($x, $y, $w, $h);
1293	}
1294
1295	sub button_down {	1395	sub button_down {
1296	my ($self, $ev, $x, $y) = @_;	1396	my ($self, $ev, $x, $y) = @_;
1297		1397
1298	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1398	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1399	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1321		1421
1322	$tex->draw_quad (0, 0, $s, $s);	1422	$tex->draw_quad (0, 0, $s, $s);
1323		1423
1324	glDisable GL_TEXTURE_2D;	1424	glDisable GL_TEXTURE_2D;
1325	glDisable GL_BLEND;	1425	glDisable GL_BLEND;
		1426	}
		1427
		1428	#############################################################################
		1429
		1430	package CFClient::UI::VGauge;
		1431
		1432	our @ISA = CFClient::UI::Base::;
		1433
		1434	use SDL::OpenGL;
		1435
		1436	my %tex = (
		1437	food => [
		1438	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1439	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1440	],
		1441	grace => [
		1442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1443	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1444	],
		1445	hp => [
		1446	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1447	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1448	],
		1449	mana => [
		1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1451	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1452	],
		1453	);
		1454
		1455	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1456	sub new {
		1457	my $class = shift;
		1458
		1459	my $self = $class->SUPER::new (gauge => 'food', @_);
		1460
		1461	$self
		1462	}
		1463
		1464	sub size_request {
		1465	my ($self) = @_;
		1466
		1467	my $tex = $tex{$self->{gauge}}[0];
		1468
		1469	@$tex{qw(w h)}
		1470	}
		1471
		1472	sub set_max {
		1473	my ($self, $max) = @_;
		1474
		1475	$self->{max_val} = $max;
		1476	}
		1477
		1478	sub set_value {
		1479	my ($self, $val, $max) = @_;
		1480
		1481	$self->set_max ($max)
		1482	if defined $max;
		1483
		1484	$max = $self->{max_val};
		1485	$self->{val} = $val;
		1486
		1487	$self->update;
		1488	}
		1489
		1490	sub _draw {
		1491	my ($self) = @_;
		1492
		1493	my $tex = $tex{$self->{gauge}};
		1494
		1495	my ($w, $h) = ($self->{w}, $self->{h});
		1496
		1497	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1498	$ycut = 1 if $self->{val} > $self->{max_val};
		1499
		1500	my $t1 = $tex->[0];
		1501	my $t2 = $tex->[1];
		1502
		1503	glEnable GL_BLEND;
		1504	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1505	glEnable GL_TEXTURE_2D;
		1506	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1507
		1508	my $h1 = $self->{h} - $ycut * $self->{h};
		1509	my $h2 = $ycut * $self->{h};
		1510
		1511	my $yp = 0;
		1512
		1513	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1514	glBegin GL_QUADS;
		1515	glTexCoord 0 , 0; glVertex 0 , $yp;
		1516	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
		1517	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
		1518	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
		1519	glEnd;
		1520
		1521	$yp += $h1;
		1522
		1523	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1524	glBegin GL_QUADS;
		1525	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
		1526	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
		1527	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
		1528	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
		1529	glEnd;
		1530
		1531	glDisable GL_BLEND;
		1532	glDisable GL_TEXTURE_2D;
1326	}	1533	}
1327		1534
1328	#############################################################################	1535	#############################################################################
1329		1536
1330	package CFClient::UI::Slider;	1537	package CFClient::UI::Slider;
…		…
1349	# TODO: calculations are off	1556	# TODO: calculations are off
1350	my $self = $class->SUPER::new (	1557	my $self = $class->SUPER::new (
1351	fg => [1, 1, 1],	1558	fg => [1, 1, 1],
1352	active_fg => [0, 0, 0],	1559	active_fg => [0, 0, 0],
1353	range => [0, 0, 100, 10],	1560	range => [0, 0, 100, 10],
1354	req_w => 40,	1561	req_w => 20,
1355	req_h => 13,	1562	req_h => 20,
1356	vertical => 0,	1563	vertical => 0,
1357	can_hover => 1,	1564	can_hover => 1,
1358	inner_pad => 5,	1565	inner_pad => 5,
1359	@_	1566	@_
1360	);	1567	);
…		…
1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1634	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1635	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429		1636
1430	my ($value, $lo, $hi, $page) = @{$self->{range}};	1637	my ($value, $lo, $hi, $page) = @{$self->{range}};
1431		1638
		1639	$hi = $value + 1 if $lo == $hi;
		1640
1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1641	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1642	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434		1643
1435	$page = int $page * $inner_w / ($hi - $lo);	1644	$page = int $page * $inner_w / ($hi - $lo);
1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1645	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1468		1677
1469	sub new {	1678	sub new {
1470	my $class = shift;	1679	my $class = shift;
1471		1680
1472	my $self = $class->SUPER::new (	1681	my $self = $class->SUPER::new (
1473	req_w => $::WIDTH / 6,
1474	req_h => $::HEIGHT / 6,
1475	fontsize => $::FONTSIZE,	1682	fontsize => 1,
1476	@_,	1683	@_,
1477		1684
1478	layout => (new CFClient::Layout),	1685	layout => (new CFClient::Layout),
1479	par => [],	1686	par => [],
1480	height => 0,	1687	height => 0,
…		…
1482	(new CFClient::UI::Empty expand => 1),	1689	(new CFClient::UI::Empty expand => 1),
1483	(new CFClient::UI::Slider vertical => 1),	1690	(new CFClient::UI::Slider vertical => 1),
1484	],	1691	],
1485	);	1692	);
1486		1693
		1694	$self->{children}[1]->connect (changed => sub {
		1695	$self->update;
		1696	});
		1697
1487	$self	1698	$self
		1699	}
		1700
		1701	sub set_fontsize {
		1702	my ($self, $fontsize) = @_;
		1703
		1704	$self->{fontsize} = $fontsize;
		1705	$self->reflow;
1488	}	1706	}
1489		1707
1490	sub text_height {	1708	sub text_height {
1491	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1492		1710
1493	my $layout = $self->{layout};	1711	my $layout = $self->{layout};
1494		1712
1495	$layout->set_height ($self->{fontsize});	1713	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1496	$layout->set_width ($self->{w});	1714	$layout->set_width ($self->{w});
1497	$layout->set_text ($text);	1715	$layout->set_text ($text);
1498		1716
1499	($layout->size)[1]	1717	($layout->size)[1]
1500	}	1718	}
1501		1719
1502	sub reflow {	1720	sub reflow {
1503	my ($self) = @_;	1721	my ($self) = @_;
1504		1722
1505	my $height = 0;	1723	$self->{need_reflow}++;
1506		1724	$self->update;
1507	for (@{$self->{par}}) {
1508	$height += $_->[0] = $self->text_height ($_->[2]);
1509	}
1510
1511	$self->{height} = $height;
1512
1513	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514	}
1515
1516	sub size_request {
1517	my ($self) = @_;
1518
1519	($self->{req_w}, $self->{req_h})
1520	}	1725	}
1521		1726
1522	sub size_allocate {	1727	sub size_allocate {
1523	my ($self, $x, $y, $w, $h) = @_;	1728	my ($self, $w, $h) = @_;
1524		1729
1525	$self->SUPER::size_allocate ($x, $y, $w, $h);	1730	$self->SUPER::size_allocate ($w, $h);
1526		1731
1527	$self->{layout}->set_height ($self->{fontsize});	1732	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1528	$self->{layout}->set_width ($self->{w});	1733	$self->{layout}->set_width ($self->{children}[0]{w});
1529		1734
1530	$self->reflow;	1735	$self->reflow;
1531	$self->update;
1532	}	1736	}
1533		1737
1534	sub add_paragraph {	1738	sub add_paragraph {
1535	my ($self, $color, $text) = @_;	1739	my ($self, $color, $text) = @_;
1536		1740
…		…
1551		1755
1552	$self->SUPER::update;	1756	$self->SUPER::update;
1553		1757
1554	return unless $self->{h} > 0;	1758	return unless $self->{h} > 0;
1555		1759
		1760	delete $self->{texture};
		1761
		1762	$ROOT->on_refresh ($self, sub {
		1763	if (delete $self->{need_reflow}) {
		1764	my $height = 0;
		1765
		1766	$height += $_->[0] = $self->text_height ($_->[2])
		1767	for @{$self->{par}};
		1768
		1769	$self->{height} = $height;
		1770
		1771	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1772
		1773	delete $self->{texture};
		1774	}
		1775
1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1776	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557	glClearColor 0, 0, 0, 1;	1777	glClearColor 0, 0, 0, 1;
1558	glClear GL_COLOR_BUFFER_BIT;	1778	glClear GL_COLOR_BUFFER_BIT;
1559		1779
1560	my $y0 = $self->{height} - $self->{h};
1561	my $y1 = $self->{height};
1562
1563	glEnable GL_BLEND;	1780	glEnable GL_BLEND;
1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565	glEnable GL_TEXTURE_2D;	1782	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1784
		1785	my $top = int $self->{children}[1]{range}[0];
		1786
		1787	my $y0 = $top;
		1788	my $y1 = $top + $self->{h};
		1789
1568	my $y = 0;	1790	my $y = 0;
1569		1791
1570	my $layout = $self->{layout};	1792	my $layout = $self->{layout};
1571		1793
1572	for my $par (@{$self->{par}}) {	1794	for my $par (@{$self->{par}}) {
1573	my $h = $par->[0];	1795	my $h = $par->[0];
1574		1796
1575	if ($y0 < $y + $h && $y < $y1) {	1797	if ($y0 < $y + $h && $y < $y1) {
1576	$layout->set_text ($par->[2]);	1798	$layout->set_text ($par->[2]);
1577		1799
1578	glColor @{ $par->[1] };	1800	glColor @{ $par->[1] };
1579	my ($W, $H) = $layout->size;	1801	my ($W, $H) = $layout->size;
1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1802	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1803	}
		1804
		1805	$y += $h;
1581	}	1806	}
1582		1807
1583	$y += $h;
1584	}
1585
1586	glDisable GL_TEXTURE_2D;	1808	glDisable GL_TEXTURE_2D;
1587	glDisable GL_BLEND;	1809	glDisable GL_BLEND;
		1810	};
1588	};	1811	});
1589	}	1812	}
1590		1813
1591	sub _draw {	1814	sub _draw {
1592	my ($self) = @_;	1815	my ($self) = @_;
1593		1816
…		…
1631	}	1854	}
1632		1855
1633	sub key_up {	1856	sub key_up {
1634	}	1857	}
1635		1858
		1859	sub button_down {
		1860	my ($self, $ev, $x, $y) = @_;
		1861
		1862	$self->focus_in;
		1863
		1864	if ($ev->button == 2) {
		1865	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1866	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1867
		1868	$self->{motion} = sub {
		1869	my ($ev, $x, $y) = @_;
		1870
		1871	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1872
		1873	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1874	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1875
		1876	$self->update;
		1877	};
		1878	}
		1879	}
		1880
		1881	sub button_up {
		1882	my ($self, $ev, $x, $y) = @_;
		1883
		1884	delete $self->{motion};
		1885	}
		1886
		1887	sub mouse_motion {
		1888	my ($self, $ev, $x, $y) = @_;
		1889
		1890	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1891	}
		1892
1636	sub size_request {	1893	sub size_request {
1637	(	1894	(
1638	1 + 32 * int $::WIDTH / 32,	1895	1 + 32 * int $::WIDTH / 32,
1639	1 + 32 * int $::HEIGHT / 32,	1896	1 + 32 * int $::HEIGHT / 32,
1640	)	1897	)
…		…
1648	}	1905	}
1649		1906
1650	sub draw {	1907	sub draw {
1651	my ($self) = @_;	1908	my ($self) = @_;
1652		1909
1653	$self->{need_update}++;#d#
1654	if (delete $self->{need_update}) {	1910	if (delete $self->{need_update}) {
1655	glNewList $self->{list}, GL_COMPILE;	1911	glNewList $self->{list}, GL_COMPILE;
1656		1912
1657	my $sw = int $::WIDTH / 32;
1658	my $sh = int $::HEIGHT / 32;
1659
1660	if ($::MAP) {	1913	if ($::MAP) {
		1914	my $sw = int $::WIDTH / 32;
		1915	my $sh = int $::HEIGHT / 32;
		1916
		1917	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1918	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1919
		1920	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1921
1661	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1922	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1662		1923
1663	if ($::CFG->{fow_enable}) {	1924	if ($::CFG->{fow_enable}) {
1664	if ($::CFG->{fow_smooth}) { # smooth fog of war	1925	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1665	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1926	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1666	glConvolutionFilter2D	1927	glConvolutionFilter2D (
1667	GL_CONVOLUTION_2D,	1928	GL_CONVOLUTION_2D,
1668	GL_ALPHA,	1929	GL_ALPHA,
1669	3, 3,	1930	3, 3,
1670	GL_ALPHA, GL_FLOAT,	1931	GL_ALPHA, GL_FLOAT,
1671	pack "f*",	1932	pack "f*",
1672	0.1, 0.1, 0.1,	1933	0.1, 0.1, 0.1,
1673	0.1, 0.2, 0.1,	1934	0.1, 0.2, 0.1,
1674	0.1, 0.1, 0.1,	1935	0.1, 0.1, 0.1,
1675	;	1936	);
1676	glEnable GL_CONVOLUTION_2D;	1937	glEnable GL_CONVOLUTION_2D;
1677	}	1938	}
1678		1939
1679	my $tex = new CFClient::Texture	1940	$self->{fow_texture} = new CFClient::Texture
1680	w => $w,	1941	w => $w,
1681	h => $h,	1942	h => $h,
1682	data => $data,	1943	data => $data,
1683	internalformat => GL_ALPHA,	1944	internalformat => GL_ALPHA,
1684	format => GL_ALPHA;	1945	format => GL_ALPHA;
1685		1946
1686	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1947	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687		1948
1688	glEnable GL_BLEND;	1949	glEnable GL_BLEND;
		1950	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689	glEnable GL_TEXTURE_2D;	1951	glEnable GL_TEXTURE_2D;
1690	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1952	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691		1953
1692	glColor +($::CFG->{fow_intensity}) x 3, 1;	1954	glColor +($::CFG->{fow_intensity}) x 3, 1;
1693	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1955	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1694		1956
1695	glDisable GL_TEXTURE_2D;	1957	glDisable GL_TEXTURE_2D;
1696	glDisable GL_BLEND;	1958	glDisable GL_BLEND;
1697	}	1959	}
		1960
		1961	# HACK BEGIN
		1962	{
		1963	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1964	my ($w, $h) = (250, 250);
		1965
		1966	glEnable GL_BLEND;
		1967	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1968	glEnable GL_TEXTURE_2D;
		1969	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1970
		1971	$self->{mapmap_texture} =
		1972	new CFClient::Texture
		1973	w => $w,
		1974	h => $h,
		1975	data => $::MAP->mapmap ($w, $h),
		1976	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		1977
		1978	$self->{mapmap_texture}->draw_quad (100, 100);
		1979
		1980	glDisable GL_TEXTURE_2D;
		1981	glDisable GL_BLEND;
		1982	}
		1983	# HACK END
1698	}	1984	}
1699		1985
1700	glEndList;	1986	glEndList;
1701	}	1987	}
1702		1988
		1989	glPushMatrix;
1703	glCallList $self->{list};	1990	glCallList $self->{list};
		1991	glPopMatrix;
1704		1992
1705	if ($FOCUS != $self) {	1993	if ($FOCUS != $self) {
1706	glColor 64/255, 64/255, 64/255;	1994	glColor 64/255, 64/255, 64/255;
1707	glLogicOp GL_AND;	1995	glLogicOp GL_AND;
1708	glEnable GL_COLOR_LOGIC_OP;	1996	glEnable GL_COLOR_LOGIC_OP;
…		…
1737		2025
1738	my $mod = $ev->key_mod;	2026	my $mod = $ev->key_mod;
1739	my $sym = $ev->key_sym;	2027	my $sym = $ev->key_sym;
1740		2028
1741	if ($sym == SDLK_KP5) {	2029	if ($sym == SDLK_KP5) {
1742	$::CONN->user_send ("command stay fire");	2030	$::CONN->user_send ("stay fire");
1743	} elsif ($sym == SDLK_a) {	2031	} elsif ($sym == SDLK_a) {
1744	$::CONN->user_send ("command apply");	2032	$::CONN->user_send ("apply");
1745	} elsif ($sym == SDLK_QUOTE) {	2033	} elsif ($sym == SDLK_QUOTE) {
1746	$self->emit ('activate_console');	2034	$self->emit ('activate_console');
1747	} elsif ($sym == SDLK_SLASH) {	2035	} elsif ($sym == SDLK_SLASH) {
1748	$self->emit ('activate_console' => '/');	2036	$self->emit ('activate_console' => '/');
1749	} elsif (exists $DIR{$sym}) {	2037	} elsif (exists $DIR{$sym}) {
1750	if ($mod & KMOD_SHIFT) {	2038	if ($mod & KMOD_SHIFT) {
1751	$self->{shft}++;	2039	$self->{shft}++;
1752	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2040	$::CONN->user_send ("fire $DIR{$sym}[0]");
1753	} elsif ($mod & KMOD_CTRL) {	2041	} elsif ($mod & KMOD_CTRL) {
1754	$self->{ctrl}++;	2042	$self->{ctrl}++;
1755	$::CONN->user_send ("command run $DIR{$sym}[0]");	2043	$::CONN->user_send ("run $DIR{$sym}[0]");
1756	} else {	2044	} else {
1757	$::CONN->user_send ("command $DIR{$sym}[1]");	2045	$::CONN->user_send ("$DIR{$sym}[1]");
1758	}	2046	}
1759	}	2047	}
1760	}	2048	}
1761		2049
1762	sub key_up {	2050	sub key_up {
…		…
1764		2052
1765	my $mod = $ev->key_mod;	2053	my $mod = $ev->key_mod;
1766	my $sym = $ev->key_sym;	2054	my $sym = $ev->key_sym;
1767		2055
1768	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2056	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1769	$::CONN->user_send ("command fire_stop");	2057	$::CONN->user_send ("fire_stop");
1770	}	2058	}
1771	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2059	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1772	$::CONN->user_send ("command run_stop");	2060	$::CONN->user_send ("run_stop");
1773	}	2061	}
1774	}	2062	}
1775		2063
1776	#############################################################################	2064	#############################################################################
1777		2065
…		…
1841	sub toggle_flopper {	2129	sub toggle_flopper {
1842	my ($self) = @_;	2130	my ($self) = @_;
1843		2131
1844	# TODO: use animation	2132	# TODO: use animation
1845	if ($self->{state} = !$self->{state}) {	2133	if ($self->{state} = !$self->{state}) {
1846	$CFClient::UI::TOPLEVEL->add ($self->{other});	2134	$CFClient::UI::ROOT->add ($self->{other});
1847	$self->{other}->move (	2135	$self->{other}->move ($self->coord2global (0, $self->{h}));
1848	($::WIDTH - $self->{other}{w}) * 0.5,	2136	$self->emit ("open");
1849	($::HEIGHT - $self->{other}{h}) * 0.5,
1850	);
1851	} else {	2137	} else {
1852	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2138	$CFClient::UI::ROOT->remove ($self->{other});
		2139	$self->emit ("close");
1853	}	2140	}
1854	}
1855		2141
1856	#############################################################################	2142	$self->emit (changed => $self->{state});
		2143	}
1857		2144
		2145	#############################################################################
		2146
1858	package CFClient::UI::Toplevel;	2147	package CFClient::UI::Root;
1859		2148
1860	our @ISA = CFClient::UI::Container::;	2149	our @ISA = CFClient::UI::Container::;
		2150
		2151	use SDL::OpenGL;
		2152
		2153	sub check_size {
		2154	my ($self) = @_;
		2155
		2156	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2157	}
1861		2158
1862	sub size_request {	2159	sub size_request {
1863	($::WIDTH, $::HEIGHT)	2160	($::WIDTH, $::HEIGHT)
1864	}	2161	}
1865		2162
1866	sub size_allocate {	2163	sub configure {
1867	my ($self, $x, $y, $w, $h) = @_;	2164	my ($self, $x, $y, $w, $h) = @_;
1868		2165
1869	$self->_size_allocate ($x, $y, $w, $h);	2166	$self->SUPER::configure ($x, $y, $w, $h);
1870		2167
1871	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2168	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1872	for @{$self->{children}};	2169	for @{$self->{children}};
1873	}	2170	}
1874		2171
1875	sub translate {	2172	sub _topleft {
1876	my ($self, $x, $y) = @_;	2173	my ($self, $x, $y) = @_;
1877		2174
1878	($x, $y)	2175	($x, $y)
1879	}	2176	}
1880		2177
1881	sub update {	2178	sub update {
1882	my ($self) = @_;	2179	my ($self) = @_;
1883		2180
1884	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2181	$self->check_size;
1885	::refresh ();	2182	::refresh ();
1886	}	2183	}
1887		2184
1888	sub add {	2185	sub add {
1889	my ($self, $widget) = @_;	2186	my ($self, $child) = @_;
1890		2187
1891	$self->SUPER::add ($widget);	2188	$self->SUPER::add ($child);
		2189	}
1892		2190
1893	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2191	sub on_refresh {
		2192	my ($self, $id, $cb) = @_;
		2193
		2194	$self->{refresh_hook}{$id} = $cb;
1894	}	2195	}
1895		2196
1896	sub draw {	2197	sub draw {
1897	my ($self) = @_;	2198	my ($self) = @_;
1898		2199
		2200	while (my $rcb = delete $self->{refresh_hook}) {
		2201	$_->() for values %$rcb;
		2202	}
		2203
		2204	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2206	glClear GL_COLOR_BUFFER_BIT;
		2207
		2208	glMatrixMode GL_PROJECTION;
		2209	glLoadIdentity;
		2210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2211	glMatrixMode GL_MODELVIEW;
		2212	glLoadIdentity;
		2213
1899	$self->_draw;	2214	$self->_draw;
1900	}	2215	}
1901		2216
1902	#############################################################################	2217	#############################################################################
1903		2218
1904	package CFClient::UI;	2219	package CFClient::UI;
1905		2220
1906	$TOPLEVEL = new CFClient::UI::Toplevel;	2221	$ROOT = new CFClient::UI::Root;
1907		2222
1908	1	2223	1
1909		2224

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs. Revision 1.134 by root, Wed Apr 19 06:06:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.134 by root, Wed Apr 19 06:06:45 2006 UTC