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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.67 by root, Tue Apr 11 14:36:59 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
69	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER;
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	}
		72
		73	#############################################################################
		74
		75	package CFClient::UI::Base;
		76
		77	use strict;
		78
		79	use SDL::OpenGL;
74		80
75	sub new {	81	sub new {
76	my $class = shift;	82	my $class = shift;
77		83
78	bless {	84	bless {
…		…
114	}	120	}
115		121
116	sub focus_in {	122	sub focus_in {
117	my ($self) = @_;	123	my ($self) = @_;
118		124
		125	return if $FOCUS == $self;
		126
119	my $focus = $FOCUS; $FOCUS = $self;	127	my $focus = $FOCUS; $FOCUS = $self;
120	$focus->update if $focus;	128	$focus->update if $focus;
121	$FOCUS->update;	129	$FOCUS->update;
122	}	130	}
123		131
…		…
130	$focus->update if $focus; #?	138	$focus->update if $focus; #?
131	}	139	}
132		140
133	sub mouse_motion { }	141	sub mouse_motion { }
134	sub button_up { }	142	sub button_up { }
135	sub button_down { }
136	sub key_down { }	143	sub key_down { }
137	sub key_up { }	144	sub key_up { }
		145
		146	sub button_down {
		147	my ($self, $ev, $x, $y) = @_;
		148
		149	$self->focus_in;
		150	}
138		151
139	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	152	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	153	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	154	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	155	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	156	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144		157
145	sub draw {	158	sub draw {
146	my ($self) = @_;	159	my ($self) = @_;
147		160
		161	return unless $self->{h} && $self->{w};
		162
148	glPushMatrix;	163	glPushMatrix;
149	glTranslate $self->{x}, $self->{y}, 0;	164	glTranslate $self->{x}, $self->{y}, 0;
150	$self->_draw;	165	$self->_draw;
		166	glPopMatrix;
		167
151	if ($self == $HOVER) {	168	if ($self == $HOVER) {
		169	my ($x, $y) = @$self{qw(x y)};
		170
152	glColor 1, 1, 1, 0.4;	171	glColor 1, 1, 1, 0.1;
153	glEnable GL_BLEND;	172	glEnable GL_BLEND;
		173	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154	glBegin GL_QUADS;	174	glBegin GL_QUADS;
155	glVertex 0 , 0;	175	glVertex $x , $y;
156	glVertex $self->{w}, 0;	176	glVertex $x + $self->{w}, $y;
157	glVertex $self->{w}, $self->{h};	177	glVertex $x + $self->{w}, $y + $self->{h};
158	glVertex 0 , $self->{h};	178	glVertex $x , $y + $self->{h};
159	glEnd;	179	glEnd;
160	glDisable GL_BLEND;	180	glDisable GL_BLEND;
161	}	181	}
162	glPopMatrix;
163	}	182	}
164		183
165	sub _draw {	184	sub _draw {
166	my ($self) = @_;	185	my ($self) = @_;
167		186
…		…
207		226
208	$self->{parent}->update	227	$self->{parent}->update
209	if $self->{parent};	228	if $self->{parent};
210	}	229	}
211		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
212	sub DESTROY {	244	sub DESTROY {
213	my ($self) = @_;	245	my ($self) = @_;
214		246
215	#$self->deactivate;	247	#$self->deactivate;
216	}	248	}
217		249
218	#############################################################################	250	#############################################################################
219		251
		252	package CFClient::UI::DrawBG;
		253
		254	our @ISA = CFClient::UI::Base::;
		255
		256	use strict;
		257	use SDL::OpenGL;
		258
		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
220	package CFClient::Widget::Empty;	287	package CFClient::UI::Empty;
221		288
222	our @ISA = CFClient::Widget::;	289	our @ISA = CFClient::UI::Base::;
223		290
224	sub size_request {	291	sub size_request {
225	(0, 0)	292	(0, 0)
226	}	293	}
227		294
228	sub draw { }	295	sub draw { }
229		296
230	#############################################################################	297	#############################################################################
231		298
232	package CFClient::Widget::Container;	299	package CFClient::UI::Container;
233		300
234	our @ISA = CFClient::Widget::;	301	our @ISA = CFClient::UI::Base::;
235		302
236	sub new {	303	sub new {
237	my ($class, %arg) = @_;	304	my ($class, %arg) = @_;
238		305
239	my $children = delete $arg{children} \|\| [];	306	my $children = delete $arg{children} \|\| [];
…		…
289	$_->draw for @{$self->{children}};	356	$_->draw for @{$self->{children}};
290	}	357	}
291		358
292	#############################################################################	359	#############################################################################
293		360
294	package CFClient::Widget::Bin;	361	package CFClient::UI::Bin;
295		362
296	our @ISA = CFClient::Widget::Container::;	363	our @ISA = CFClient::UI::Container::;
297		364
298	sub new {	365	sub new {
299	my ($class, %arg) = @_;	366	my ($class, %arg) = @_;
300		367
301	my $child = (delete $arg{child}) \|\| new CFClient::Widget::Empty::;	368	my $child = (delete $arg{child}) \|\| new CFClient::UI::Empty::;
302		369
303	$class->SUPER::new (children => [$child], %arg)	370	$class->SUPER::new (children => [$child], %arg)
304	}	371	}
305		372
306	sub add {	373	sub add {
…		…
314	sub remove {	381	sub remove {
315	my ($self, $widget) = @_;	382	my ($self, $widget) = @_;
316		383
317	$self->SUPER::remove ($widget);	384	$self->SUPER::remove ($widget);
318		385
319	$self->{children} = [new CFClient::Widget::Empty]	386	$self->{children} = [new CFClient::UI::Empty]
320	unless @{$self->{children}};	387	unless @{$self->{children}};
321	}	388	}
322		389
323	sub child { $_[0]->{children}[0] }	390	sub child { $_[0]->{children}[0] }
324		391
325	sub size_request {	392	sub size_request {
326	$_[0]{children}[0]->size_request if $_[0]{children}[0];	393	$_[0]{children}[0]->size_request
327	}	394	}
328		395
329	sub size_allocate {	396	sub size_allocate {
330	my ($self, $w, $h) = @_;	397	my ($self, $w, $h) = @_;
331		398
		399	return unless $self->{w} != $w \|\| $self->{h} != $h;
		400
332	$self->SUPER::size_allocate ($w, $h);	401	$self->SUPER::size_allocate ($w, $h);
333	$self->{children}[0]->size_allocate ($w, $h)	402	$self->{children}[0]->size_allocate ($w, $h);
334	if $self->{children}[0]
335	}	403	}
336		404
337	#############################################################################	405	#############################################################################
338		406
339	package CFClient::Widget::Window;	407	package CFClient::UI::Window;
340		408
341	our @ISA = CFClient::Widget::Bin::;	409	our @ISA = CFClient::UI::Bin::;
342		410
343	use SDL::OpenGL;	411	use SDL::OpenGL;
344		412
345	sub new {	413	sub new {
346	my ($class, %arg) = @_;	414	my ($class, %arg) = @_;
…		…
366	}	434	}
367		435
368	sub size_allocate {	436	sub size_allocate {
369	my ($self, $w, $h) = @_;	437	my ($self, $w, $h) = @_;
370		438
		439	return unless $self->{w} != $w \|\| $self->{h} != $h;
		440
371	$self->{w} = $w;	441	$self->{w} = $w;
372	$self->{h} = $h;	442	$self->{h} = $h;
373		443
374	$self->child->size_allocate ($w, $h);	444	$self->child->size_allocate ($w, $h);
375		445
…		…
383		453
384	my $tex = $self->{texture}	454	my $tex = $self->{texture}
385	or return;	455	or return;
386		456
387	glEnable GL_BLEND;	457	glEnable GL_BLEND;
		458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388	glEnable GL_TEXTURE_2D;	459	glEnable GL_TEXTURE_2D;
389	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390		461
391	$tex->draw_quad (0, 0, $w, $h);	462	$tex->draw_quad (0, 0, $w, $h);
392		463
…		…
394	glDisable GL_TEXTURE_2D;	465	glDisable GL_TEXTURE_2D;
395	}	466	}
396		467
397	#############################################################################	468	#############################################################################
398		469
399	package CFClient::Widget::Frame;	470	package CFClient::UI::Frame;
400		471
401	our @ISA = CFClient::Widget::Bin::;	472	our @ISA = CFClient::UI::Bin::;
402		473
403	use SDL::OpenGL;	474	use SDL::OpenGL;
404		475
405	sub size_request {	476	sub size_request {
406	my ($self) = @_;	477	my ($self) = @_;
…		…
413	}	484	}
414		485
415	sub size_allocate {	486	sub size_allocate {
416	my ($self, $w, $h) = @_;	487	my ($self, $w, $h) = @_;
417		488
		489	return unless $self->{w} != $w \|\| $self->{h} != $h;
		490
418	$self->{w} = $w;	491	$self->{w} = $w;
419	$self->{h} = $h;	492	$self->{h} = $h;
420		493
421	$self->child->size_allocate ($w - 4, $h - 4);	494	$self->child->size_allocate ($w - 4, $h - 4);
422	$self->child->move (2, 2);	495	$self->child->move (2, 2);
…		…
440	$chld->draw;	513	$chld->draw;
441	}	514	}
442		515
443	#############################################################################	516	#############################################################################
444		517
445	package CFClient::Widget::FancyFrame;	518	package CFClient::UI::FancyFrame;
446		519
447	our @ISA = CFClient::Widget::Bin::;	520	our @ISA = CFClient::UI::Bin::;
448		521
449	use SDL::OpenGL;	522	use SDL::OpenGL;
450		523
451	my @tex =	524	my @tex =
452	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	525	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
455	sub size_request {	528	sub size_request {
456	my ($self) = @_;	529	my ($self) = @_;
457		530
458	my ($w, $h) = $self->SUPER::size_request;	531	my ($w, $h) = $self->SUPER::size_request;
459		532
460	$h += $tex[1]->{height};	533	$h += $tex[1]->{h};
461	$h += $tex[4]->{height};	534	$h += $tex[4]->{h};
462	$w += $tex[2]->{width};	535	$w += $tex[2]->{w};
463	$w += $tex[3]->{width};	536	$w += $tex[3]->{w};
464		537
465	($w, $h)	538	($w, $h)
466	}	539	}
467		540
468	sub size_allocate {	541	sub size_allocate {
469	my ($self, $w, $h) = @_;	542	my ($self, $w, $h) = @_;
470		543
		544	return unless $self->{w} != $w \|\| $self->{h} != $h;
		545
471	$self->SUPER::size_allocate ($w, $h);	546	$self->SUPER::size_allocate ($w, $h);
472		547
473	$h -= $tex[1]->{height};	548	$h -= $tex[1]->{h};
474	$h -= $tex[4]->{height};	549	$h -= $tex[4]->{h};
475	$w -= $tex[2]->{width};	550	$w -= $tex[2]->{w};
476	$w -= $tex[3]->{width};	551	$w -= $tex[3]->{w};
477		552
478	$h = $h < 0 ? 0 : $h;	553	$h = $h < 0 ? 0 : $h;
479	$w = $w < 0 ? 0 : $w;	554	$w = $w < 0 ? 0 : $w;
480		555
481	my $child = $self->child;	556	my $child = $self->child;
482		557
483	$child->size_allocate ($w, $h);	558	$child->size_allocate ($w, $h);
484	$child->move ($tex[3]->{width}, $tex[1]->{height});	559	$child->move ($tex[3]->{w}, $tex[1]->{h});
485	}	560	}
486		561
487	sub _draw {	562	sub _draw {
488	my ($self) = @_;	563	my ($self) = @_;
489		564
490	my ($w, $h) = ($self->{w}, $self->{h});	565	my ($w, $h) = ($self->{w}, $self->{h});
491	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	566	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492		567
493	glEnable GL_BLEND;	568	glEnable GL_BLEND;
		569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494	glEnable GL_TEXTURE_2D;	570	glEnable GL_TEXTURE_2D;
495	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497		572
498	my $top = $tex[1];	573	my $top = $tex[1];
499	$top->draw_quad (0, 0, $w, $top->{height});	574	$top->draw_quad (0, 0, $w, $top->{h});
500		575
501	my $left = $tex[3];	576	my $left = $tex[3];
502	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);	577	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
503		578
504	my $right = $tex[2];	579	my $right = $tex[2];
505	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);	580	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
506		581
507	my $bottom = $tex[4];	582	my $bottom = $tex[4];
508	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});	583	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
509		584
510	my $bg = $tex[0];	585	my $bg = $tex[0];
511	glBindTexture GL_TEXTURE_2D, $bg->{name};	586	glBindTexture GL_TEXTURE_2D, $bg->{name};
512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	588	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	589	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515		590
516	my $rep_x = $cw / $bg->{width};	591	my $rep_x = $cw / $bg->{w};
517	my $rep_y = $ch / $bg->{height};	592	my $rep_y = $ch / $bg->{h};
518		593
519	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);	594	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
520		595
521	glDisable GL_BLEND;	596	glDisable GL_BLEND;
522	glDisable GL_TEXTURE_2D;	597	glDisable GL_TEXTURE_2D;
523		598
524	$self->child->draw;	599	$self->child->draw;
525		600
526	}	601	}
527		602
528	#############################################################################	603	#############################################################################
529		604
530	package CFClient::Widget::Table;	605	package CFClient::UI::Table;
531		606
532	our @ISA = CFClient::Widget::Bin::;	607	our @ISA = CFClient::UI::Base::;
533		608
534	use SDL::OpenGL;	609	use SDL::OpenGL;
535		610
536	sub add {	611	sub add {
537	my ($self, $x, $y, $chld) = @_;	612	my ($self, $x, $y, $chld) = @_;
…		…
612	}	687	}
613	}	688	}
614		689
615	#############################################################################	690	#############################################################################
616		691
617	package CFClient::Widget::VBox;	692	package CFClient::UI::VBox;
618		693
619	our @ISA = CFClient::Widget::Container::;	694	our @ISA = CFClient::UI::Container::;
620		695
621	use SDL::OpenGL;	696	use SDL::OpenGL;
622		697
623	sub size_request {	698	sub size_request {
624	my ($self) = @_;	699	my ($self) = @_;
…		…
632	}	707	}
633		708
634	sub size_allocate {	709	sub size_allocate {
635	my ($self, $w, $h) = @_;	710	my ($self, $w, $h) = @_;
636		711
		712	return unless $self->{w} != $w \|\| $self->{h} != $h;
		713
637	$self->w ($w);	714	$self->{w} = $w;
638	$self->h ($h);	715	$self->{h} = $h;
639		716
640	my $exp;	717	return unless $self->{h};
641	my @oth;	718
642	# find expand widget	719	my $children = $self->{children};
643	for (@{$self->{children}}) {	720
644	if ($_->{expand}) {	721	my @h = map +($_->size_request)[1], @$children;
645	$exp = $_;	722
646	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;
647	}	740	}
648	push @oth, $_;
649	}
650
651	my ($ow, $oh);
652
653	# get sizes of other widgets
654	for (@oth) {
655	my ($w, $h) = $_->size_request;
656	$oh += $h;
657	if ($ow < $w) { $ow = $w }
658	}	741	}
659		742
660	my $y = 0;	743	my $y = 0;
661	for (@{$self->{children}}) {	744	for (0 .. $#$children) {
		745	my $child = $children->[$_];
		746	my $h = $h[$_];
662	$_->move (0, $y);	747	$child->move (0, $y);
663
664	if ($_ == $exp) {
665	$_->size_allocate ($w, $h - $oh);
666	$y += $h - $oh;
667	} else {
668	my ($cw, $h) = $_->size_request;
669	$_->size_allocate ($w, $h);	748	$child->size_allocate ($w, $h);
		749
670	$y += $h;	750	$y += $h;
671	}
672	}	751	}
673	}	752	}
674		753
675	#############################################################################	754	#############################################################################
676		755
677	package CFClient::Widget::Label;	756	package CFClient::UI::Label;
678		757
679	our @ISA = CFClient::Widget::;	758	our @ISA = CFClient::UI::Base::;
680		759
681	use SDL::OpenGL;	760	use SDL::OpenGL;
682		761
683	sub new {	762	sub new {
684	my ($class, %arg) = @_;	763	my ($class, %arg) = @_;
685		764
686	# TODO: color, and make height, xyz etc. optional
687	my $self = $class->SUPER::new (	765	my $self = $class->SUPER::new (
688	color => [1, 1, 1],	766	fg => [1, 1, 1],
689	height => $::FONTSIZE,	767	height => $::FONTSIZE,
690	text => "",	768	text => "",
		769	align => -1,
691	layout => new CFClient::Layout,	770	layout => new CFClient::Layout,
692	%arg	771	%arg
693	);	772	);
694		773
695	$self->set_text ($self->{text});	774	$self->set_text ($self->{text});
696		775
697	$self	776	$self
698	}	777	}
699		778
		779	sub escape_text {
		780	local $_ = $_[1];
		781
		782	s/&/&/g;
		783	s/>/>/g;
		784	s/</</g;
		785
		786	$_[1]
		787	}
		788
700	sub set_text {	789	sub set_text {
701	my ($self, $text) = @_;	790	my ($self, $text) = @_;
702		791
703	$self->{text} = $text;	792	$self->{text} = $text;
704	$self->{layout}->set_markup ($text);	793	$self->{layout}->set_markup ($text);
705		794
706	delete $self->{texture};	795	delete $self->{texture};
		796	$self->update;
707	}	797	}
708		798
709	sub get_text {	799	sub get_text {
710	my ($self, $text) = @_;	800	my ($self, $text) = @_;
711		801
…		…
716	my ($self) = @_;	806	my ($self) = @_;
717		807
718	$self->{layout}->set_width;	808	$self->{layout}->set_width;
719	$self->{layout}->set_height ($self->{height});	809	$self->{layout}->set_height ($self->{height});
720	$self->{layout}->size	810	$self->{layout}->size
721	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack	811	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
722	# (	812	# (
723	# $self->{texture}{width},	813	# $self->{texture}{w},
724	# $self->{texture}{height},	814	# $self->{texture}{h},
725	# )	815	# )
726	# } else {	816	# } else {
727	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};	817	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
728	#	818	#
729	# ($w, $h)	819	# ($w, $h)
730	# }	820	# }
731	}	821	}
732		822
733	sub size_allocate {	823	sub size_allocate {
734	my ($self, $w, $h) = @_;	824	my ($self, $w, $h) = @_;
735		825
		826	return unless $self->{w} != $w \|\| $self->{h} != $h;
		827
736	$self->SUPER::size_allocate ($w, $h);	828	$self->SUPER::size_allocate ($w, $h);
737	delete $self->{texture};	829	delete $self->{texture};
738	}	830	}
739		831
		832	sub update {
		833	my ($self) = @_;
		834
		835	delete $self->{texture};
		836	$self->SUPER::update;
		837	}
		838
740	sub _draw {	839	sub _draw {
741	my ($self) = @_;	840	my ($self) = @_;
742		841
743	my $tex = $self->{texture} \|\|= do {	842	my $tex = $self->{texture} \|\|= do {
744	$self->{layout}->set_width ($self->{w});	843	$self->{layout}->set_width ($self->{w});
745	new_from_layout CFClient::Texture $self->{layout};	844	new_from_layout CFClient::Texture $self->{layout}
746	};	845	};
747		846
748	glEnable GL_BLEND;	847	glEnable GL_BLEND;
		848	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749	glEnable GL_TEXTURE_2D;	849	glEnable GL_TEXTURE_2D;
750	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	850	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
752		851
753	glColor @{$self->{color}};	852	glColor @{$self->{fg}};
754		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
755	$tex->draw_quad (0, 0);	859	$tex->draw_quad ($x, 0);
756		860
		861	glDisable GL_TEXTURE_2D;
757	glDisable GL_BLEND;	862	glDisable GL_BLEND;
758	glDisable GL_TEXTURE_2D;	863	glGetError and die;
759	}	864	}
760		865
761	#############################################################################	866	#############################################################################
762		867
763	package CFClient::Widget::Entry;	868	package CFClient::UI::Entry;
764		869
765	our @ISA = CFClient::Widget::Label::;	870	our @ISA = CFClient::UI::Label::;
766		871
767	use SDL;	872	use SDL;
768	use SDL::OpenGL;	873	use SDL::OpenGL;
769		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
770	sub key_down {	932	sub key_down {
771	my ($self, $ev) = @_;	933	my ($self, $ev) = @_;
772		934
773	my $mod = $ev->key_mod;	935	my $mod = $ev->key_mod;
774	my $sym = $ev->key_sym;	936	my $sym = $ev->key_sym;
…		…
776	my $uni = $ev->key_unicode;	938	my $uni = $ev->key_unicode;
777		939
778	my $text = $self->get_text;	940	my $text = $self->get_text;
779		941
780	if ($sym == SDLK_BACKSPACE) {	942	if ($sym == SDLK_BACKSPACE) {
781	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};
782	} elsif ($uni) {	950	} elsif ($uni) {
783	$text .= chr $uni;	951	substr $text, $self->{cursor}++, 0, chr $uni;
784	}	952	}
785		953
786	$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;
787	}	964	}
788		965
789	sub button_down {	966	sub button_down {
790	my ($self, $ev) = @_;	967	my ($self, $ev, $x, $y) = @_;
791		968
792	$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;
793	}	980	}
794		981
795	sub mouse_motion {	982	sub mouse_motion {
796	my ($self, $ev, $x, $y) = @_;	983	my ($self, $ev, $x, $y) = @_;
797	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#
798	}	985	}
799		986
800	sub _draw {	987	sub _draw {
801	my ($self) = @_;	988	my ($self) = @_;
802		989
		990	local $self->{fg} = $self->{fg};
		991
803	if ($FOCUS == $self) {	992	if ($FOCUS == $self) {
804	glColor 1, 1, 1;	993	glColor @{$self->{active_bg}};
		994	$self->{fg} = $self->{active_fg};
805	} else {	995	} else {
806	glColor 0.7, 0.7, 0.7;	996	glColor @{$self->{bg}};
807	}	997	}
808		998
809	glBegin GL_QUADS;	999	glBegin GL_QUADS;
810	glVertex 0 , 0;	1000	glVertex 0 , 0;
811	glVertex 0 , $self->{h} - 1;	1001	glVertex 0 , $self->{h};
812	glVertex $self->{w} - 1, $self->{h} - 1;	1002	glVertex $self->{w}, $self->{h};
813	glVertex $self->{w} - 1, 0;	1003	glVertex $self->{w}, 0;
814	glEnd;	1004	glEnd;
815		1005
816	$self->SUPER::_draw;	1006	$self->SUPER::_draw;
817	}
818		1007
819	#############################################################################	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	}
820		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
821	package CFClient::Widget::MapWidget;	1133	package CFClient::UI::MapWidget;
822		1134
823	use strict;	1135	use strict;
824		1136
825	use List::Util qw(min max);	1137	use List::Util qw(min max);
826		1138
827	use SDL;	1139	use SDL;
828	use SDL::OpenGL;	1140	use SDL::OpenGL;
829	use SDL::OpenGL::Constants;
830		1141
831	our @ISA = CFClient::Widget::;	1142	our @ISA = CFClient::UI::Base::;
832		1143
833	sub new {	1144	sub new {
834	my $class = shift;	1145	my $class = shift;
835		1146
836	$class->SUPER::new (	1147	$class->SUPER::new (
…		…
856		1167
857	sub update {	1168	sub update {
858	my ($self) = @_;	1169	my ($self) = @_;
859		1170
860	$self->{need_update} = 1;	1171	$self->{need_update} = 1;
		1172	$self->SUPER::update;
861	}	1173	}
862		1174
863	sub _draw {	1175	sub _draw {
864	my ($self) = @_;	1176	my ($self) = @_;
865		1177
…		…
888	$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};
889	}	1201	}
890		1202
891	glEnable GL_TEXTURE_2D;	1203	glEnable GL_TEXTURE_2D;
892	glEnable GL_BLEND;	1204	glEnable GL_BLEND;
		1205	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894		1207
895	my $sw4 = ($sw + 3) & ~3;	1208	my $sw4 = ($sw + 3) & ~3;
896	my $darkness = "\x00" x ($sw4 * $sh);	1209	my $darkness = "\x00" x ($sw4 * $sh);
897		1210
…		…
910	}	1223	}
911		1224
912	for my $num (grep $_, @$cell[1,2,3]) {	1225	for my $num (grep $_, @$cell[1,2,3]) {
913	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1226	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
914		1227
915	my $w = $tex->{width};	1228	my ($w, $h) = @$tex{qw(w h)};
916	my $h = $tex->{height};
917		1229
918	$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);
919	}	1231	}
920	}	1232	}
921	}	1233	}
…		…
928	#	1240	#
929	# $lighting = $pb->get_pixels;	1241	# $lighting = $pb->get_pixels;
930	# $lighting =~ s/(.)../$1/gs;	1242	# $lighting =~ s/(.)../$1/gs;
931	# }	1243	# }
932		1244
933	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1245	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935		1246
936	$darkness = new CFClient::Texture	1247	$darkness = new CFClient::Texture
937	width => $sw4,	1248	w => $sw4,
938	height => $sh,	1249	h => $sh,
939	data => $darkness,	1250	data => $darkness,
940	internalformat => GL_ALPHA,	1251	internalformat => GL_ALPHA,
941	format => GL_ALPHA;	1252	format => GL_ALPHA;
942		1253
943	glColor 0.45, 0.45, 0.45, 1;	1254	glColor 0.45, 0.45, 0.45, 1;
…		…
1003	}	1314	}
1004	}	1315	}
1005		1316
1006	#############################################################################	1317	#############################################################################
1007		1318
1008	package CFClient::Widget::Animator;	1319	package CFClient::UI::Animator;
1009		1320
1010	use SDL::OpenGL;	1321	use SDL::OpenGL;
1011		1322
1012	our @ISA = CFClient::Widget::Bin::;	1323	our @ISA = CFClient::UI::Bin::;
1013		1324
1014	sub moveto {	1325	sub moveto {
1015	my ($self, $x, $y) = @_;	1326	my ($self, $x, $y) = @_;
1016		1327
1017	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1328	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
1045	glPopMatrix;	1356	glPopMatrix;
1046	}	1357	}
1047		1358
1048	#############################################################################	1359	#############################################################################
1049		1360
1050	package CFClient::Widget::Toplevel;	1361	package CFClient::UI::Toplevel;
1051		1362
1052	our @ISA = CFClient::Widget::Container::;	1363	our @ISA = CFClient::UI::Container::;
1053		1364
1054	sub size_request {	1365	sub size_request {
1055	($::WIDTH, $::HEIGHT)	1366	($::WIDTH, $::HEIGHT)
1056	}	1367	}
1057		1368
…		…
1091	$self->_draw;	1402	$self->_draw;
1092	}	1403	}
1093		1404
1094	#############################################################################	1405	#############################################################################
1095		1406
1096	package CFClient::Widget;	1407	package CFClient::UI;
1097		1408
1098	$TOPLEVEL = new CFClient::Widget::Toplevel;	1409	$TOPLEVEL = new CFClient::UI::Toplevel;
1099		1410
1100	1	1411	1
1101		1412

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.67 by root, Tue Apr 11 14:36:59 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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC