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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.11 by elmex, Fri Apr 7 20:39:58 2006 UTC vs.
Revision 1.33 by root, Sun Apr 9 01:37:58 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 { }
14	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }	17	sub feed_sdl_button_up_event { }
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my $class = shift;
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];
24	}	27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
		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;
62	glTranslate ($self->{x} \|\| 0, $self->{y} \|\| 0, 0);	87	glTranslate $self->{x}, $self->{y}, 0;
63	$self->_draw;	88	$self->_draw;
64	glPopMatrix;	89	glPopMatrix;
65	}	90	}
66		91
67	sub _draw {	92	sub _draw {
68	my ($widget) = @_;	93	my ($widget) = @_;
69	}	94	}
70		95
71	sub bbox {	96	sub bbox {
72	my ($widget) = @_;	97	my ($self) = @_;
		98	my ($w, $h) = $self->size_request;
		99	(
		100	$self->{x},
		101	$self->{y},
		102	$self->{x} = $w,
		103	$self->{y} = $h
		104	)
		105	}
		106
		107	sub del_parent { $_[0]->{parent} = undef }
		108
		109	sub set_parent {
		110	my ($self, $par) = @_;
		111
		112	$self->{parent} = $par;
		113	Scalar::Util::weaken $self->{parent};
		114	}
		115
		116	sub get_parent {
		117	$_[0]->{parent}
		118	}
		119
		120	sub update {
		121	my ($self) = @_;
		122
		123	$self->{parent}->update
		124	if $self->{parent};
		125	}
		126
		127	sub DESTROY {
		128	my ($self) = @_;
		129
		130	#$self->deactivate;
		131	}
		132
		133	package Crossfire::Client::Widget::Container;
		134
		135	our @ISA = Crossfire::Client::Widget::;
		136
		137	use SDL::OpenGL;
		138
		139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
		140	sub get { $_[0]->{child} }
		141	sub remove {
		142	my ($self, $chld) = @_;
		143	delete $self->{child}
		144	if $self->{child} == $chld;
		145	}
		146
		147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
		148
		149	sub _draw { die "Containers can't be drawn!" }
		150
		151	package Crossfire::Client::Widget::Toplevel;
		152
		153	our @ISA = Crossfire::Client::Widget::;
		154
		155	use SDL::OpenGL;
		156
		157	sub add {
		158	my ($self, $chld) = @_;
		159
		160	push @{$self->{childs}}, $chld;
		161	@{$self->{childs}} =
		162	sort { $a->{z} <=> $b->{z} }
		163	@{$self->{childs}};
		164
		165	$chld->set_parent ($self);
		166	}
		167
		168	sub remove {
		169	my ($self, $chld) = @_;
		170	@{$self->{childs}} =
		171	sort { $a->{z} <=> $b->{z} }
		172	grep { $_ && $_ != $_[0] }
		173	@{$self->{childs}}
		174	}
		175
		176	sub update {
		177	my ($self) = @_;
		178	::refresh ();
		179	}
		180
		181	sub _draw {
		182	my ($self) = @_;
		183
		184	$_->draw for @{$self->{childs}};
		185	}
		186
		187	package Crossfire::Client::Widget::Window;
		188
		189	our @ISA = Crossfire::Client::Widget::Container::;
		190
		191	use SDL::OpenGL;
		192
		193	sub add {
		194	my ($self, $chld) = @_;
		195	$self->SUPER::add ($chld);
		196	$chld->set_parent ($self);
		197	$self->update; #TODO: Move this to the size_request event propably?
		198	}
		199
		200	sub remove {
		201	my ($self) = @_;
		202	# TODO FIXME: removing a child from a window will crash, see render_chld
		203	$self->update;
		204	}
		205
		206	sub update {
		207	my ($self) = @_;
		208	$self->render_chld;
		209	}
		210
		211	sub render_chld {
		212	my ($self) = @_;
		213	my $chld = $self->get;
		214	my ($w, $h) = $self->size_request;
		215
		216	$self->{texture} =
		217	Crossfire::Client::Texture->new_from_opengl (
		218	$w, $h, sub { $chld->draw }
		219	);
		220	$self->{texture}->upload;
		221	}
		222
		223	sub size_request {
		224	my ($self) = @_;
		225	my $chld = $self->get
		226	or return (0, 0);
		227	$chld->size_request
		228	}
		229
		230	sub _draw {
		231	my ($self) = @_;
		232
		233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
		234
		235	my $tex = $self->{texture}
		236	or return;
		237
		238	glEnable GL_BLEND;
		239	glEnable GL_TEXTURE_2D;
		240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		241	glBindTexture GL_TEXTURE_2D, $tex->{name};
		242
		243	glColor 1, 0, 1;
		244
		245	glBegin GL_QUADS;
		246	glTexCoord 0, 0; glVertex 0, 0;
		247	glTexCoord 0, 1; glVertex 0, $h;
		248	glTexCoord 1, 1; glVertex $w, $h;
		249	glTexCoord 1, 0; glVertex $w, 0;
		250	glEnd;
		251
		252	glDisable GL_BLEND;
		253	glDisable GL_TEXTURE_2D;
		254	}
		255
		256	package Crossfire::Client::Widget::Frame;
		257
		258	our @ISA = Crossfire::Client::Widget::Container::;
		259
		260	use SDL::OpenGL;
		261
		262	sub size_request {
		263	my ($self) = @_;
		264	my $chld = $self->get
		265	or return (0, 0);
		266
		267	$chld->move (2, 2);
		268
		269	map { $_ + 4 } $chld->size_request;
		270	}
		271
		272	sub _draw {
		273	my ($self) = @_;
		274
		275	my $chld = $self->get;
		276
		277	my ($w, $h) = $chld->size_request;
		278
		279	glBegin GL_QUADS;
		280	glColor 0, 0, 0;
		281	glTexCoord 0, 0; glVertex 0 , 0;
		282	glTexCoord 0, 1; glVertex 0 , $h + 4;
		283	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
		284	glTexCoord 1, 0; glVertex $w + 4 , 0;
		285	glEnd;
		286
		287	$chld->draw;
		288	}
		289
		290	package Crossfire::Client::Widget::FancyFrame;
		291
		292	our @ISA = Crossfire::Client::Widget::Frame::;
		293
		294	use SDL::OpenGL;
		295
		296	#TODO: implement themed frame
		297
		298	package Crossfire::Client::Widget::Table;
		299
		300	our @ISA = Crossfire::Client::Widget::Container::;
		301
		302	use SDL::OpenGL;
		303
		304	sub add {
		305	my ($self, $x, $y, $chld) = @_;
		306	my $old_chld = $self->{childs}[$y][$x];
		307
		308	$self->{childs}[$y][$x] = $chld;
		309	$chld->set_parent ($self);
		310	$self->update;
		311	}
		312
		313	sub max_row_height {
		314	my ($self, $row) = @_;
		315
		316	my $hs = 0;
		317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {
		318	my $c = $self->{childs}->[$row]->[$xi];
		319	if ($c) {
		320	my ($w, $h) = $c->size_request;
		321	if ($hs < $h) { $hs = $h }
		322	}
		323	}
		324	return $hs;
		325	}
		326
		327	sub max_col_width {
		328	my ($self, $col) = @_;
		329
		330	my $ws = 0;
		331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {
		332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];
		333	if ($c) {
		334	my ($w, $h) = $c->size_request;
		335	if ($ws < $w) { $ws = $w }
		336	}
		337	}
		338	return $ws;
		339	}
		340
		341	sub size_request {
		342	my ($self) = @_;
		343
		344	my ($hs, $ws) = (0, 0);
		345
		346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		347	$hs += $self->max_row_height ($yi);
		348	}
		349
		350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		351	my $wm = 0;
		352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
		353	$wm += $self->max_col_width ($xi)
		354	}
		355	if ($ws < $wm) { $ws = $wm }
		356	}
		357
		358	return ($ws, $hs);
		359	}
		360
		361	sub _draw {
		362	my ($self) = @_;
		363
		364	my $y = 0;
		365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
		366	my $x = 0;
		367
		368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
		369
		370	my $c = $self->{childs}->[$yi]->[$xi];
		371	if ($c) {
		372	$c->move ($x, $y, 0); #TODO: Move to size_request
		373	$c->draw if $c;
		374	}
		375
		376	$x += $self->max_col_width ($xi);
		377	}
		378
		379	$y += $self->max_row_height ($yi);
		380	}
		381	}
		382
		383	package Crossfire::Client::Widget::VBox;
		384
		385	our @ISA = Crossfire::Client::Widget::Container::;
		386
		387	use SDL::OpenGL;
		388
		389	sub add {
		390	my ($self, $chld) = @_;
		391	push @{$self->{childs}}, $chld;
		392	$chld->set_parent ($self);
		393	$self->update;
		394	}
		395
		396	sub size_request {
		397	my ($self) = @_;
		398
		399	my ($hs, $ws) = (0, 0);
		400	for (@{$self->{childs} \|\| []}) {
		401	my ($w, $h) = $_->size_request;
		402	$hs += $h;
		403	if ($ws < $w) { $ws = $w }
		404	}
		405
		406	return ($ws, $hs);
		407	}
		408
		409	sub _draw {
		410	my ($self) = @_;
		411
		412	my ($x, $y);
		413	for (@{$self->{childs} \|\| []}) {
		414	$_->move (0, $y, 0); #TODO: move to size_request
		415	$_->draw;
		416	my ($w, $h) = $_->size_request;
		417	$y += $h;
		418	}
73	}	419	}
74		420
75	package Crossfire::Client::Widget::Label;	421	package Crossfire::Client::Widget::Label;
76		422
		423	our @ISA = Crossfire::Client::Widget::;
		424
77	use SDL::OpenGL;	425	use SDL::OpenGL;
78		426
79	sub new {	427	sub new {
80	my ($class, $ttf, $text) = @_;	428	my ($class, $x, $y, $z, $height, $text) = @_;
81		429
82	my $self = $class->SUPER::new;	430	# TODO: color, and make height, xyz etc. optional
		431	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
83		432
84	$self->{texture} = new_from_ttf Crossfire::Client::Texture $ttf, $text;	433	$self->set_text ($text);
85		434
86	$self	435	$self
87	}	436	}
88		437
		438	sub set_text {
		439	my ($self, $text) = @_;
		440
		441	$self->{text} = $text;
		442	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		443
		444	$self->update;
		445	}
		446
		447	sub get_text {
		448	my ($self, $text) = @_;
		449
		450	$self->{text}
		451	}
		452
		453	sub size_request {
		454	my ($self) = @_;
		455
		456	(
		457	$self->{texture}{width},
		458	$self->{texture}{height},
		459	)
		460	}
		461
89	sub _draw {	462	sub _draw {
90	my ($self) = @_;	463	my ($self) = @_;
91		464
92	my $tex = $self->{texture};	465	my $tex = $self->{texture};
93		466
		467	glEnable GL_BLEND;
94	glEnable GL_TEXTURE_2D;	468	glEnable GL_TEXTURE_2D;
		469	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
95	glBindTexture GL_TEXTURE_2D, $tex->{name};	471	glBindTexture GL_TEXTURE_2D, $tex->{name};
		472
		473	glColor 1, 1, 1, 0.6; # TODO color
96		474
97	glBegin GL_QUADS;	475	glBegin GL_QUADS;
98	glTexCoord 0, 0; glVertex 0 , 0;	476	glTexCoord 0, 0; glVertex 0 , 0;
99	glTexCoord 0, 1; glVertex 0 , $tex->{height};	477	glTexCoord 0, 1; glVertex 0 , $tex->{height};
100	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	478	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
101	glTexCoord 1, 0; glVertex $tex->{width}, 0;	479	glTexCoord 1, 0; glVertex $tex->{width}, 0;
102	glEnd;	480	glEnd;
103		481
		482	glDisable GL_BLEND;
104	glDisable GL_TEXTURE_2D;	483	glDisable GL_TEXTURE_2D;
105	}	484	}
106		485
		486	package Crossfire::Client::Widget::TextEntry;
		487
		488	our @ISA = Crossfire::Client::Widget::Label::;
		489
		490	use SDL;
		491	use SDL::OpenGL;
		492
		493	sub key_down {
		494	my ($self, $ev) = @_;
		495
		496	my $mod = $ev->key_mod;
		497	my $sym = $ev->key_sym;
		498
		499	$ev->set_unicode (1);
		500	my $uni = $ev->key_unicode;
		501
		502	my $text = $self->get_text;
		503
		504	if ($sym == SDLK_BACKSPACE) {
		505	substr $text, -1, 1, '';
		506
		507	} elsif ($uni) {
		508	$text .= chr $uni;
		509	}
		510	$self->set_text ($text);
		511	}
		512
		513
		514	# XXX: TextView isn't neccessary with pango multiline text rendering
107	package Crossfire::Client::Widget::TextView;	515	package Crossfire::Client::Widget::TextView;
108		516
109	use strict;	517	use strict;
110		518
111	our @ISA = qw/Crossfire::Client::Widget/;	519	our @ISA = qw/Crossfire::Client::Widget/;
112		520
113	use SDL::OpenGL;	521	use SDL::OpenGL;
114	use SDL::OpenGL::Constants;	522	use SDL::OpenGL::Constants;
		523
		524	sub new {
		525	my ($class, $text, $h) = @_;
		526	my $self = $class->SUPER::new ();
		527
		528	$self->{txt_height} = $h;
		529	@{$self->{lines}} = split /\r?\n/, $text;
		530
		531	for (split /\r?\n/, $text) {
		532	$self->add_line ($_);
		533	}
		534	$self
		535	}
		536
		537	#sub render_lines {
		538	# my ($self) = @_;
		539	#
		540	# $self->{txt_lines} = [];
		541	#
		542	# for (@{$self->{lines}}) {
		543	# push @{$self->{txt_lines}},
		544	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
		545	# }
		546	#}
115		547
116	sub add_line {	548	sub add_line {
117	my ($self, $line) = @_;	549	my ($self, $line) = @_;
118	push @{$self->{lines}}, $line;	550	push @{$self->{lines}}, $line;
119	}
120		551
		552	push @{$self->{txt_lines}},
		553	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
		554	}
		555
		556	sub size_request {
		557	my ($self) = @_;
		558
		559	my $w = 0;
		560	my $h = 0;
		561
		562	for (@{$self->{txt_lines}}) {
		563	if ($w < $_->{width}) { $w = $_->{width} }
		564	$h += $_->{height};
		565	}
		566
		567	return ($w, $h);
		568	}
		569
121	sub _draw {	570	sub draw_line {
122	my ($self) = @_;	571	my ($self, $tex, $y) = @_;
123		572
		573	glBindTexture GL_TEXTURE_2D, $tex->{name};
		574
		575	glColor 1, 0, 1;
		576
		577	glBegin GL_QUADS;
		578	glTexCoord 0, 0; glVertex 0 , $y;
		579	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
		580	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
		581	glTexCoord 1, 0; glVertex $tex->{width}, $y;
		582	glEnd;
		583	}
		584
		585	sub _draw {
		586	my ($self) = @_;
		587
		588	glEnable GL_BLEND;
		589	glEnable GL_TEXTURE_2D;
		590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
		591
		592	my $l = 0;
		593	for (@{$self->{txt_lines}}) {
		594	$self->draw_line ($_, $l);
		595	$l += $_->{height};
		596	}
		597
		598	glDisable GL_BLEND;
		599	glDisable GL_TEXTURE_2D;
124	}	600	}
125		601
126	package Crossfire::Client::Widget::MapWidget;	602	package Crossfire::Client::Widget::MapWidget;
127		603
128	use strict;	604	use strict;
129		605
130	our @ISA = qw/Crossfire::Client::Widget/;	606	use List::Util qw(min max);
131		607
		608	use SDL;
132	use SDL::OpenGL;	609	use SDL::OpenGL;
133	use SDL::OpenGL::Constants;	610	use SDL::OpenGL::Constants;
		611
		612	our @ISA = Crossfire::Client::Widget::;
134		613
135	sub key_down {	614	sub key_down {
136	print "MAPKEYDOWN\n";	615	print "MAPKEYDOWN\n";
137	}	616	}
138		617
139	sub key_up {	618	sub key_up {
140	}	619	}
141		620
142	sub _draw {	621	sub _draw {
		622	my ($self) = @_;
		623
		624	my $mx = $::CONN->{mapx};
		625	my $my = $::CONN->{mapy};
		626
		627	my $map = $::CONN->{map};
		628
		629	my ($xofs, $yofs);
		630
		631	my $sw = 1 + int $::WIDTH / 32;
		632	my $sh = 1 + int $::HEIGHT / 32;
		633
		634	if ($::CONN->{mapw} > $sw) {
		635	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
		636	} else {
		637	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
		638	}
		639
		640	if ($::CONN->{maph} > $sh) {
		641	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
		642	} else {
		643	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
		644	}
		645
143	glEnable GL_TEXTURE_2D;	646	glEnable GL_TEXTURE_2D;
144	glEnable GL_BLEND;	647	glEnable GL_BLEND;
		648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
145		649
146	my $map = $::CONN->{map};	650	for my $x (0 .. $sw - 1) {
147
148	for my $x (0 .. $::CONN->{mapw} - 1) {
149	for my $y (0 .. $::CONN->{maph} - 1) {	651	for my $y (0 .. $sh - 1) {
150		652
151	my $cell = $map->[$x][$y]	653	my $cell = $map->[$x + $xofs][$y + $yofs]
152	or next;	654	or next;
153		655
154	my $darkness = $cell->[3] * (1 / 255);	656	my $darkness = $cell->[0] * (1 / 255);
		657	if ($darkness < 0) {
		658	glColor 0.3, 0.3, 0.3;
		659	} else {
155	glColor $darkness, $darkness, $darkness;	660	glColor $darkness, $darkness, $darkness;
		661	}
156		662
157	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	663	for my $num (grep $_, @$cell[1,2,3]) {
158	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	664	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
159		665
160	glBindTexture GL_TEXTURE_2D, $tex->{name};	666	glBindTexture GL_TEXTURE_2D, $tex->{name};
161		667
		668	my $w = $tex->{width};
		669	my $h = $tex->{height};
		670
		671	my $px = ($x + 1) * 32 - $w;
		672	my $py = ($y + 1) * 32 - $h;
		673
162	glBegin GL_QUADS;	674	glBegin GL_QUADS;
163	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	675	glTexCoord 0, 0; glVertex $px , $py;
164	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	676	glTexCoord 0, 1; glVertex $px , $py + $h;
165	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	677	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
166	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	678	glTexCoord 1, 0; glVertex $px + $w, $py;
167	glEnd;	679	glEnd;
168	}	680	}
169	}	681	}
170	}	682	}
171		683
172	glDisable GL_TEXTURE_2D;	684	glDisable GL_TEXTURE_2D;
173	glDisable GL_BLEND;	685	glDisable GL_BLEND;
174	}	686	}
175		687
		688	my %DIR = (
		689	SDLK_KP8, [1, "north"],
		690	SDLK_KP9, [2, "northeast"],
		691	SDLK_KP6, [3, "east"],
		692	SDLK_KP3, [4, "southeast"],
		693	SDLK_KP2, [5, "south"],
		694	SDLK_KP1, [6, "southwest"],
		695	SDLK_KP4, [7, "west"],
		696	SDLK_KP7, [8, "northwest"],
		697
		698	SDLK_UP, [1, "north"],
		699	SDLK_RIGHT, [3, "east"],
		700	SDLK_DOWN, [5, "south"],
		701	SDLK_LEFT, [7, "west"],
		702	);
		703
		704	sub key_down {
		705	my ($self, $ev) = @_;
		706
		707	my $mod = $ev->key_mod;
		708	my $sym = $ev->key_sym;
		709
		710	if ($sym == SDLK_KP5) {
		711	$::CONN->send ("command stay fire");
		712	} elsif (exists $DIR{$sym}) {
		713	if ($mod & KMOD_SHIFT) {
		714	$self->{shft}++;
		715	$::CONN->send ("command fire $DIR{$sym}[0]");
		716	} elsif ($mod & KMOD_CTRL) {
		717	$self->{ctrl}++;
		718	$::CONN->send ("command run $DIR{$sym}[0]");
		719	} else {
		720	$::CONN->send ("command $DIR{$sym}[1]");
		721	}
		722	}
		723	}
		724
		725	sub key_up {
		726	my ($self, $ev) = @_;
		727
		728	my $mod = $ev->key_mod;
		729	my $sym = $ev->key_sym;
		730
		731	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
		732	$::CONN->send ("command fire_stop");
		733	}
		734	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
		735	$::CONN->send ("command run_stop");
		736	}
		737	}
		738
176	1;	739	1;
177		740

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.11 by elmex, Fri Apr 7 20:39:58 2006 UTC vs. Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.11 by elmex, Fri Apr 7 20:39:58 2006 UTC vs.
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC