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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.8 by root, Fri Apr 7 20:08:57 2006 UTC vs.
Revision 1.27 by root, Sat Apr 8 22:25:37 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package Crossfire::Client::Widget;
2		2
3	use strict;	3	use strict;
4		4
		5	use Scalar::Util;
		6
		7	use SDL::OpenGL;
		8	use SDL::OpenGL::Constants;
		9
5	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
6	our %ACTIVE_WIDGETS;	11	our @ACTIVE_WIDGETS;
7		12
8	# class methods for events	13	# class methods for events
9	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 }
10	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 }
11	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 }
12	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }	17	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }
13		18
14	sub new {	19	sub new {
15	my $class = shift;	20	my $class = shift;
16	my $self = { @_ };	21
17	bless $self, $class;	22	bless { @_ }, $class
18	return $self;
19	}	23	}
20		24
21	sub activate {	25	sub activate {
22	$ACTIVE_WIDGETS{$_[0]} = $_[0];	26	push @ACTIVE_WIDGETS, $_[0];
		27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
23	}	28	}
24		29
25	sub deactivate {	30	sub deactivate {
26	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";
27	}	50	}
28		51
29	sub focus_in {	52	sub focus_in {
30	my ($widget) = @_;	53	my ($widget) = @_;
31	$FOCUS = $widget;	54	$FOCUS = $widget;
49		72
50	sub button_up {	73	sub button_up {
51	my ($widget, $sdlev) = @_;	74	my ($widget, $sdlev) = @_;
52	}	75	}
53		76
		77	sub w { $_[0]->{w} }
		78	sub h { $_[0]->{h} }
		79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
		80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
		81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
		82
54	sub draw {	83	sub draw {
		84	my ($self) = @_;
		85
		86	glPushMatrix;
		87	glTranslate $self->{x}, $self->{y}, 0;
		88	$self->_draw;
		89	glPopMatrix;
		90	}
		91
		92	sub _draw {
55	my ($widget) = @_;	93	my ($widget) = @_;
56	}	94	}
57		95
58	sub bbox {	96	sub bbox {
59	my ($widget) = @_;	97	my ($widget) = @_;
60	}	98	}
61		99
62	package Client::TextView;	100	sub DESTROY {
		101	my ($self) = @_;
		102
		103	$self->deactivate;
		104	}
		105
		106	package Crossfire::Client::Widget::Container;
		107
		108	our @ISA = Crossfire::Client::Widget::;
		109
		110	use SDL::OpenGL;
		111
		112	sub add { $_[0]->{child} = $_[1] }
		113	sub get { $_[0]->{child} }
		114
		115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
		116
		117	sub _draw { die "Containers can't be drawn!" }
		118
		119	package Crossfire::Client::Widget::Window;
		120
		121	our @ISA = Crossfire::Client::Widget::Container::;
		122
		123	use SDL::OpenGL;
		124
		125	sub add {
		126	my ($self, $chld) = @_;
		127	$self->SUPER::add ($chld);
		128	$self->render_chld; #TODO: Move this to the size_request event propably?
		129	}
		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
		154	my $tex = $self->{texture}
		155	or return;
		156
		157	glEnable GL_BLEND;
		158	glEnable GL_TEXTURE_2D;
		159	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		160	glBindTexture GL_TEXTURE_2D, $tex->{name};
		161
		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, $ttf, $text) = @_;
		333
		334	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf);
		335
		336	$self->set_text ($text);
		337
		338	$self
		339	}
		340
		341	sub set_text {
		342	my ($self, $text) = @_;
		343	$self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text;
		344	}
		345
		346	sub get_text {
		347	my ($self, $text) = @_;
		348	$self->{text}
		349	}
		350
		351	sub size_request {
		352	my ($self) = @_;
		353
		354	(
		355	$self->{texture}{width},
		356	$self->{texture}{height},
		357	)
		358	}
		359
		360	sub _draw {
		361	my ($self) = @_;
		362
		363	my $tex = $self->{texture};
		364
		365	glEnable GL_BLEND;
		366	glEnable GL_TEXTURE_2D;
		367	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
		368	glBindTexture GL_TEXTURE_2D, $tex->{name};
		369
		370	glColor 1, 0, 1;
		371
		372	glBegin GL_QUADS;
		373	glTexCoord 0, 0; glVertex 0 , 0;
		374	glTexCoord 0, 1; glVertex 0 , $tex->{height};
		375	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
		376	glTexCoord 1, 0; glVertex $tex->{width}, 0;
		377	glEnd;
		378
		379	glDisable GL_BLEND;
		380	glDisable GL_TEXTURE_2D;
		381	}
		382
		383	package Crossfire::Client::Widget::TextView;
63		384
64	use strict;	385	use strict;
65		386
66	our @ISA = qw/Client::Widget/;	387	our @ISA = qw/Crossfire::Client::Widget/;
67		388
68	use SDL::OpenGL;	389	use SDL::OpenGL;
69	use SDL::OpenGL::Constants;	390	use SDL::OpenGL::Constants;
70		391
71	sub add_line {	392	sub add_line {
72	my ($self, $line) = @_;	393	my ($self, $line) = @_;
73	push @{$self->{lines}}, $line;	394	push @{$self->{lines}}, $line;
74	}	395	}
75		396
76	sub draw {	397	sub _draw {
77	my ($self) = @_;	398	my ($self) = @_;
78		399
79	}	400	}
80		401
81	package Client::MapWidget;	402	package Crossfire::Client::Widget::MapWidget;
82		403
83	use strict;	404	use strict;
84		405
85	our @ISA = qw/Client::Widget/;	406	use List::Util qw(min max);
86		407
		408	use SDL;
87	use SDL::OpenGL;	409	use SDL::OpenGL;
88	use SDL::OpenGL::Constants;	410	use SDL::OpenGL::Constants;
		411
		412	our @ISA = Crossfire::Client::Widget::;
89		413
90	sub key_down {	414	sub key_down {
91	print "MAPKEYDOWN\n";	415	print "MAPKEYDOWN\n";
92	}	416	}
93		417
94	sub key_up {	418	sub key_up {
95	}	419	}
96		420
97	sub draw {	421	sub _draw {
		422	my ($self) = @_;
		423
		424	my $mx = $::CONN->{mapx};
		425	my $my = $::CONN->{mapy};
		426
		427	my $map = $::CONN->{map};
		428
		429	my ($xofs, $yofs);
		430
		431	my $sw = 1 + int $::WIDTH / 32;
		432	my $sh = 1 + int $::HEIGHT / 32;
		433
		434	if ($::CONN->{mapw} > $sw) {
		435	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
		436	} else {
		437	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
		438	}
		439
		440	if ($::CONN->{maph} > $sh) {
		441	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
		442	} else {
		443	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
		444	}
		445
98	glEnable GL_TEXTURE_2D;	446	glEnable GL_TEXTURE_2D;
99	glEnable GL_BLEND;	447	glEnable GL_BLEND;
		448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
100		449
101	my $map = $::CONN->{map};	450	for my $x (0 .. $sw - 1) {
102
103	for my $x (0 .. $::CONN->{mapw} - 1) {
104	for my $y (0 .. $::CONN->{maph} - 1) {	451	for my $y (0 .. $sh - 1) {
105		452
106	my $cell = $map->[$x][$y]	453	my $cell = $map->[$x + $xofs][$y + $yofs]
107	or next;	454	or next;
108		455
109	my $darkness = $cell->[3] * (1 / 255);	456	my $darkness = $cell->[0] * (1 / 255);
		457	if ($darkness < 0) {
		458	glColor 0.3, 0.3, 0.3;
		459	} else {
110	glColor $darkness, $darkness, $darkness;	460	glColor $darkness, $darkness, $darkness;
		461	}
111		462
112	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	463	for my $num (grep $_, @$cell[1,2,3]) {
113	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	464	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
114		465
115	glBindTexture GL_TEXTURE_2D, $tex->{name};	466	glBindTexture GL_TEXTURE_2D, $tex->{name};
116		467
		468	my $w = $tex->{width};
		469	my $h = $tex->{height};
		470
		471	my $px = ($x + 1) * 32 - $w;
		472	my $py = ($y + 1) * 32 - $h;
		473
117	glBegin GL_QUADS;	474	glBegin GL_QUADS;
118	glTexCoord 0, 0; glVertex $x, $y;	475	glTexCoord 0, 0; glVertex $px , $py;
119	glTexCoord 0, 1; glVertex $x, $y + 1;	476	glTexCoord 0, 1; glVertex $px , $py + $h;
120	glTexCoord 1, 1; glVertex $x + 1, $y + 1;	477	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
121	glTexCoord 1, 0; glVertex $x + 1, $y;	478	glTexCoord 1, 0; glVertex $px + $w, $py;
122	glEnd;	479	glEnd;
123	}	480	}
124	}	481	}
125	}	482	}
126		483
127	glDisable GL_TEXTURE_2D;	484	glDisable GL_TEXTURE_2D;
128	glDisable GL_BLEND;	485	glDisable GL_BLEND;
129	}	486	}
130		487
		488	my %DIR = (
		489	SDLK_KP8, [1, "north"],
		490	SDLK_KP9, [2, "northeast"],
		491	SDLK_KP6, [3, "east"],
		492	SDLK_KP3, [4, "southeast"],
		493	SDLK_KP2, [5, "south"],
		494	SDLK_KP1, [6, "southwest"],
		495	SDLK_KP4, [7, "west"],
		496	SDLK_KP7, [8, "northwest"],
		497
		498	SDLK_UP, [1, "north"],
		499	SDLK_RIGHT, [3, "east"],
		500	SDLK_DOWN, [5, "south"],
		501	SDLK_LEFT, [7, "west"],
		502	);
		503
		504	sub key_down {
		505	my ($self, $ev) = @_;
		506
		507	my $mod = $ev->key_mod;
		508	my $sym = $ev->key_sym;
		509
		510	if ($sym == SDLK_KP5) {
		511	$::CONN->send ("command stay fire");
		512	} elsif (exists $DIR{$sym}) {
		513	if ($mod & KMOD_SHIFT) {
		514	$self->{shft}++;
		515	$::CONN->send ("command fire $DIR{$sym}[0]");
		516	} elsif ($mod & KMOD_CTRL) {
		517	$self->{ctrl}++;
		518	$::CONN->send ("command run $DIR{$sym}[0]");
		519	} else {
		520	$::CONN->send ("command $DIR{$sym}[1]");
		521	}
		522	}
		523	}
		524
		525	sub key_up {
		526	my ($self, $ev) = @_;
		527
		528	my $mod = $ev->key_mod;
		529	my $sym = $ev->key_sym;
		530
		531	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
		532	$::CONN->send ("command fire_stop");
		533	}
		534	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
		535	$::CONN->send ("command run_stop");
		536	}
		537	}
		538
131	1;	539	1;
132		540

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.8 by root, Fri Apr 7 20:08:57 2006 UTC vs. Revision 1.27 by root, Sat Apr 8 22:25:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.8 by root, Fri Apr 7 20:08:57 2006 UTC vs.
Revision 1.27 by root, Sat Apr 8 22:25:37 2006 UTC