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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.99 by elmex, Fri Apr 14 10:57:35 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;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $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;
…		…
439	}	501	}
440		502
441	sub render_chld {	503	sub render_chld {
442	my ($self) = @_;	504	my ($self) = @_;
443		505
444	$self->{texture} =	506	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	507	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	508	glClear GL_COLOR_BUFFER_BIT;
447	);	509	$self->child->draw;
		510	};
448	}	511	}
449		512
450	sub size_allocate {	513	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	514	my ($self, $w, $h) = @_;
452		515
453	$self->_size_allocate ($x, $y, $w, $h) or return;
454
455	$self->child->size_allocate (0, 0, $w, $h);	516	$self->child->configure (0, 0, $w, $h);
456		517
457	$self->render_chld;	518	$self->render_chld;
458	}	519	}
459		520
460	sub _draw {	521	sub _draw {
…		…
476	glDisable GL_TEXTURE_2D;	537	glDisable GL_TEXTURE_2D;
477	}	538	}
478		539
479	#############################################################################	540	#############################################################################
480		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
481	package CFClient::UI::Frame;	566	package CFClient::UI::Frame;
482		567
483	our @ISA = CFClient::UI::Bin::;	568	our @ISA = CFClient::UI::Bin::;
484		569
485	use SDL::OpenGL;	570	use SDL::OpenGL;
…		…
495	}	580	}
496		581
497	sub size_allocate {	582	sub size_allocate {
498	my ($self, $x, $y, $w, $h) = @_;	583	my ($self, $x, $y, $w, $h) = @_;
499		584
500	$self->_size_allocate ($x, $y, $w, $h) or return;
501
502	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	585	$self->child->configure (2, 2, $w - 4, $h - 4);
503	}	586	}
504		587
505	sub _draw {	588	sub _draw {
506	my ($self) = @_;	589	my ($self) = @_;
507		590
…		…
538	# TODO: user_x, user_y, overwrite moveto?	621	# TODO: user_x, user_y, overwrite moveto?
539		622
540	$class->SUPER::new (	623	$class->SUPER::new (
541	bg => [1, 1, 1, 1],	624	bg => [1, 1, 1, 1],
542	border_bg => [1, 1, 1, 1],	625	border_bg => [1, 1, 1, 1],
543	border => $::FONTSIZE * 0.8,	626	border => 0.8,
544	@_	627	@_
545	)	628	)
546	}	629	}
547		630
		631	sub border {
		632	int $_[0]{border} * $::FONTSIZE
		633	}
		634
548	sub size_request {	635	sub size_request {
549	my ($self) = @_;	636	my ($self) = @_;
550		637
551	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};
552		639
553	my ($w, $h) = $self->SUPER::size_request;	640	my ($w, $h) = $self->SUPER::size_request;
554		641
555	(	642	(
556	$w + $self->{border} * 2,	643	$w + $self->border * 2,
557	$h + $self->{border} * 2,	644	$h + $self->border * 2,
558	)	645	)
559	}	646	}
560		647
561	sub size_allocate {	648	sub size_allocate {
562	my ($self, $x, $y, $w, $h) = @_;	649	my ($self, $w, $h) = @_;
563		650
564	$self->_size_allocate ($x, $y, $w, $h) or return;
565
566	$h -= List::Util::max 0, $self->{border} * 2;	651	$h -= List::Util::max 0, $self->border * 2;
567	$w -= List::Util::max 0, $self->{border} * 2;	652	$w -= List::Util::max 0, $self->border * 2;
568		653
569	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	654	$self->child->configure ($self->border, $self->border, $w, $h);
570	}	655	}
571		656
572	sub button_down {	657	sub button_down {
573	my ($self, $ev, $x, $y) = @_;	658	my ($self, $ev, $x, $y) = @_;
574		659
		660	my $border = $self->border;
		661
575	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	662	if ($x < $self->{w} && $x >= $self->{w} - $border
576	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	663	&& $y < $self->{h} && $y >= $self->{h} - $border) {
577		664
578	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	665	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579	my ($bw, $bh) = ($self->{w}, $self->{h});	666	my ($bw, $bh) = ($self->{w}, $self->{h});
580		667
581	$self->{motion} = sub {	668	$self->{motion} = sub {
…		…
583		670
584	($x, $y) = ($ev->motion_x, $ev->motion_y);	671	($x, $y) = ($ev->motion_x, $ev->motion_y);
585		672
586	$self->{user_w} = $bw + $x - $ox;	673	$self->{user_w} = $bw + $x - $ox;
587	$self->{user_h} = $bh + $y - $oy;	674	$self->{user_h} = $bh + $y - $oy;
588	$self->update;	675	$self->check_size;
589	};	676	};
590		677
591	} elsif ($x >= 0 && $x < $self->{w}	678	} elsif ($x >= 0 && $x < $self->{w}
592	&& $y >= 0 && $y < $self->{border}) {	679	&& $y >= 0 && $y < $border) {
593		680
594	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	681	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595	my ($bx, $by) = ($self->{x}, $self->{y});	682	my ($bx, $by) = ($self->{x}, $self->{y});
596		683
597	$self->{motion} = sub {	684	$self->{motion} = sub {
…		…
626	glEnable GL_BLEND;	713	glEnable GL_BLEND;
627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630		717
		718	my $border = $self->border;
		719
631	glColor @{ $self->{border_bg} };	720	glColor @{ $self->{border_bg} };
632	$tex[1]->draw_quad (0, 0, $w, $self->{border});	721	$tex[1]->draw_quad (0, 0, $w, $border);
633	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	722	$tex[3]->draw_quad (0, $border, $border, $ch);
634	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	723	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
635	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	724	$tex[4]->draw_quad (0, $h - $border, $w, $border);
636		725
637	my $bg = $tex[0];	726	my $bg = $tex[0];
638		727
639	# TODO: repeat texture not scale	728	# TODO: repeat texture not scale
640	my $rep_x = $cw / $bg->{w};	729	my $rep_x = $cw / $bg->{w};
641	my $rep_y = $ch / $bg->{h};	730	my $rep_y = $ch / $bg->{h};
642		731
643	glColor @{ $self->{bg} };	732	glColor @{ $self->{bg} };
		733
		734	$bg->{s} = $rep_x;
		735	$bg->{t} = $rep_y;
		736	$bg->{wrap_mode} = 1;
644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	737	$bg->draw_quad ($border, $border, $cw, $ch);
645		738
646	glDisable GL_TEXTURE_2D;	739	glDisable GL_TEXTURE_2D;
647	glDisable GL_BLEND;	740	glDisable GL_BLEND;
648		741
649	$self->child->draw;	742	$self->child->draw;
…		…
667	@_	760	@_
668	)	761	)
669	}	762	}
670		763
671	sub add {	764	sub add {
672	my ($self, $x, $y, $chld) = @_;	765	my ($self, $x, $y, $child) = @_;
673		766
		767	$child->set_parent ($self);
674	$self->{children}[$y][$x] = $chld;	768	$self->{children}[$y][$x] = $child;
675	$chld->set_parent ($self);
676		769
677	$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};
678	$self->update;	778	$self->update;
679	}	779	}
680		780
681	sub get_wh {	781	sub get_wh {
682	my ($self) = @_;	782	my ($self) = @_;
…		…
710	(sum @$hs),	810	(sum @$hs),
711	)	811	)
712	}	812	}
713		813
714	sub size_allocate {	814	sub size_allocate {
715	my ($self, $x, $y, $w, $h) = @_;	815	my ($self, $w, $h) = @_;
716
717	$self->_size_allocate ($x, $y, $w, $h) or return;
718		816
719	my ($ws, $hs) = $self->get_wh;	817	my ($ws, $hs) = $self->get_wh;
720		818
721	my $req_w = sum @$ws;	819	my $req_w = sum @$ws;
722	my $req_h = sum @$hs;	820	my $req_h = sum @$hs;
…		…
727	my $col_expand = (sum @col_expand) \|\| 1;	825	my $col_expand = (sum @col_expand) \|\| 1;
728		826
729	# linearly scale sizes	827	# linearly scale sizes
730	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	828	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	829	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		830
		831	CFClient::UI::harmonize $ws;
		832	CFClient::UI::harmonize $hs;
732		833
733	my $y;	834	my $y;
734		835
735	for my $r (0 .. $#{$self->{children}}) {	836	for my $r (0 .. $#{$self->{children}}) {
736	my $row = $self->{children}[$r]	837	my $row = $self->{children}[$r]
…		…
741		842
742	for my $c (0 .. $#$row) {	843	for my $c (0 .. $#$row) {
743	my $col_w = $ws->[$c];	844	my $col_w = $ws->[$c];
744		845
745	if (my $widget = $row->[$c]) {	846	if (my $widget = $row->[$c]) {
746	$widget->size_allocate ($x, $y, $col_w, $row_h);	847	$widget->configure ($x, $y, $col_w, $row_h);
747	}	848	}
748		849
749	$x += $col_w;	850	$x += $col_w;
750	}	851	}
751		852
…		…
796	(List::Util::max map $_->[1], @alloc),	897	(List::Util::max map $_->[1], @alloc),
797	)	898	)
798	}	899	}
799		900
800	sub size_allocate {	901	sub size_allocate {
801	my ($self, $x, $y, $w, $h) = @_;	902	my ($self, $w, $h) = @_;
802
803	$self->_size_allocate ($x, $y, $w, $h);
804		903
805	($h, $w) = ($w, $h);	904	($h, $w) = ($w, $h);
806		905
807	my $children = $self->{children};	906	my $children = $self->{children};
808		907
…		…
824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	923	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825	$h[$_] = $alloc_h;	924	$h[$_] = $alloc_h;
826	}	925	}
827	}	926	}
828		927
		928	CFClient::UI::harmonize \@h;
		929
829	my $y = 0;	930	my $y = 0;
830	for (0 .. $#$children) {	931	for (0 .. $#$children) {
831	my $child = $children->[$_];	932	my $child = $children->[$_];
832	my $h = $h[$_];	933	my $h = $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	934	$child->configure ($y, 0, $h, $w);
834		935
835	$y += $h;	936	$y += $h;
836	}	937	}
		938
		939	1
837	}	940	}
838		941
839	#############################################################################	942	#############################################################################
840		943
841	package CFClient::UI::VBox;	944	package CFClient::UI::VBox;
…		…
854	(List::Util::sum map $_->[1], @alloc),	957	(List::Util::sum map $_->[1], @alloc),
855	)	958	)
856	}	959	}
857		960
858	sub size_allocate {	961	sub size_allocate {
859	my ($self, $x, $y, $w, $h) = @_;	962	my ($self, $w, $h) = @_;
860
861	$self->_size_allocate ($x, $y, $w, $h);
862		963
863	my $children = $self->{children};	964	my $children = $self->{children};
864		965
865	my @h = map +($_->size_request)[1], @$children;	966	my @h = map +($_->size_request)[1], @$children;
866		967
…		…
878		979
879	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	980	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880	}	981	}
881	}	982	}
882		983
		984	CFClient::UI::harmonize \@h;
		985
883	my $y = 0;	986	my $y = 0;
884	for (0 .. $#$children) {	987	for (0 .. $#$children) {
885	my $child = $children->[$_];	988	my $child = $children->[$_];
886	my $h = $h[$_];	989	my $h = $h[$_];
887	$child->size_allocate (0, $y, $w, $h);	990	$child->configure (0, $y, $w, $h);
888		991
889	$y += $h;	992	$y += $h;
890	}	993	}
		994
		995	1
891	}	996	}
892		997
893	#############################################################################	998	#############################################################################
894		999
895	package CFClient::UI::Label;	1000	package CFClient::UI::Label;
…		…
900		1005
901	sub new {	1006	sub new {
902	my ($class, %arg) = @_;	1007	my ($class, %arg) = @_;
903		1008
904	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
905	fg => [1, 1, 1],	1010	fg => [1, 1, 1],
906	height => $::FONTSIZE,	1011	fontsize => 1,
907	text => "",	1012	text => "",
908	align => -1,	1013	align => -1,
		1014	valign => -1,
909	padding => 2,	1015	padding => 2,
910	layout => new CFClient::Layout,	1016	layout => new CFClient::Layout,
911	%arg	1017	%arg
912	);	1018	);
913		1019
914	$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};
915		1024
916	$self	1025	$self
917	}	1026	}
918		1027
919	sub escape_text {	1028	sub escape_text {
…		…
927	}	1036	}
928		1037
929	sub set_text {	1038	sub set_text {
930	my ($self, $text) = @_;	1039	my ($self, $text) = @_;
931		1040
932	$self->{text} = $text;
933	$self->{layout}->set_markup ($text);	1041	$self->{layout}->set_text ($text);
934		1042
935	delete $self->{texture};	1043	delete $self->{texture};
936	# $self->{w} = $self->{h} = -1;
937	$self->update;	1044	$self->update;
938	}	1045	}
939		1046
940	sub get_text {	1047	sub set_markup {
941	my ($self, $text) = @_;	1048	my ($self, $markup) = @_;
942		1049
943	$self->{text}	1050	$self->{layout}->set_markup ($markup);
		1051
		1052	delete $self->{texture};
		1053	$self->update;
944	}	1054	}
945		1055
946	sub size_request {	1056	sub size_request {
947	my ($self) = @_;	1057	my ($self) = @_;
948		1058
949	$self->{layout}->set_width;	1059	$self->{layout}->set_width;
950	$self->{layout}->set_height ($self->{height});	1060	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1061
951	my ($w, $h) = $self->{layout}->size;	1062	my ($w, $h) = $self->{layout}->size;
952		1063
953	(	1064	(
954	$w + $self->{padding} * 2,	1065	$w + $self->{padding} * 2,
955	$h + $self->{padding} * 2,	1066	$h + $self->{padding} * 2,
956	)	1067	)
957	}	1068	}
958		1069
959	sub size_allocate {	1070	sub size_allocate {
960	my ($self, $x, $y, $w, $h) = @_;	1071	my ($self, $w, $h) = @_;
961
962	$self->_size_allocate ($x, $y, $w, $h) or return;
963		1072
964	delete $self->{texture};	1073	delete $self->{texture};
965	}
966
967	sub update {
968	my ($self) = @_;
969
970	delete $self->{texture};
971	$self->SUPER::update;
972	}	1074	}
973		1075
974	sub _draw {	1076	sub _draw {
975	my ($self) = @_;	1077	my ($self) = @_;
976		1078
977	my $tex = $self->{texture} \|\|= do {	1079	my $tex = $self->{texture} \|\|= do {
978	$self->{layout}->set_width ($self->{w});	1080	$self->{layout}->set_width ($self->{w});
979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1081	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
980	new_from_layout CFClient::Texture $self->{layout}	1082	new_from_layout CFClient::Texture $self->{layout}
981	};	1083	};
982		1084
983	glEnable GL_BLEND;	1085	glEnable GL_BLEND;
984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1086	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985	glEnable GL_TEXTURE_2D;	1087	glEnable GL_TEXTURE_2D;
986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1088	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987		1089
988	glColor @{$self->{fg}};	1090	glColor @{$self->{fg}};
989		1091
990	my $x =	1092	$self->{ox} = int (
991	$self->{align} < 0 ? $self->{padding}	1093	$self->{align} < 0 ? $self->{padding}
992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1094	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993	: ($self->{w} - $tex->{w}) * 0.5;	1095	: ($self->{w} - $tex->{w}) * 0.5
		1096	);
994		1097
995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1098	$self->{oy} = int (
996	$tex->draw_quad (0, 0);	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});
997		1105
998	glDisable GL_TEXTURE_2D;	1106	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	1107	glDisable GL_BLEND;
1000	}	1108	}
1001		1109
1002	#############################################################################	1110	#############################################################################
1003		1111
1004	package CFClient::UI::Entry;	1112	package CFClient::UI::EntryBase;
1005		1113
1006	our @ISA = CFClient::UI::Label::;	1114	our @ISA = CFClient::UI::Label::;
1007		1115
1008	use SDL;	1116	use SDL;
1009	use SDL::OpenGL;	1117	use SDL::OpenGL;
…		…
1016	bg => [0, 0, 0, 0.2],	1124	bg => [0, 0, 0, 0.2],
1017	active_bg => [1, 1, 1, 0.5],	1125	active_bg => [1, 1, 1, 0.5],
1018	active_fg => [0, 0, 0],	1126	active_fg => [0, 0, 0],
1019	can_hover => 1,	1127	can_hover => 1,
1020	can_focus => 1,	1128	can_focus => 1,
		1129	valign => 0,
1021	@_	1130	@_
1022	)	1131	)
1023	}	1132	}
1024		1133
1025	sub _set_text {	1134	sub _set_text {
1026	my ($self, $text) = @_;	1135	my ($self, $text) = @_;
1027		1136
		1137	delete $self->{cur_h};
		1138
		1139	return if $self->{text} eq $text;
		1140
		1141	delete $self->{texture};
		1142
1028	$self->{last_activity} = $::NOW;	1143	$self->{last_activity} = $::NOW;
1029
1030	$self->{text} = $text;	1144	$self->{text} = $text;
1031	$self->{layout}->set_width ($self->{w});
1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033		1145
1034	$text =~ s/./*/g if $self->{hidden};	1146	$text =~ s/./*/g if $self->{hidden};
		1147	$self->{layout}->set_text ("$text ");
1035		1148
1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1149	$self->emit (changed => $self->{text});
		1150	}
1037		1151
1038	$text = substr $text, 0, $self->{cursor};	1152	sub get_text {
1039	utf8::encode $text;	1153	$_[0]{text}
1040
1041	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042	}	1154	}
1043		1155
1044	sub size_request {	1156	sub size_request {
1045	my ($self) = @_;	1157	my ($self) = @_;
1046		1158
…		…
1048		1160
1049	($w + 1, $h) # add 1 for cursor	1161	($w + 1, $h) # add 1 for cursor
1050	}	1162	}
1051		1163
1052	sub size_allocate {	1164	sub size_allocate {
1053	my ($self, $x, $y, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1054
1055	$self->SUPER::size_allocate ($x, $y, $w, $h);
1056		1166
1057	$self->_set_text ($self->{text});	1167	$self->_set_text ($self->{text});
1058	}	1168	}
1059		1169
1060	sub set_text {	1170	sub set_text {
…		…
1085	++$self->{cursor} if $self->{cursor} < length $self->{text};	1195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1086	} elsif ($sym == SDLK_HOME) {	1196	} elsif ($sym == SDLK_HOME) {
1087	$self->{cursor} = 0;	1197	$self->{cursor} = 0;
1088	} elsif ($sym == SDLK_END) {	1198	} elsif ($sym == SDLK_END) {
1089	$self->{cursor} = length $text;	1199	$self->{cursor} = length $text;
		1200	} elsif ($sym == SDLK_ESCAPE) {
		1201	$self->emit ('escape');
1090	} elsif ($uni) {	1202	} elsif ($uni) {
1091	substr $text, $self->{cursor}++, 0, chr $uni;	1203	substr $text, $self->{cursor}++, 0, chr $uni;
1092	}	1204	}
1093		1205
1094	$self->_set_text ($text);	1206	$self->_set_text ($text);
…		…
1148		1260
1149	$self->SUPER::_draw;	1261	$self->SUPER::_draw;
1150		1262
1151	#TODO: force update every cursor change :(	1263	#TODO: force update every cursor change :(
1152	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
1153	glColor @{$self->{fg}};	1273	glColor @{$self->{fg}};
1154	glBegin GL_LINES;	1274	glBegin GL_LINES;
1155	glVertex $self->{cur_x}, $self->{cur_y};
1156	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};
1157	glEnd;	1277	glEnd;
1158	}	1278	}
1159	}	1279	}
1160		1280
1161	package CFClient::UI::LineEntry;	1281	package CFClient::UI::Entry;
1162		1282
1163	our @ISA = CFClient::UI::Entry::;	1283	our @ISA = CFClient::UI::EntryBase::;
1164		1284
1165	use SDL;	1285	use SDL;
1166	use SDL::OpenGL;	1286	use SDL::OpenGL;
1167		1287
1168	sub key_down {	1288	sub key_down {
…		…
1198		1318
1199	$class->SUPER::new (	1319	$class->SUPER::new (
1200	padding => 4,	1320	padding => 4,
1201	fg => [1, 1, 1],	1321	fg => [1, 1, 1],
1202	bg => [1, 1, 1, 0.2],	1322	bg => [1, 1, 1, 0.2],
1203	active_fg => [1, 1, 0],	1323	active_fg => [0, 0, 1],
1204	can_hover => 1,	1324	can_hover => 1,
		1325	align => 0,
		1326	valign => 0,
1205	@_	1327	@_
1206	)	1328	)
1207	}	1329	}
1208		1330
1209	sub button_up {	1331	sub button_up {
…		…
1217		1339
1218	sub _draw {	1340	sub _draw {
1219	my ($self) = @_;	1341	my ($self) = @_;
1220		1342
1221	local $self->{fg} = $self->{fg};	1343	local $self->{fg} = $self->{fg};
1222	my $tex = $tex[0];
1223
1224	glEnable GL_BLEND;
1225	glEnable GL_TEXTURE_2D;
1226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227		1344
1228	if ($GRAB == $self) {	1345	if ($GRAB == $self) {
1229	$self->{fg} = $self->{active_fg};	1346	$self->{fg} = $self->{active_fg};
1230	}	1347	}
1231		1348
1232	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;
1233	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;
1234		1354
1235	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1355	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1236		1356
1237	glDisable GL_TEXTURE_2D;	1357	glDisable GL_TEXTURE_2D;
1238	glDisable GL_BLEND;	1358	glDisable GL_BLEND;
1239		1359
1240	$self->SUPER::_draw;	1360	$self->SUPER::_draw;
…		…
1243	#############################################################################	1363	#############################################################################
1244		1364
1245	package CFClient::UI::CheckBox;	1365	package CFClient::UI::CheckBox;
1246		1366
1247	our @ISA = CFClient::UI::DrawBG::;	1367	our @ISA = CFClient::UI::DrawBG::;
		1368
		1369	my @tex =
		1370	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1371	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1248		1372
1249	use SDL;	1373	use SDL;
1250	use SDL::OpenGL;	1374	use SDL::OpenGL;
1251		1375
1252	sub new {	1376	sub new {
…		…
1266	my ($self) = @_;	1390	my ($self) = @_;
1267		1391
1268	($self->{padding} * 2 + 6) x 2	1392	($self->{padding} * 2 + 6) x 2
1269	}	1393	}
1270		1394
1271	sub size_allocate {
1272	my ($self, $x, $y, $w, $h) = @_;
1273
1274	$self->_size_allocate ($x, $y, $w, $h);
1275	}
1276
1277	sub button_down {	1395	sub button_down {
1278	my ($self, $ev, $x, $y) = @_;	1396	my ($self, $ev, $x, $y) = @_;
1279		1397
1280	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1398	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1281	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1399	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1290	$self->SUPER::_draw;	1408	$self->SUPER::_draw;
1291		1409
1292	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1410	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293		1411
1294	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1412	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1413
		1414	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1415
		1416	glEnable GL_BLEND;
		1417	glEnable GL_TEXTURE_2D;
		1418	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1419
		1420	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1421
		1422	$tex->draw_quad (0, 0, $s, $s);
		1423
		1424	glDisable GL_TEXTURE_2D;
		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];
1295		1468
1296	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1469	@$tex{qw(w h)}
		1470	}
1297		1471
1298	glBegin GL_LINE_LOOP;	1472	sub set_max {
1299	glVertex 0 , 0;	1473	my ($self, $max) = @_;
1300	glVertex 0 , $s;	1474
1301	glVertex $s, $s;	1475	$self->{max_val} = $max;
1302	glVertex $s, 0;	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;
1303	glEnd;	1519	glEnd;
1304		1520
1305	if ($self->{state}) {	1521	$yp += $h1;
1306	glBegin GL_LINES;	1522
1307	glVertex 0 , 0;	1523	glBindTexture GL_TEXTURE_2D, $t2->{name};
1308	glVertex $s, $s;	1524	glBegin GL_QUADS;
1309	glVertex $s, 0;	1525	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1310	glVertex 0 , $s;	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;
1311	glEnd;	1529	glEnd;
1312	}	1530
		1531	glDisable GL_BLEND;
		1532	glDisable GL_TEXTURE_2D;
1313	}	1533	}
1314		1534
1315	#############################################################################	1535	#############################################################################
1316		1536
1317	package CFClient::UI::Slider;	1537	package CFClient::UI::Slider;
…		…
1336	# TODO: calculations are off	1556	# TODO: calculations are off
1337	my $self = $class->SUPER::new (	1557	my $self = $class->SUPER::new (
1338	fg => [1, 1, 1],	1558	fg => [1, 1, 1],
1339	active_fg => [0, 0, 0],	1559	active_fg => [0, 0, 0],
1340	range => [0, 0, 100, 10],	1560	range => [0, 0, 100, 10],
1341	req_w => 40,	1561	req_w => 20,
1342	req_h => 13,	1562	req_h => 20,
1343	vertical => 0,	1563	vertical => 0,
1344	can_hover => 1,	1564	can_hover => 1,
		1565	inner_pad => 5,
1345	@_	1566	@_
1346	);	1567	);
1347		1568
1348	$self	1569	$self
1349	}	1570	}
…		…
1370	if ($GRAB == $self) {	1591	if ($GRAB == $self) {
1371	my ($value, $lo, $hi, $page) = @{$self->{range}};	1592	my ($value, $lo, $hi, $page) = @{$self->{range}};
1372		1593
1373	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1594	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374		1595
		1596	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1597	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1598
		1599	$x -= $inner_pad_px; # substract the padding
1375	$x = $x * ($hi - $lo) / $w + $lo;	1600	$x = $x * ($hi - $lo) / $inner_w + $lo;
1376	$x = $lo if $x < $lo;	1601	$x = $lo if $x < $lo;
1377	$x = $hi - $page if $x > $hi - $page;	1602	$x = $hi - $page if $x > $hi - $page;
1378	$self->{range}[0] = $x;	1603	$self->{range}[0] = $x;
1379		1604
1380	$self->emit (changed => $x);	1605	$self->emit (changed => $x);
1381	$self->update;	1606	$self->update;
1382	}	1607	}
		1608	}
		1609
		1610	# the inner_* stuff is for generating a padding for the slider handle,
		1611	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1612	# correct propably, but it does the job for now
		1613	sub _calc_inner_pad_px {
		1614	my ($self, $w) = @_;
		1615	($w / 100) * $self->{inner_pad} # % to pixels
1383	}	1616	}
1384		1617
1385	sub _draw {	1618	sub _draw {
1386	my ($self) = @_;	1619	my ($self) = @_;
1387		1620
…		…
1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1634	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1635	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403		1636
1404	my ($value, $lo, $hi, $page) = @{$self->{range}};	1637	my ($value, $lo, $hi, $page) = @{$self->{range}};
1405		1638
1406	# the inner_* stuff is for generating a padding for the slider handle,	1639	$hi = $value + 1 if $lo == $hi;
1407	# so that the handle doesn't leave the texture. This calculation isn't 100%	1640
1408	# correct propably, but it does the job for now	1641	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409	my $inner_pad = 5; # 5% of width for slider bg texture border
1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411	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
1412		1643
1413	$page = int $page * $inner_w / ($hi - $lo);	1644	$page = int $page * $inner_w / ($hi - $lo);
1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1645	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415		1646
1416	$w -= $page;	1647	$w -= $page;
…		…
1446		1677
1447	sub new {	1678	sub new {
1448	my $class = shift;	1679	my $class = shift;
1449		1680
1450	my $self = $class->SUPER::new (	1681	my $self = $class->SUPER::new (
		1682	fontsize => 1,
		1683	@_,
		1684
		1685	layout => (new CFClient::Layout),
1451	par => [],	1686	par => [],
1452	@_,	1687	height => 0,
1453	children => [	1688	children => [
1454	(new CFClient::UI::Empty expand => 1),	1689	(new CFClient::UI::Empty expand => 1),
1455	(new CFClient::UI::Slider vertical => 1),	1690	(new CFClient::UI::Slider vertical => 1),
1456	],	1691	],
1457	);	1692	);
1458		1693
		1694	$self->{children}[1]->connect (changed => sub {
		1695	$self->update;
		1696	});
		1697
1459	$self	1698	$self
		1699	}
		1700
		1701	sub set_fontsize {
		1702	my ($self, $fontsize) = @_;
		1703
		1704	$self->{fontsize} = $fontsize;
		1705	$self->reflow;
		1706	}
		1707
		1708	sub text_height {
		1709	my ($self, $text) = @_;
		1710
		1711	my $layout = $self->{layout};
		1712
		1713	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		1714	$layout->set_width ($self->{w});
		1715	$layout->set_text ($text);
		1716
		1717	($layout->size)[1]
		1718	}
		1719
		1720	sub reflow {
		1721	my ($self) = @_;
		1722
		1723	$self->{need_reflow}++;
		1724	$self->update;
		1725	}
		1726
		1727	sub size_allocate {
		1728	my ($self, $w, $h) = @_;
		1729
		1730	$self->SUPER::size_allocate ($w, $h);
		1731
		1732	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1733	$self->{layout}->set_width ($self->{children}[0]{w});
		1734
		1735	$self->reflow;
1460	}	1736	}
1461		1737
1462	sub add_paragraph {	1738	sub add_paragraph {
1463	my ($self, $color, $text) = @_;	1739	my ($self, $color, $text) = @_;
1464		1740
		1741	#TODO: intelligently "reformat" paragraph
		1742
		1743	my $height = $self->text_height ($text);
		1744
		1745	$self->{height} += $height;
		1746
1465	push @{$self->{par}}, [$color, $text];	1747	push @{$self->{par}}, [$height, $color, $text];
1466	my $count = scalar @{$self->{par}};	1748
1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1749	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468	$self->{children}[1]->update;	1750	$self->{children}[1]->update;
1469	}	1751	}
1470		1752
		1753	sub update {
		1754	my ($self) = @_;
		1755
		1756	$self->SUPER::update;
		1757
		1758	return unless $self->{h} > 0;
		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
		1776	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1777	glClearColor 0, 0, 0, 1;
		1778	glClear GL_COLOR_BUFFER_BIT;
		1779
		1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1782	glEnable GL_TEXTURE_2D;
		1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1784
		1785	my $top = int $self->{children}[1]{range}[0];
		1786
		1787	my $y0 = $top;
		1788	my $y1 = $top + $self->{h};
		1789
		1790	my $y = 0;
		1791
		1792	my $layout = $self->{layout};
		1793
		1794	for my $par (@{$self->{par}}) {
		1795	my $h = $par->[0];
		1796
		1797	if ($y0 < $y + $h && $y < $y1) {
		1798	$layout->set_text ($par->[2]);
		1799
		1800	glColor @{ $par->[1] };
		1801	my ($W, $H) = $layout->size;
		1802	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1803	}
		1804
		1805	$y += $h;
		1806	}
		1807
		1808	glDisable GL_TEXTURE_2D;
		1809	glDisable GL_BLEND;
		1810	};
		1811	});
		1812	}
		1813
1471	sub _draw {	1814	sub _draw {
1472	my ($self) = @_;	1815	my ($self) = @_;
1473		1816
1474	my $par = $self->{par};	1817	if ($self->{texture}) {
1475
1476	my $bottom = (scalar @$par) - 1;
1477
1478	my $w = $self->{children}[0]{w};
1479	my $y = $self->{h};
1480
1481	glEnable GL_BLEND;
1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483	glEnable GL_TEXTURE_2D;	1818	glEnable GL_TEXTURE_2D;
1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485		1820	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486	# TODO: everything!
1487	while ($y > 0 && $bottom >= 0) {
1488	my $par = $par->[$bottom--];
1489
1490	my $layout = new CFClient::Layout;
1491
1492	$layout->set_height ($::FONTSIZE);
1493	$layout->set_width ($w);
1494	$layout->set_text ($par->[1]);
1495	my $tex = new_from_layout CFClient::Texture $layout;
1496	$y -= $tex->{h};
1497
1498	glColor @{ $par->[0] };
1499	$tex->draw_quad (0, $y);
1500	}
1501
1502	glDisable GL_TEXTURE_2D;	1821	glDisable GL_TEXTURE_2D;
1503	glDisable GL_BLEND;	1822	}
		1823
		1824	$self->{children}[1]->draw;
		1825
1504	}	1826	}
1505		1827
1506	#############################################################################	1828	#############################################################################
1507		1829
1508	package CFClient::UI::MapWidget;	1830	package CFClient::UI::MapWidget;
…		…
1532	}	1854	}
1533		1855
1534	sub key_up {	1856	sub key_up {
1535	}	1857	}
1536		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
1537	sub size_request {	1893	sub size_request {
1538	(	1894	(
1539	1 + 32 * int $::WIDTH / 32,	1895	1 + 32 * int $::WIDTH / 32,
1540	1 + 32 * int $::HEIGHT / 32,	1896	1 + 32 * int $::HEIGHT / 32,
1541	)	1897	)
…		…
1549	}	1905	}
1550		1906
1551	sub draw {	1907	sub draw {
1552	my ($self) = @_;	1908	my ($self) = @_;
1553		1909
1554	$self->{need_update}++;#d#
1555	if (delete $self->{need_update}) {	1910	if (delete $self->{need_update}) {
1556	glNewList $self->{list}, GL_COMPILE;	1911	glNewList $self->{list}, GL_COMPILE;
1557		1912
1558	my $sw = int $::WIDTH / 32;
1559	my $sh = int $::HEIGHT / 32;
1560
1561	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
1562	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);
1563		1923
1564	if ($::CFG->{fow_enable}) {	1924	if ($::CFG->{fow_enable}) {
1565	if ($::CFG->{fow_smooth}) { # smooth fog of war	1925	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1566	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1926	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1567	glConvolutionFilter2D	1927	glConvolutionFilter2D (
1568	GL_CONVOLUTION_2D,	1928	GL_CONVOLUTION_2D,
1569	GL_ALPHA,	1929	GL_ALPHA,
1570	3, 3,	1930	3, 3,
1571	GL_ALPHA, GL_FLOAT,	1931	GL_ALPHA, GL_FLOAT,
1572	pack "f*",	1932	pack "f*",
1573	0.1, 0.1, 0.1,	1933	0.1, 0.1, 0.1,
1574	0.1, 0.2, 0.1,	1934	0.1, 0.2, 0.1,
1575	0.1, 0.1, 0.1,	1935	0.1, 0.1, 0.1,
1576	;	1936	);
1577	glEnable GL_CONVOLUTION_2D;	1937	glEnable GL_CONVOLUTION_2D;
1578	}	1938	}
1579		1939
1580	my $tex = new CFClient::Texture	1940	$self->{fow_texture} = new CFClient::Texture
1581	w => $w,	1941	w => $w,
1582	h => $h,	1942	h => $h,
1583	data => $data,	1943	data => $data,
1584	internalformat => GL_ALPHA,	1944	internalformat => GL_ALPHA,
1585	format => GL_ALPHA;	1945	format => GL_ALPHA;
1586		1946
1587	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1947	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588		1948
1589	glEnable GL_BLEND;	1949	glEnable GL_BLEND;
		1950	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590	glEnable GL_TEXTURE_2D;	1951	glEnable GL_TEXTURE_2D;
1591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1952	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592		1953
1593	glColor +($::CFG->{fow_intensity}) x 3, 1;	1954	glColor +($::CFG->{fow_intensity}) x 3, 1;
1594	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1955	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1595		1956
1596	glDisable GL_TEXTURE_2D;	1957	glDisable GL_TEXTURE_2D;
1597	glDisable GL_BLEND;	1958	glDisable GL_BLEND;
1598	}	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
1599	}	1984	}
1600		1985
1601	glEndList;	1986	glEndList;
1602	}	1987	}
1603		1988
		1989	glPushMatrix;
1604	glCallList $self->{list};	1990	glCallList $self->{list};
		1991	glPopMatrix;
1605		1992
1606	if ($FOCUS != $self) {	1993	if ($FOCUS != $self) {
1607	glColor 64/255, 64/255, 64/255;	1994	glColor 64/255, 64/255, 64/255;
1608	glLogicOp GL_AND;	1995	glLogicOp GL_AND;
1609	glEnable GL_COLOR_LOGIC_OP;	1996	glEnable GL_COLOR_LOGIC_OP;
…		…
1638		2025
1639	my $mod = $ev->key_mod;	2026	my $mod = $ev->key_mod;
1640	my $sym = $ev->key_sym;	2027	my $sym = $ev->key_sym;
1641		2028
1642	if ($sym == SDLK_KP5) {	2029	if ($sym == SDLK_KP5) {
1643	$::CONN->user_send ("command stay fire");	2030	$::CONN->user_send ("stay fire");
1644	} elsif ($sym == SDLK_a) {	2031	} elsif ($sym == SDLK_a) {
1645	$::CONN->user_send ("command apply");	2032	$::CONN->user_send ("apply");
		2033	} elsif ($sym == SDLK_QUOTE) {
		2034	$self->emit ('activate_console');
		2035	} elsif ($sym == SDLK_SLASH) {
		2036	$self->emit ('activate_console' => '/');
1646	} elsif (exists $DIR{$sym}) {	2037	} elsif (exists $DIR{$sym}) {
1647	if ($mod & KMOD_SHIFT) {	2038	if ($mod & KMOD_SHIFT) {
1648	$self->{shft}++;	2039	$self->{shft}++;
1649	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2040	$::CONN->user_send ("fire $DIR{$sym}[0]");
1650	} elsif ($mod & KMOD_CTRL) {	2041	} elsif ($mod & KMOD_CTRL) {
1651	$self->{ctrl}++;	2042	$self->{ctrl}++;
1652	$::CONN->user_send ("command run $DIR{$sym}[0]");	2043	$::CONN->user_send ("run $DIR{$sym}[0]");
1653	} else {	2044	} else {
1654	$::CONN->user_send ("command $DIR{$sym}[1]");	2045	$::CONN->user_send ("$DIR{$sym}[1]");
1655	}	2046	}
1656	}	2047	}
1657	}	2048	}
1658		2049
1659	sub key_up {	2050	sub key_up {
…		…
1661		2052
1662	my $mod = $ev->key_mod;	2053	my $mod = $ev->key_mod;
1663	my $sym = $ev->key_sym;	2054	my $sym = $ev->key_sym;
1664		2055
1665	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2056	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1666	$::CONN->user_send ("command fire_stop");	2057	$::CONN->user_send ("fire_stop");
1667	}	2058	}
1668	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2059	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1669	$::CONN->user_send ("command run_stop");	2060	$::CONN->user_send ("run_stop");
1670	}	2061	}
1671	}	2062	}
1672		2063
1673	#############################################################################	2064	#############################################################################
1674		2065
…		…
1738	sub toggle_flopper {	2129	sub toggle_flopper {
1739	my ($self) = @_;	2130	my ($self) = @_;
1740		2131
1741	# TODO: use animation	2132	# TODO: use animation
1742	if ($self->{state} = !$self->{state}) {	2133	if ($self->{state} = !$self->{state}) {
1743	$CFClient::UI::TOPLEVEL->add ($self->{other});	2134	$CFClient::UI::ROOT->add ($self->{other});
1744	$self->{other}->move (	2135	$self->{other}->move ($self->coord2global (0, $self->{h}));
1745	($::WIDTH - $self->{other}{w}) * 0.5,	2136	$self->emit ("open");
1746	($::HEIGHT - $self->{other}{h}) * 0.5,
1747	);
1748	} else {	2137	} else {
1749	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2138	$CFClient::UI::ROOT->remove ($self->{other});
		2139	$self->emit ("close");
1750	}	2140	}
1751	}
1752		2141
1753	#############################################################################	2142	$self->emit (changed => $self->{state});
		2143	}
1754		2144
		2145	#############################################################################
		2146
1755	package CFClient::UI::Toplevel;	2147	package CFClient::UI::Root;
1756		2148
1757	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	}
1758		2158
1759	sub size_request {	2159	sub size_request {
1760	($::WIDTH, $::HEIGHT)	2160	($::WIDTH, $::HEIGHT)
1761	}	2161	}
1762		2162
1763	sub size_allocate {	2163	sub configure {
1764	my ($self, $x, $y, $w, $h) = @_;	2164	my ($self, $x, $y, $w, $h) = @_;
1765		2165
1766	$self->_size_allocate ($x, $y, $w, $h);	2166	$self->SUPER::configure ($x, $y, $w, $h);
1767		2167
1768	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2168	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1769	for @{$self->{children}};	2169	for @{$self->{children}};
1770	}	2170	}
1771		2171
1772	sub translate {	2172	sub _topleft {
1773	my ($self, $x, $y) = @_;	2173	my ($self, $x, $y) = @_;
1774		2174
1775	($x, $y)	2175	($x, $y)
1776	}	2176	}
1777		2177
1778	sub update {	2178	sub update {
1779	my ($self) = @_;	2179	my ($self) = @_;
1780		2180
1781	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2181	$self->check_size;
1782	::refresh ();	2182	::refresh ();
1783	}	2183	}
1784		2184
1785	sub add {	2185	sub add {
1786	my ($self, $widget) = @_;	2186	my ($self, $child) = @_;
1787		2187
1788	$self->SUPER::add ($widget);	2188	$self->SUPER::add ($child);
		2189	}
1789		2190
1790	$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;
1791	}	2195	}
1792		2196
1793	sub draw {	2197	sub draw {
1794	my ($self) = @_;	2198	my ($self) = @_;
1795		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
1796	$self->_draw;	2214	$self->_draw;
1797	}	2215	}
1798		2216
1799	#############################################################################	2217	#############################################################################
1800		2218
1801	package CFClient::UI;	2219	package CFClient::UI;
1802		2220
1803	$TOPLEVEL = new CFClient::UI::Toplevel;	2221	$ROOT = new CFClient::UI::Root;
1804		2222
1805	1	2223	1
1806		2224

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.99 by elmex, Fri Apr 14 10:57:35 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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.134 by root, Wed Apr 19 06:06:45 2006 UTC