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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.63 by root, Tue Apr 11 13:29:24 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

…		…
1	package CFClient::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
6		6	use List::Util ();
7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;
9		7
10	use CFClient;	8	use CFClient;
11		9
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		11
70	}	68	}
71		69
72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73	}	71	}
74		72
		73	#############################################################################
		74
		75	package CFClient::UI::Base;
		76
		77	use strict;
		78
		79	use SDL::OpenGL;
		80
75	sub new {	81	sub new {
76	my $class = shift;	82	my $class = shift;
77		83
78	bless { @_ }, $class	84	bless {
		85	x => 0,
		86	y => 0,
		87	z => 0,
		88	@_
		89	}, $class
79	}	90	}
80		91
81	sub move {	92	sub move {
82	my ($self, $x, $y, $z) = @_;	93	my ($self, $x, $y, $z) = @_;
83	$self->{x} = $x;	94	$self->{x} = $x;
…		…
109	}	120	}
110		121
111	sub focus_in {	122	sub focus_in {
112	my ($self) = @_;	123	my ($self) = @_;
113		124
		125	return if $FOCUS == $self;
		126
114	my $focus = $FOCUS; $FOCUS = $self;	127	my $focus = $FOCUS; $FOCUS = $self;
115	$focus->update if $focus;	128	$focus->update if $focus;
116	$FOCUS->update;	129	$FOCUS->update;
117	}	130	}
118		131
…		…
125	$focus->update if $focus; #?	138	$focus->update if $focus; #?
126	}	139	}
127		140
128	sub mouse_motion { }	141	sub mouse_motion { }
129	sub button_up { }	142	sub button_up { }
130	sub button_down { }
131	sub key_down { }	143	sub key_down { }
132	sub key_up { }	144	sub key_up { }
		145
		146	sub button_down {
		147	my ($self, $ev, $x, $y) = @_;
		148
		149	$self->focus_in;
		150	}
133		151
134	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	152	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	153	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	154	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	155	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	156	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139		157
140	sub draw {	158	sub draw {
141	my ($self) = @_;	159	my ($self) = @_;
142		160
		161	return unless $self->{h} && $self->{w};
		162
143	glPushMatrix;	163	glPushMatrix;
144	glTranslate $self->{x}, $self->{y}, 0;	164	glTranslate $self->{x}, $self->{y}, 0;
145	$self->_draw;	165	$self->_draw;
		166	glPopMatrix;
		167
146	if ($self == $HOVER) {	168	if ($self == $HOVER) {
		169	my ($x, $y) = @$self{qw(x y)};
		170
147	glColor 1, 1, 1, 0.4;	171	glColor 1, 1, 1, 0.1;
148	glEnable GL_BLEND;	172	glEnable GL_BLEND;
		173	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149	glBegin GL_QUADS;	174	glBegin GL_QUADS;
150	glVertex 0 , 0;	175	glVertex $x , $y;
151	glVertex $self->{w}, 0;	176	glVertex $x + $self->{w}, $y;
152	glVertex $self->{w}, $self->{h};	177	glVertex $x + $self->{w}, $y + $self->{h};
153	glVertex 0 , $self->{h};	178	glVertex $x , $y + $self->{h};
154	glEnd;	179	glEnd;
155	glDisable GL_BLEND;	180	glDisable GL_BLEND;
156	}	181	}
157	glPopMatrix;
158	}	182	}
159		183
160	sub _draw {	184	sub _draw {
161	my ($self) = @_;	185	my ($self) = @_;
162		186
…		…
202		226
203	$self->{parent}->update	227	$self->{parent}->update
204	if $self->{parent};	228	if $self->{parent};
205	}	229	}
206		230
		231	sub connect {
		232	my ($self, $signal, $cb) = @_;
		233
		234	push @{ $self->{cb}{$signal} }, $cb;
		235	}
		236
		237	sub emit {
		238	my ($self, $signal, @args) = @_;
		239
		240	$_->($self, @args)
		241	for @{$self->{cb}{$signal} \|\| []};
		242	}
		243
207	sub DESTROY {	244	sub DESTROY {
208	my ($self) = @_;	245	my ($self) = @_;
209		246
210	#$self->deactivate;	247	#$self->deactivate;
211	}	248	}
212		249
213	#############################################################################	250	#############################################################################
214		251
215	package CFClient::Widget::Container;	252	package CFClient::UI::DrawBG;
216		253
217	our @ISA = CFClient::Widget::;	254	our @ISA = CFClient::UI::Base::;
		255
		256	use strict;
		257	use SDL::OpenGL;
218		258
219	sub new {	259	sub new {
		260	my $class = shift;
		261
		262	# range [value, low, high, page]
		263
		264	$class->SUPER::new (
		265	bg => [0, 0, 0, 0.4],
		266	active_bg => [1, 1, 1],
		267	@_
		268	)
		269	}
		270
		271	sub _draw {
		272	my ($self) = @_;
		273
		274	my ($w, $h) = @$self{qw(w h)};
		275
		276	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		277	glBegin GL_QUADS;
		278	glVertex 0 , 0;
		279	glVertex 0 , $h;
		280	glVertex $w, $h;
		281	glVertex $w, 0;
		282	glEnd;
		283	}
		284
		285	#############################################################################
		286
		287	package CFClient::UI::Empty;
		288
		289	our @ISA = CFClient::UI::Base::;
		290
		291	sub size_request {
		292	(0, 0)
		293	}
		294
		295	sub draw { }
		296
		297	#############################################################################
		298
		299	package CFClient::UI::Container;
		300
		301	our @ISA = CFClient::UI::Base::;
		302
		303	sub new {
220	my ($class, @widgets) = @_;	304	my ($class, %arg) = @_;
221		305
		306	my $children = delete $arg{children} \|\| [];
		307
222	my $self = $class->SUPER::new (children => []);	308	my $self = $class->SUPER::new (children => [], %arg);
223	$self->add ($_) for @widgets;	309	$self->add ($_) for @$children;
224		310
225	$self	311	$self
226	}	312	}
227		313
228	sub add {	314	sub add {
229	my ($self, $chld, $expand) = @_;	315	my ($self, $chld, $expand) = @_;
230		316
231	$chld->{expand} = $expand;	317	$chld->{expand} = $expand;
232	$chld->set_parent ($self);	318	$chld->set_parent ($self);
233		319
234	@{$self->{children}} =	320	$self->{children} = [
235	sort { $a->{z} <=> $b->{z} }	321	sort { $a->{z} <=> $b->{z} }
236	@{$self->{children}}, $chld;	322	@{$self->{children}}, $chld
		323	];
237		324
238	$self->size_allocate ($self->{w}, $self->{h})	325	$self->size_allocate ($self->{w}, $self->{h})
239	if $self->{w}; #TODO: check for "realised state"	326	if $self->{w}; #TODO: check for "realised state"
240	}	327	}
241		328
…		…
269	$_->draw for @{$self->{children}};	356	$_->draw for @{$self->{children}};
270	}	357	}
271		358
272	#############################################################################	359	#############################################################################
273		360
274	package CFClient::Widget::Bin;	361	package CFClient::UI::Bin;
275		362
276	our @ISA = CFClient::Widget::Container::;	363	our @ISA = CFClient::UI::Container::;
		364
		365	sub new {
		366	my ($class, %arg) = @_;
		367
		368	my $child = (delete $arg{child}) \|\| new CFClient::UI::Empty::;
		369
		370	$class->SUPER::new (children => [$child], %arg)
		371	}
		372
		373	sub add {
		374	my ($self, $widget) = @_;
		375
		376	$self->{children} = [];
		377
		378	$self->SUPER::add ($widget);
		379	}
		380
		381	sub remove {
		382	my ($self, $widget) = @_;
		383
		384	$self->SUPER::remove ($widget);
		385
		386	$self->{children} = [new CFClient::UI::Empty]
		387	unless @{$self->{children}};
		388	}
277		389
278	sub child { $_[0]->{children}[0] }	390	sub child { $_[0]->{children}[0] }
279		391
280	sub size_request {	392	sub size_request {
281	$_[0]{children}[0]->size_request if $_[0]{children}[0];	393	$_[0]{children}[0]->size_request
282	}	394	}
283		395
284	sub size_allocate {	396	sub size_allocate {
285	my ($self, $w, $h) = @_;	397	my ($self, $w, $h) = @_;
286		398
		399	return unless $self->{w} != $w \|\| $self->{h} != $h;
		400
287	$self->SUPER::size_allocate ($w, $h);	401	$self->SUPER::size_allocate ($w, $h);
288	$self->{children}[0]->size_allocate ($w, $h)	402	$self->{children}[0]->size_allocate ($w, $h);
289	if $self->{children}[0]
290	}	403	}
291		404
292	#############################################################################	405	#############################################################################
293		406
294	package CFClient::Widget::Window;	407	package CFClient::UI::Window;
295		408
296	our @ISA = CFClient::Widget::Bin::;	409	our @ISA = CFClient::UI::Bin::;
297		410
298	use SDL::OpenGL;	411	use SDL::OpenGL;
299		412
300	sub new {	413	sub new {
301	my ($class, $x, $y, $z, $w, $h) = @_;	414	my ($class, %arg) = @_;
302		415
303	my $self = $class->SUPER::new;	416	my $self = $class->SUPER::new (%arg);
304
305	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306	}	417	}
307		418
308	sub update {	419	sub update {
309	my ($self) = @_;	420	my ($self) = @_;
310		421
…		…
323	}	434	}
324		435
325	sub size_allocate {	436	sub size_allocate {
326	my ($self, $w, $h) = @_;	437	my ($self, $w, $h) = @_;
327		438
		439	return unless $self->{w} != $w \|\| $self->{h} != $h;
		440
328	$self->{w} = $w;	441	$self->{w} = $w;
329	$self->{h} = $h;	442	$self->{h} = $h;
330		443
331	$self->child->size_allocate ($w, $h);	444	$self->child->size_allocate ($w, $h);
332		445
…		…
340		453
341	my $tex = $self->{texture}	454	my $tex = $self->{texture}
342	or return;	455	or return;
343		456
344	glEnable GL_BLEND;	457	glEnable GL_BLEND;
		458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
345	glEnable GL_TEXTURE_2D;	459	glEnable GL_TEXTURE_2D;
346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
347		461
348	$tex->draw_quad (0, 0, $w, $h);	462	$tex->draw_quad (0, 0, $w, $h);
349		463
…		…
351	glDisable GL_TEXTURE_2D;	465	glDisable GL_TEXTURE_2D;
352	}	466	}
353		467
354	#############################################################################	468	#############################################################################
355		469
356	package CFClient::Widget::Frame;	470	package CFClient::UI::Frame;
357		471
358	our @ISA = CFClient::Widget::Bin::;	472	our @ISA = CFClient::UI::Bin::;
359		473
360	use SDL::OpenGL;	474	use SDL::OpenGL;
361		475
362	sub size_request {	476	sub size_request {
363	my ($self) = @_;	477	my ($self) = @_;
…		…
370	}	484	}
371		485
372	sub size_allocate {	486	sub size_allocate {
373	my ($self, $w, $h) = @_;	487	my ($self, $w, $h) = @_;
374		488
		489	return unless $self->{w} != $w \|\| $self->{h} != $h;
		490
375	$self->{w} = $w;	491	$self->{w} = $w;
376	$self->{h} = $h;	492	$self->{h} = $h;
377		493
378	$self->child->size_allocate ($w - 4, $h - 4);	494	$self->child->size_allocate ($w - 4, $h - 4);
379	$self->child->move (2, 2);	495	$self->child->move (2, 2);
…		…
397	$chld->draw;	513	$chld->draw;
398	}	514	}
399		515
400	#############################################################################	516	#############################################################################
401		517
402	package CFClient::Widget::FancyFrame;	518	package CFClient::UI::FancyFrame;
403		519
404	our @ISA = CFClient::Widget::Bin::;	520	our @ISA = CFClient::UI::Bin::;
405		521
406	use SDL::OpenGL;	522	use SDL::OpenGL;
407		523
408	my @tex =	524	my @tex =
409	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	525	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
412	sub size_request {	528	sub size_request {
413	my ($self) = @_;	529	my ($self) = @_;
414		530
415	my ($w, $h) = $self->SUPER::size_request;	531	my ($w, $h) = $self->SUPER::size_request;
416		532
417	$h += $tex[1]->{height};	533	$h += $tex[1]->{h};
418	$h += $tex[4]->{height};	534	$h += $tex[4]->{h};
419	$w += $tex[2]->{width};	535	$w += $tex[2]->{w};
420	$w += $tex[3]->{width};	536	$w += $tex[3]->{w};
421		537
422	($w, $h)	538	($w, $h)
423	}	539	}
424		540
425	sub size_allocate {	541	sub size_allocate {
426	my ($self, $w, $h) = @_;	542	my ($self, $w, $h) = @_;
427		543
		544	return unless $self->{w} != $w \|\| $self->{h} != $h;
		545
428	$self->SUPER::size_allocate ($w, $h);	546	$self->SUPER::size_allocate ($w, $h);
429		547
430	$h -= $tex[1]->{height};	548	$h -= $tex[1]->{h};
431	$h -= $tex[4]->{height};	549	$h -= $tex[4]->{h};
432	$w -= $tex[2]->{width};	550	$w -= $tex[2]->{w};
433	$w -= $tex[3]->{width};	551	$w -= $tex[3]->{w};
434		552
435	$h = $h < 0 ? 0 : $h;	553	$h = $h < 0 ? 0 : $h;
436	$w = $w < 0 ? 0 : $w;	554	$w = $w < 0 ? 0 : $w;
437		555
		556	my $child = $self->child;
		557
438	$self->child->size_allocate ($w, $h);	558	$child->size_allocate ($w, $h);
439	$self->child->move ($tex[3]->{width}, $tex[1]->{height});	559	$child->move ($tex[3]->{w}, $tex[1]->{h});
440	}	560	}
441		561
442	sub _draw {	562	sub _draw {
443	my ($self) = @_;	563	my ($self) = @_;
444		564
445	my ($w, $h) = ($self->{w}, $self->{h});	565	my ($w, $h) = ($self->{w}, $self->{h});
446	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	566	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
447		567
448	glEnable GL_BLEND;	568	glEnable GL_BLEND;
		569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
449	glEnable GL_TEXTURE_2D;	570	glEnable GL_TEXTURE_2D;
450	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452		572
453	my $top = $tex[1];	573	my $top = $tex[1];
454	$top->draw_quad (0, 0, $w, $top->{height});	574	$top->draw_quad (0, 0, $w, $top->{h});
455		575
456	my $left = $tex[3];	576	my $left = $tex[3];
457	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);	577	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
458		578
459	my $right = $tex[2];	579	my $right = $tex[2];
460	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);	580	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
461		581
462	my $bottom = $tex[4];	582	my $bottom = $tex[4];
463	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});	583	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
464		584
465	my $bg = $tex[0];	585	my $bg = $tex[0];
466	glBindTexture GL_TEXTURE_2D, $bg->{name};	586	glBindTexture GL_TEXTURE_2D, $bg->{name};
467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	588	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	589	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470		590
471	my $rep_x = $cw / $bg->{width};	591	my $rep_x = $cw / $bg->{w};
472	my $rep_y = $ch / $bg->{height};	592	my $rep_y = $ch / $bg->{h};
473		593
474	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);	594	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
475		595
476	glDisable GL_BLEND;	596	glDisable GL_BLEND;
477	glDisable GL_TEXTURE_2D;	597	glDisable GL_TEXTURE_2D;
478		598
479	$self->child->draw;	599	$self->child->draw;
480		600
481	}	601	}
482		602
483	#############################################################################	603	#############################################################################
484		604
485	package CFClient::Widget::Table;	605	package CFClient::UI::Table;
486		606
487	our @ISA = CFClient::Widget::Bin::;	607	our @ISA = CFClient::UI::Base::;
488		608
489	use SDL::OpenGL;	609	use SDL::OpenGL;
490		610
491	sub add {	611	sub add {
492	my ($self, $x, $y, $chld) = @_;	612	my ($self, $x, $y, $chld) = @_;
…		…
567	}	687	}
568	}	688	}
569		689
570	#############################################################################	690	#############################################################################
571		691
572	package CFClient::Widget::VBox;	692	package CFClient::UI::VBox;
573		693
574	our @ISA = CFClient::Widget::Container::;	694	our @ISA = CFClient::UI::Container::;
575		695
576	use SDL::OpenGL;	696	use SDL::OpenGL;
577		697
578	sub size_request {	698	sub size_request {
579	my ($self) = @_;	699	my ($self) = @_;
…		…
587	}	707	}
588		708
589	sub size_allocate {	709	sub size_allocate {
590	my ($self, $w, $h) = @_;	710	my ($self, $w, $h) = @_;
591		711
		712	return unless $self->{w} != $w \|\| $self->{h} != $h;
		713
592	$self->w ($w);	714	$self->{w} = $w;
593	$self->h ($h);	715	$self->{h} = $h;
594		716
595	my $exp;	717	return unless $self->{h};
596	my @oth;	718
597	# find expand widget	719	my $children = $self->{children};
598	for (@{$self->{children}}) {	720
599	if ($_->{expand}) {	721	my @h = map +($_->size_request)[1], @$children;
600	$exp = $_;	722
601	last;	723	my $req_h = List::Util::sum @h;
		724
		725	if ($req_h > $h) {
		726	# ah well, not enough space
		727	$_ = $h[$_] * $h / $req_h for @h;
		728	} else {
		729	my @exp = grep $_->{expand}, @$children;
		730	@exp = @$children unless @exp;
		731
		732	my %exp = map +($_ => 1), @exp;
		733
		734	for (0 .. $#$children) {
		735	my $child = $children->[$_];
		736
		737	my $alloc_h = $h[$_];
		738	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
		739	$h[$_] = $alloc_h;
602	}	740	}
603	push @oth, $_;
604	}
605
606	my ($ow, $oh);
607
608	# get sizes of other widgets
609	for (@oth) {
610	my ($w, $h) = $_->size_request;
611	$oh += $h;
612	if ($ow < $w) { $ow = $w }
613	}	741	}
614		742
615	my $y = 0;	743	my $y = 0;
616	for (@{$self->{children}}) {	744	for (0 .. $#$children) {
		745	my $child = $children->[$_];
		746	my $h = $h[$_];
617	$_->move (0, $y);	747	$child->move (0, $y);
618
619	if ($_ == $exp) {
620	$_->size_allocate ($w, $h - $oh);
621	$y += $h - $oh;
622	} else {
623	my ($cw, $h) = $_->size_request;
624	$_->size_allocate ($w, $h);	748	$child->size_allocate ($w, $h);
		749
625	$y += $h;	750	$y += $h;
626	}
627	}	751	}
628	}	752	}
629		753
630	#############################################################################	754	#############################################################################
631		755
632	package CFClient::Widget::Label;	756	package CFClient::UI::Label;
633		757
634	our @ISA = CFClient::Widget::;	758	our @ISA = CFClient::UI::Base::;
635		759
636	use SDL::OpenGL;	760	use SDL::OpenGL;
637		761
638	sub new {	762	sub new {
639	my ($class, $x, $y, $z, $height, $text) = @_;	763	my ($class, %arg) = @_;
640		764
641	$height \|\|= $::FONTSIZE;
642
643	# TODO: color, and make height, xyz etc. optional
644	my $self = $class->SUPER::new (	765	my $self = $class->SUPER::new (
645	color => [1, 1, 1],	766	fg => [1, 1, 1],
646	x => $x,	767	height => $::FONTSIZE,
647	y => $y,	768	text => "",
648	z => $z,	769	align => -1,
649	height => $height,
650	layout => new CFClient::Layout $height,	770	layout => new CFClient::Layout,
		771	%arg
651	);	772	);
652		773
653	$self->set_text ($text);	774	$self->set_text ($self->{text});
654		775
655	$self	776	$self
		777	}
		778
		779	sub escape_text {
		780	local $_ = $_[1];
		781
		782	s/&/&/g;
		783	s/>/>/g;
		784	s/</</g;
		785
		786	$_[1]
656	}	787	}
657		788
658	sub set_text {	789	sub set_text {
659	my ($self, $text) = @_;	790	my ($self, $text) = @_;
660		791
661	$self->{text} = $text;	792	$self->{text} = $text;
662	$self->{layout}->set_markup ($text);	793	$self->{layout}->set_markup ($text);
663		794
664	delete $self->{texture};	795	delete $self->{texture};
		796	$self->update;
665	}	797	}
666		798
667	sub get_text {	799	sub get_text {
668	my ($self, $text) = @_;	800	my ($self, $text) = @_;
669		801
…		…
672		804
673	sub size_request {	805	sub size_request {
674	my ($self) = @_;	806	my ($self) = @_;
675		807
676	$self->{layout}->set_width;	808	$self->{layout}->set_width;
		809	$self->{layout}->set_height ($self->{height});
677	$self->{layout}->size	810	$self->{layout}->size
678	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack	811	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
679	# (	812	# (
680	# $self->{texture}{width},	813	# $self->{texture}{w},
681	# $self->{texture}{height},	814	# $self->{texture}{h},
682	# )	815	# )
683	# } else {	816	# } else {
684	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};	817	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
685	#	818	#
686	# ($w, $h)	819	# ($w, $h)
687	# }	820	# }
688	}	821	}
689		822
690	sub size_allocate {	823	sub size_allocate {
691	my ($self, $w, $h) = @_;	824	my ($self, $w, $h) = @_;
692		825
		826	return unless $self->{w} != $w \|\| $self->{h} != $h;
		827
693	$self->SUPER::size_allocate ($w, $h);	828	$self->SUPER::size_allocate ($w, $h);
694	delete $self->{texture};	829	delete $self->{texture};
695	}	830	}
696		831
		832	sub update {
		833	my ($self) = @_;
		834
		835	delete $self->{texture};
		836	$self->SUPER::update;
		837	}
		838
697	sub _draw {	839	sub _draw {
698	my ($self) = @_;	840	my ($self) = @_;
699		841
700	my $tex = $self->{texture} \|\|= do {	842	my $tex = $self->{texture} \|\|= do {
701	$self->{layout}->set_width ($self->{w});	843	$self->{layout}->set_width ($self->{w});
702	new_from_layout CFClient::Texture $self->{layout};	844	new_from_layout CFClient::Texture $self->{layout}
703	};	845	};
704		846
705	glEnable GL_BLEND;	847	glEnable GL_BLEND;
		848	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706	glEnable GL_TEXTURE_2D;	849	glEnable GL_TEXTURE_2D;
707	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	850	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
709		851
710	glColor @{$self->{color}};	852	glColor @{$self->{fg}};
711		853
		854	my $x =
		855	$self->{align} < 0 ? 0
		856	: $self->{align} > 0 ? $self->{w} - $tex->{w}
		857	: ($self->{w} - $tex->{w}) * 0.5;
		858
712	$tex->draw_quad (0, 0);	859	$tex->draw_quad ($x, 0);
713		860
		861	glDisable GL_TEXTURE_2D;
714	glDisable GL_BLEND;	862	glDisable GL_BLEND;
715	glDisable GL_TEXTURE_2D;	863	glGetError and die;
716	}	864	}
717		865
718	#############################################################################	866	#############################################################################
719		867
720	package CFClient::Widget::Entry;	868	package CFClient::UI::Entry;
721		869
722	our @ISA = CFClient::Widget::Label::;	870	our @ISA = CFClient::UI::Label::;
723		871
724	use SDL;	872	use SDL;
725	use SDL::OpenGL;	873	use SDL::OpenGL;
726		874
		875	sub new {
		876	my $class = shift;
		877
		878	$class->SUPER::new (
		879	fg => [1, 1, 1],
		880	bg => [0, 0, 0, 0.4],
		881	active_bg => [1, 1, 1],
		882	active_fg => [0, 0, 0],
		883	@_
		884	)
		885	}
		886
		887	sub _set_text {
		888	my ($self, $text) = @_;
		889
		890	$self->{last_activity} = $::NOW;
		891
		892	$self->{text} = $text;
		893	$self->{layout}->set_width ($self->{w});
		894
		895	$text =~ s/./*/g if $self->{hidden};
		896
		897
		898	$self->{layout}->set_markup ($self->escape_text ($text));
		899
		900	$text = substr $text, 0, $self->{cursor};
		901	utf8::encode $text;
		902
		903	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		904	}
		905
		906	sub size_request {
		907	my ($self) = @_;
		908
		909	my ($w, $h) = $self->SUPER::size_request;
		910
		911	($w + 1, $h) # add 1 for cursor
		912	}
		913
		914	sub size_allocate {
		915	my ($self, $w, $h) = @_;
		916
		917	return unless $self->{w} != $w \|\| $self->{h} != $h;
		918
		919	$self->SUPER::size_allocate ($w, $h);
		920
		921	$self->_set_text ($self->{text});
		922	}
		923
		924	sub set_text {
		925	my ($self, $text) = @_;
		926
		927	$self->{cursor} = length $text;
		928	$self->_set_text ($text);
		929	$self->update;
		930	}
		931
727	sub key_down {	932	sub key_down {
728	my ($self, $ev) = @_;	933	my ($self, $ev) = @_;
729		934
730	my $mod = $ev->key_mod;	935	my $mod = $ev->key_mod;
731	my $sym = $ev->key_sym;	936	my $sym = $ev->key_sym;
…		…
733	my $uni = $ev->key_unicode;	938	my $uni = $ev->key_unicode;
734		939
735	my $text = $self->get_text;	940	my $text = $self->get_text;
736		941
737	if ($sym == SDLK_BACKSPACE) {	942	if ($sym == SDLK_BACKSPACE) {
738	substr $text, -1, 1, '';	943	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
		944	} elsif ($sym == SDLK_DELETE) {
		945	substr $text, $self->{cursor}, 1, "";
		946	} elsif ($sym == SDLK_LEFT) {
		947	--$self->{cursor} if $self->{cursor};
		948	} elsif ($sym == SDLK_RIGHT) {
		949	++$self->{cursor} if $self->{cursor} < length $self->{text};
739	} elsif ($uni) {	950	} elsif ($uni) {
740	$text .= chr $uni;	951	substr $text, $self->{cursor}++, 0, chr $uni;
741	}	952	}
742		953
743	$self->set_text ($text);	954	$self->_set_text ($text);
		955	$self->update;
		956	}
		957
		958	sub focus_in {
		959	my ($self) = @_;
		960
		961	$self->{last_activity} = $::NOW;
		962
		963	$self->SUPER::focus_in;
744	}	964	}
745		965
746	sub button_down {	966	sub button_down {
747	my ($self, $ev) = @_;	967	my ($self, $ev, $x, $y) = @_;
748		968
749	$self->focus_in;	969	$self->SUPER::button_down ($ev, $x, $y);
		970
		971	my $idx = $self->{layout}->xy_to_index ($x, $y);
		972
		973	# byte-index to char-index
		974	my $text = $self->{layout};
		975	utf8::encode $text;
		976	$self->{cursor} = length substr $text, 0, $idx;
		977
		978	$self->_set_text ($self->{text});
		979	$self->update;
750	}	980	}
751		981
752	sub mouse_motion {	982	sub mouse_motion {
753	my ($self, $ev, $x, $y) = @_;	983	my ($self, $ev, $x, $y) = @_;
754	printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	984	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
755	}	985	}
756		986
757	sub _draw {	987	sub _draw {
758	my ($self) = @_;	988	my ($self) = @_;
759		989
		990	local $self->{fg} = $self->{fg};
		991
760	if ($FOCUS == $self) {	992	if ($FOCUS == $self) {
761	glColor 1, 1, 1;	993	glColor @{$self->{active_bg}};
		994	$self->{fg} = $self->{active_fg};
762	} else {	995	} else {
763	glColor 0.7, 0.7, 0.7;	996	glColor @{$self->{bg}};
764	}	997	}
765		998
766	glBegin GL_QUADS;	999	glBegin GL_QUADS;
767	glVertex 0 , 0;	1000	glVertex 0 , 0;
768	glVertex 0 , $self->{h} - 1;	1001	glVertex 0 , $self->{h};
769	glVertex $self->{w} - 1, $self->{h} - 1;	1002	glVertex $self->{w}, $self->{h};
770	glVertex $self->{w} - 1, 0;	1003	glVertex $self->{w}, 0;
771	glEnd;	1004	glEnd;
772		1005
773	$self->SUPER::_draw;	1006	$self->SUPER::_draw;
774	}
775		1007
776	#############################################################################	1008	#TODO: force update every cursor change :(
		1009	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1010	glColor @{$self->{fg}};
		1011	glBegin GL_LINES;
		1012	glVertex $self->{cur_x}, $self->{cur_y};
		1013	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
		1014	glEnd;
		1015	}
		1016	}
777		1017
		1018	#############################################################################
		1019
		1020	package CFClient::UI::Slider;
		1021
		1022	use strict;
		1023
		1024	use SDL::OpenGL;
		1025
		1026	our @ISA = CFClient::UI::DrawBG::;
		1027
		1028	sub size_request {
		1029	my ($self) = @_;
		1030
		1031	my $w = 50;
		1032	my $h = 10;
		1033
		1034	$self->{vertical} ? ($h, $w) : ($w, $h)
		1035	}
		1036
		1037	sub new {
		1038	my $class = shift;
		1039
		1040	# range [value, low, high, page]
		1041
		1042	$class->SUPER::new (
		1043	fg => [1, 1, 1],
		1044	active_fg => [0, 0, 0],
		1045	range => [0, 0, 100, 10],
		1046	vertical => 1,
		1047	@_
		1048	)
		1049	}
		1050
		1051	sub button_down {
		1052	my ($self, $ev, $x, $y) = @_;
		1053
		1054	$self->SUPER::button_down ($ev, $x, $y);
		1055	$self->mouse_motion ($ev, $x, $y);
		1056	}
		1057
		1058	sub mouse_motion {
		1059	my ($self, $ev, $x, $y) = @_;
		1060
		1061	if ($GRAB == $self) {
		1062	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1063
		1064	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1065
		1066	$x = $x * ($hi - $lo) / $w + $lo;
		1067	$x = $lo if $x < $lo;
		1068	$x = $hi - $page if $x > $hi - $page;
		1069	$self->{range}[0] = $x;
		1070
		1071	$self->emit (changed => $x);
		1072	$self->update;
		1073	}
		1074	}
		1075
		1076	sub _draw {
		1077	my ($self) = @_;
		1078
		1079	$self->SUPER::_draw ();
		1080
		1081	my ($w, $h) = @$self{qw(w h)};
		1082
		1083	if ($self->{vertical}) {
		1084	# draw a vertical slider like a rotated horizontal slider
		1085
		1086	glRotate 90, 0, 0, 1;
		1087	glTranslate 0, -$self->{w}, 0;
		1088
		1089	($w, $h) = ($h, $w);
		1090	}
		1091
		1092	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
		1093	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
		1094
		1095	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1096
		1097	$page = int $page * $w / ($hi - $lo);
		1098	$value = int +($value - $lo) * $w / ($hi - $lo);
		1099
		1100	$w -= $page;
		1101	$page &= ~1;
		1102	glTranslate $page * 0.5, 0, 0;
		1103
		1104	glColor @$fg;
		1105	glBegin GL_LINES;
		1106	glVertex 0, 0; glVertex 0, $h;
		1107	glVertex $w - 1, 0; glVertex $w - 1, $h;
		1108	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
		1109	glEnd;
		1110
		1111	my $knob_a = $value - $page * 0.5;
		1112	my $knob_b = $value + $page * 0.5;
		1113
		1114	glBegin GL_QUADS;
		1115	glColor @$fg;
		1116	glVertex $knob_a, 0;
		1117	glVertex $knob_a, $h;
		1118	glVertex $knob_b, $h;
		1119	glVertex $knob_b, 0;
		1120
		1121	if ($knob_a < $knob_b - 2) {
		1122	glColor @$bg;
		1123	glVertex $knob_a + 1, 1;
		1124	glVertex $knob_a + 1, $h - 1;
		1125	glVertex $knob_b - 1, $h - 1;
		1126	glVertex $knob_b - 1, 1;
		1127	}
		1128	glEnd;
		1129	}
		1130
		1131	#############################################################################
		1132
778	package CFClient::Widget::MapWidget;	1133	package CFClient::UI::MapWidget;
779		1134
780	use strict;	1135	use strict;
781		1136
782	use List::Util qw(min max);	1137	use List::Util qw(min max);
783		1138
784	use SDL;	1139	use SDL;
785	use SDL::OpenGL;	1140	use SDL::OpenGL;
786	use SDL::OpenGL::Constants;
787		1141
788	our @ISA = CFClient::Widget::;	1142	our @ISA = CFClient::UI::Base::;
		1143
		1144	sub new {
		1145	my $class = shift;
		1146
		1147	$class->SUPER::new (
		1148	z => -1,
		1149	list => (glGenLists 1),
		1150	@_
		1151	)
		1152	}
789		1153
790	sub key_down {	1154	sub key_down {
791	print "MAPKEYDOWN\n";	1155	print "MAPKEYDOWN\n";
792	}	1156	}
793		1157
…		…
799	1 + int $::WIDTH / 32,	1163	1 + int $::WIDTH / 32,
800	1 + int $::HEIGHT / 32,	1164	1 + int $::HEIGHT / 32,
801	)	1165	)
802	}	1166	}
803		1167
		1168	sub update {
		1169	my ($self) = @_;
		1170
		1171	$self->{need_update} = 1;
		1172	$self->SUPER::update;
		1173	}
		1174
804	sub _draw {	1175	sub _draw {
805	my ($self) = @_;	1176	my ($self) = @_;
806		1177
		1178	if (delete $self->{need_update}) {
		1179	glNewList $self->{list}, GL_COMPILE;
		1180
807	my $mx = $::CONN->{mapx};	1181	my $mx = $::CONN->{mapx};
808	my $my = $::CONN->{mapy};	1182	my $my = $::CONN->{mapy};
809		1183
810	my $map = $::CONN->{map};	1184	my $map = $::CONN->{map};
811		1185
812	my ($xofs, $yofs);	1186	my ($xofs, $yofs);
813		1187
814	my $sw = 1 + int $::WIDTH / 32;	1188	my $sw = 1 + int $::WIDTH / 32;
815	my $sh = 1 + int $::HEIGHT / 32;	1189	my $sh = 1 + int $::HEIGHT / 32;
816		1190
817	if ($::CONN->{mapw} > $sw) {	1191	if ($::CONN->{mapw} > $sw) {
818	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1192	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
819	} else {	1193	} else {
820	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1194	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
821	}	1195	}
822		1196
823	if ($::CONN->{maph} > $sh) {	1197	if ($::CONN->{maph} > $sh) {
824	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1198	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
825	} else {	1199	} else {
826	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1200	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
827	}	1201	}
828		1202
829	glEnable GL_TEXTURE_2D;	1203	glEnable GL_TEXTURE_2D;
830	glEnable GL_BLEND;	1204	glEnable GL_BLEND;
		1205	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832		1207
833	my $sw4 = ($sw + 3) & ~3;	1208	my $sw4 = ($sw + 3) & ~3;
834	my $darkness = "\x00" x ($sw4 * $sh);	1209	my $darkness = "\x00" x ($sw4 * $sh);
835		1210
836	for my $x (0 .. $sw - 1) {	1211	for my $x (0 .. $sw - 1) {
837	my $row = $map->[$x + $xofs];	1212	my $row = $map->[$x + $xofs];
838	for my $y (0 .. $sh - 1) {	1213	for my $y (0 .. $sh - 1) {
839		1214
840	my $cell = $row->[$y + $yofs]	1215	my $cell = $row->[$y + $yofs]
841	or next;	1216	or next;
842		1217
843	my $dark = $cell->[0];	1218	my $dark = $cell->[0];
844	if ($dark < 0) {	1219	if ($dark < 0) {
845	substr $darkness, $y * $sw4 + $x, 1, chr 224;	1220	substr $darkness, $y * $sw4 + $x, 1, chr 224;
846	} else {	1221	} else {
847	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;	1222	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
848	}	1223	}
849		1224
850	for my $num (grep $_, @$cell[1,2,3]) {	1225	for my $num (grep $_, @$cell[1,2,3]) {
851	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1226	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
852		1227
853	my $w = $tex->{width};	1228	my ($w, $h) = @$tex{qw(w h)};
854	my $h = $tex->{height};
855		1229
856	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1230	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
		1231	}
857	}	1232	}
858	}	1233	}
859	}
860		1234
861	# if (1) { # higher quality darkness	1235	# if (1) { # higher quality darkness
862	# $lighting =~ s/(.)/$1$1$1/gs;	1236	# $lighting =~ s/(.)/$1$1$1/gs;
863	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;	1237	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
864	#	1238	#
…		…
866	#	1240	#
867	# $lighting = $pb->get_pixels;	1241	# $lighting = $pb->get_pixels;
868	# $lighting =~ s/(.)../$1/gs;	1242	# $lighting =~ s/(.)../$1/gs;
869	# }	1243	# }
870		1244
871	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1245	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
873		1246
874	$darkness = new CFClient::Texture	1247	$darkness = new CFClient::Texture
875	width => $sw4,	1248	w => $sw4,
876	height => $sh,	1249	h => $sh,
877	data => $darkness,	1250	data => $darkness,
878	internalformat => GL_ALPHA,	1251	internalformat => GL_ALPHA,
879	format => GL_ALPHA;	1252	format => GL_ALPHA;
880		1253
881	glColor 0.45, 0.45, 0.45, 1;	1254	glColor 0.45, 0.45, 0.45, 1;
882	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);	1255	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
883		1256
884	glDisable GL_TEXTURE_2D;	1257	glDisable GL_TEXTURE_2D;
885	glDisable GL_BLEND;	1258	glDisable GL_BLEND;
		1259
		1260	glEndList;
		1261	}
		1262
		1263	glCallList $self->{list};
886	}	1264	}
887		1265
888	my %DIR = (	1266	my %DIR = (
889	SDLK_KP8, [1, "north"],	1267	SDLK_KP8, [1, "north"],
890	SDLK_KP9, [2, "northeast"],	1268	SDLK_KP9, [2, "northeast"],
…		…
936	}	1314	}
937	}	1315	}
938		1316
939	#############################################################################	1317	#############################################################################
940		1318
941	package CFClient::Widget::Animator;	1319	package CFClient::UI::Animator;
942		1320
943	use SDL::OpenGL;	1321	use SDL::OpenGL;
944		1322
945	our @ISA = CFClient::Widget::Bin::;	1323	our @ISA = CFClient::UI::Bin::;
946		1324
947	sub moveto {	1325	sub moveto {
948	my ($self, $x, $y) = @_;	1326	my ($self, $x, $y) = @_;
949		1327
950	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1328	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
978	glPopMatrix;	1356	glPopMatrix;
979	}	1357	}
980		1358
981	#############################################################################	1359	#############################################################################
982		1360
983	package CFClient::Widget::Toplevel;	1361	package CFClient::UI::Toplevel;
984		1362
985	our @ISA = CFClient::Widget::Container::;	1363	our @ISA = CFClient::UI::Container::;
986		1364
987	sub size_request {	1365	sub size_request {
988	($::WIDTH, $::HEIGHT)	1366	($::WIDTH, $::HEIGHT)
989	}	1367	}
990		1368
…		…
1024	$self->_draw;	1402	$self->_draw;
1025	}	1403	}
1026		1404
1027	#############################################################################	1405	#############################################################################
1028		1406
1029	package CFClient::Widget;	1407	package CFClient::UI;
1030		1408
1031	$TOPLEVEL = new CFClient::Widget::Toplevel;	1409	$TOPLEVEL = new CFClient::UI::Toplevel;
1032		1410
1033	1	1411	1
1034		1412

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.63 by root, Tue Apr 11 13:29:24 2006 UTC vs. Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.63 by root, Tue Apr 11 13:29:24 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC