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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.13 by elmex, Fri Apr 7 20:57:29 2006 UTC vs. Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.13 by elmex, Fri Apr 7 20:57:29 2006 UTC vs.
Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC