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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.12 by root, Fri Apr 7 20:55:32 2006 UTC vs.
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package Crossfire::Client::Widget;
2		2
3	use strict;	3	use strict;
		4
		5	use Scalar::Util;
		6
4	use SDL::OpenGL;	7	use SDL::OpenGL;
5	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
6		9
7	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
8	our %ACTIVE_WIDGETS;	11	our @ACTIVE_WIDGETS;
9		12
10	# class methods for events	13	# class methods for events
11	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
12	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
13	sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }	16	sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }
18		21
19	bless { @_ }, $class	22	bless { @_ }, $class
20	}	23	}
21		24
22	sub activate {	25	sub activate {
23	$ACTIVE_WIDGETS{$_[0]} = $_[0];	26	push @ACTIVE_WIDGETS, $_[0];
		27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
24	}	28	}
25		29
26	sub deactivate {	30	sub deactivate {
27	delete $ACTIVE_WIDGETS{$_[0]};	31	@ACTIVE_WIDGETS =
		32	sort { $a->{z} <=> $b->{z} }
		33	grep { $_ && $_ != $_[0] }
		34	@ACTIVE_WIDGETS;
		35	}
		36
		37	sub move {
		38	my ($self, $x, $y, $z) = @_;
		39	$self->{x} = $x;
		40	$self->{y} = $y;
		41	$self->{z} = $z if defined $z;
		42	}
		43
		44	sub needs_redraw {
		45	0
		46	}
		47
		48	sub size_request {
		49	die "size_request is abtract";
28	}	50	}
29		51
30	sub focus_in {	52	sub focus_in {
31	my ($widget) = @_;	53	my ($widget) = @_;
32	$FOCUS = $widget;	54	$FOCUS = $widget;
…		…
50		72
51	sub button_up {	73	sub button_up {
52	my ($widget, $sdlev) = @_;	74	my ($widget, $sdlev) = @_;
53	}	75	}
54		76
		77	sub w { $_[0]->{w} }
		78	sub h { $_[0]->{h} }
55	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
56	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
		81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
57		82
58	sub draw {	83	sub draw {
59	my ($self) = @_;	84	my ($self) = @_;
60		85
61	glPushMatrix;	86	glPushMatrix;
…		…
70		95
71	sub bbox {	96	sub bbox {
72	my ($widget) = @_;	97	my ($widget) = @_;
73	}	98	}
74		99
		100	sub DESTROY {
		101	my ($self) = @_;
		102
		103	$self->deactivate;
		104	}
		105
75	package Crossfire::Client::Widget::Label;	106	package Crossfire::Client::Widget::Container;
76		107
77	our @ISA = Crossfire::Client::Widget::;	108	our @ISA = Crossfire::Client::Widget::;
78		109
79	use SDL::OpenGL;	110	use SDL::OpenGL;
80		111
81	sub new {	112	sub add { $_[0]->{child} = $_[1] }
82	my ($class, $x, $y, $z, $ttf, $text) = @_;	113	sub get { $_[0]->{child} }
83		114
84	my $self = $class->SUPER::new (x => $x, y => $y, z => $z);	115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
85		116
86	$self->{texture} = new_from_ttf Crossfire::Client::Texture $ttf, $text;	117	sub _draw { die "Containers can't be drawn!" }
87		118
88	$self	119	package Crossfire::Client::Widget::Window;
89	}
90		120
91	sub _draw {	121	our @ISA = Crossfire::Client::Widget::Container::;
		122
		123	use SDL::OpenGL;
		124
		125	sub add {
92	my ($self) = @_;	126	my ($self, $chld) = @_;
		127	$self->SUPER::add ($chld);
		128	$self->render_chld; #TODO: Move this to the size_request event propably?
		129	}
93		130
		131	sub render_chld {
		132	my ($self) = @_;
		133	my $chld = $self->get;
		134	my ($w, $h) = $self->size_request;
		135
		136	$self->{texture} =
		137	Crossfire::Client::Texture->new_from_opengl (
		138	$w, $h, sub { $chld->draw }
		139	);
		140	$self->{texture}->upload;
		141	}
		142
		143	sub size_request {
		144	my ($self) = @_;
		145	my $chld = $self->get
		146	or return (0, 0);
		147	$chld->size_request
		148	}
		149
		150	sub _draw {
		151	my ($self) = @_;
		152
		153	my ($w, $h) = $self->size_request;#TODO# use widht/height of texture
94	my $tex = $self->{texture};	154	my $tex = $self->{texture}
95		155	or return;
96	$self->{x}--;
97		156
98	glEnable GL_BLEND;	157	glEnable GL_BLEND;
99	glEnable GL_TEXTURE_2D;	158	glEnable GL_TEXTURE_2D;
100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	159	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
101	glBindTexture GL_TEXTURE_2D, $tex->{name};	160	glBindTexture GL_TEXTURE_2D, $tex->{name};
102		161
103	glColor 1, 1, 1;	162	glColor 1, 1, 1;
		163
		164	glBegin GL_QUADS;
		165	glTexCoord 0, 0; glVertex 0, 0;
		166	glTexCoord 0, 1; glVertex 0, $h;
		167	glTexCoord 1, 1; glVertex $w, $h;
		168	glTexCoord 1, 0; glVertex $w, 0;
		169	glEnd;
		170
		171	glDisable GL_BLEND;
		172	glDisable GL_TEXTURE_2D;
		173	}
		174
		175	package Crossfire::Client::Widget::Frame;
		176
		177	our @ISA = Crossfire::Client::Widget::Container::;
		178
		179	use SDL::OpenGL;
		180
		181	sub size_request {
		182	my ($self) = @_;
		183	my $chld = $self->get
		184	or return (0, 0);
		185	map { $_ + 4 } $chld->size_request;
		186	}
		187
		188	sub _draw {
		189	my ($self) = @_;
		190
		191	my $chld = $self->get;
		192
		193	$chld->move (2, 2, 0); #TODO:move to size_request
		194
		195	my ($w, $h) = $chld->size_request;
		196
		197	glColor 1, 0, 0;
		198	glBegin GL_QUADS;
		199	glTexCoord 0, 0; glVertex 0 , 0;
		200	glTexCoord 0, 1; glVertex 0 , $h + 4;
		201	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
		202	glTexCoord 1, 0; glVertex $w + 4 , 0;
		203	glEnd;
		204
		205	$chld->draw;
		206	}
		207
		208	package Crossfire::Client::Widget::Table;
		209
		210	our @ISA = Crossfire::Client::Widget::Container::;
		211
		212	use SDL::OpenGL;
		213
		214	sub add {
		215	my ($self, $x, $y, $chld) = @_;
		216	$self->{childs}[$y][$x] = $chld;
		217	}
		218
		219	sub max_row_height {
		220	my ($self, $row) = @_;
		221
		222	my $hs = 0;
		223	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {
		224	my $c = $self->{childs}->[$row]->[$xi];
		225	if ($c) {
		226	my ($w, $h) = $c->size_request;
		227	if ($hs < $h) { $hs = $h }
		228	}
		229	}
		230	return $hs;
		231	}
		232
		233	sub max_col_width {
		234	my ($self, $col) = @_;
		235
		236	my $ws = 0;
		237	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {
		238	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];
		239	if ($c) {
		240	my ($w, $h) = $c->size_request;
		241	if ($ws < $w) { $ws = $w }
		242	}
		243	}
		244	return $ws;
		245	}
		246
		247	sub size_request {
		248	my ($self) = @_;
		249
		250	my ($hs, $ws) = (0, 0);
		251
		252	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		253	$hs += $self->max_row_height ($yi);
		254	}
		255
		256	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		257	my $wm = 0;
		258	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
		259	$wm += $self->max_col_width ($xi)
		260	}
		261	if ($ws < $wm) { $ws = $wm }
		262	}
		263
		264	return ($ws, $hs);
		265	}
		266
		267	sub _draw {
		268	my ($self) = @_;
		269
		270	my $y = 0;
		271	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		272	my $x = 0;
		273
		274	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
		275
		276	my $c = $self->{childs}->[$yi]->[$xi];
		277	if ($c) {
		278	$c->move ($x, $y, 0); #TODO: Move to size_request
		279	$c->draw if $c;
		280	}
		281
		282	$x += $self->max_col_width ($xi);
		283	}
		284
		285	$y += $self->max_row_height ($yi);
		286	}
		287	}
		288
		289	package Crossfire::Client::Widget::VBox;
		290
		291	our @ISA = Crossfire::Client::Widget::Container::;
		292
		293	use SDL::OpenGL;
		294
		295	sub add {
		296	my ($self, $chld) = @_;
		297	push @{$self->{childs}}, $chld;
		298	}
		299
		300	sub size_request {
		301	my ($self) = @_;
		302
		303	my ($hs, $ws) = (0, 0);
		304	for (@{$self->{childs} \|\| []}) {
		305	my ($w, $h) = $_->size_request;
		306	$hs += $h;
		307	if ($ws < $w) { $ws = $w }
		308	}
		309
		310	return ($ws, $hs);
		311	}
		312
		313	sub _draw {
		314	my ($self) = @_;
		315
		316	my ($x, $y);
		317	for (@{$self->{childs} \|\| []}) {
		318	$_->move (0, $y, 0); #TODO: move to size_request
		319	$_->draw;
		320	my ($w, $h) = $_->size_request;
		321	$y += $h;
		322	}
		323	}
		324
		325	package Crossfire::Client::Widget::Label;
		326
		327	our @ISA = Crossfire::Client::Widget::;
		328
		329	use SDL::OpenGL;
		330
		331	sub new {
		332	my ($class, $x, $y, $z, $height, $text) = @_;
		333
		334	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
		335
		336	$self->set_text ($text);
		337
		338	$self
		339	}
		340
		341	sub set_text {
		342	my ($self, $text) = @_;
		343
		344	$self->{text} = $text;
		345
		346	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		347	}
		348
		349	sub get_text {
		350	my ($self, $text) = @_;
		351
		352	$self->{text}
		353	}
		354
		355	sub size_request {
		356	my ($self) = @_;
		357
		358	(
		359	$self->{texture}{width},
		360	$self->{texture}{height},
		361	)
		362	}
		363
		364	sub _draw {
		365	my ($self) = @_;
		366
		367	my $tex = $self->{texture};
		368
		369	glEnable GL_BLEND;
		370	glEnable GL_TEXTURE_2D;
		371	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		372	glBindTexture GL_TEXTURE_2D, $tex->{name};
		373
		374	glColor 1, 0, 1;
104		375
105	glBegin GL_QUADS;	376	glBegin GL_QUADS;
106	glTexCoord 0, 0; glVertex 0 , 0;	377	glTexCoord 0, 0; glVertex 0 , 0;
107	glTexCoord 0, 1; glVertex 0 , $tex->{height};	378	glTexCoord 0, 1; glVertex 0 , $tex->{height};
108	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	379	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
134		405
135	package Crossfire::Client::Widget::MapWidget;	406	package Crossfire::Client::Widget::MapWidget;
136		407
137	use strict;	408	use strict;
138		409
139	our @ISA = qw/Crossfire::Client::Widget/;	410	use List::Util qw(min max);
140		411
		412	use SDL;
141	use SDL::OpenGL;	413	use SDL::OpenGL;
142	use SDL::OpenGL::Constants;	414	use SDL::OpenGL::Constants;
		415
		416	our @ISA = Crossfire::Client::Widget::;
143		417
144	sub key_down {	418	sub key_down {
145	print "MAPKEYDOWN\n";	419	print "MAPKEYDOWN\n";
146	}	420	}
147		421
148	sub key_up {	422	sub key_up {
149	}	423	}
150		424
151	sub _draw {	425	sub _draw {
		426	my ($self) = @_;
		427
		428	my $mx = $::CONN->{mapx};
		429	my $my = $::CONN->{mapy};
		430
		431	my $map = $::CONN->{map};
		432
		433	my ($xofs, $yofs);
		434
		435	my $sw = 1 + int $::WIDTH / 32;
		436	my $sh = 1 + int $::HEIGHT / 32;
		437
		438	if ($::CONN->{mapw} > $sw) {
		439	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
		440	} else {
		441	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
		442	}
		443
		444	if ($::CONN->{maph} > $sh) {
		445	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
		446	} else {
		447	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
		448	}
		449
152	glEnable GL_TEXTURE_2D;	450	glEnable GL_TEXTURE_2D;
153	glEnable GL_BLEND;	451	glEnable GL_BLEND;
154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	452	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
155		453
156	my $map = $::CONN->{map};	454	for my $x (0 .. $sw - 1) {
157
158	for my $x (0 .. $::CONN->{mapw} - 1) {
159	for my $y (0 .. $::CONN->{maph} - 1) {	455	for my $y (0 .. $sh - 1) {
160		456
161	my $cell = $map->[$x][$y]	457	my $cell = $map->[$x + $xofs][$y + $yofs]
162	or next;	458	or next;
163		459
164	my $darkness = $cell->[3] * (1 / 255);	460	my $darkness = $cell->[0] * (1 / 255);
		461	if ($darkness < 0) {
		462	glColor 0.3, 0.3, 0.3;
		463	} else {
165	glColor $darkness, $darkness, $darkness;	464	glColor $darkness, $darkness, $darkness;
		465	}
166		466
167	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	467	for my $num (grep $_, @$cell[1,2,3]) {
168	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	468	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
169		469
170	glBindTexture GL_TEXTURE_2D, $tex->{name};	470	glBindTexture GL_TEXTURE_2D, $tex->{name};
171		471
		472	my $w = $tex->{width};
		473	my $h = $tex->{height};
		474
		475	my $px = ($x + 1) * 32 - $w;
		476	my $py = ($y + 1) * 32 - $h;
		477
172	glBegin GL_QUADS;	478	glBegin GL_QUADS;
173	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	479	glTexCoord 0, 0; glVertex $px , $py;
174	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	480	glTexCoord 0, 1; glVertex $px , $py + $h;
175	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	481	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
176	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	482	glTexCoord 1, 0; glVertex $px + $w, $py;
177	glEnd;	483	glEnd;
178	}	484	}
179	}	485	}
180	}	486	}
181		487
182	glDisable GL_TEXTURE_2D;	488	glDisable GL_TEXTURE_2D;
183	glDisable GL_BLEND;	489	glDisable GL_BLEND;
184	}	490	}
185		491
		492	my %DIR = (
		493	SDLK_KP8, [1, "north"],
		494	SDLK_KP9, [2, "northeast"],
		495	SDLK_KP6, [3, "east"],
		496	SDLK_KP3, [4, "southeast"],
		497	SDLK_KP2, [5, "south"],
		498	SDLK_KP1, [6, "southwest"],
		499	SDLK_KP4, [7, "west"],
		500	SDLK_KP7, [8, "northwest"],
		501
		502	SDLK_UP, [1, "north"],
		503	SDLK_RIGHT, [3, "east"],
		504	SDLK_DOWN, [5, "south"],
		505	SDLK_LEFT, [7, "west"],
		506	);
		507
		508	sub key_down {
		509	my ($self, $ev) = @_;
		510
		511	my $mod = $ev->key_mod;
		512	my $sym = $ev->key_sym;
		513
		514	if ($sym == SDLK_KP5) {
		515	$::CONN->send ("command stay fire");
		516	} elsif (exists $DIR{$sym}) {
		517	if ($mod & KMOD_SHIFT) {
		518	$self->{shft}++;
		519	$::CONN->send ("command fire $DIR{$sym}[0]");
		520	} elsif ($mod & KMOD_CTRL) {
		521	$self->{ctrl}++;
		522	$::CONN->send ("command run $DIR{$sym}[0]");
		523	} else {
		524	$::CONN->send ("command $DIR{$sym}[1]");
		525	}
		526	}
		527	}
		528
		529	sub key_up {
		530	my ($self, $ev) = @_;
		531
		532	my $mod = $ev->key_mod;
		533	my $sym = $ev->key_sym;
		534
		535	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
		536	$::CONN->send ("command fire_stop");
		537	}
		538	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
		539	$::CONN->send ("command run_stop");
		540	}
		541	}
		542
186	1;	543	1;
187		544

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.12 by root, Fri Apr 7 20:55:32 2006 UTC vs. Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.12 by root, Fri Apr 7 20:55:32 2006 UTC vs.
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC