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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs. Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs.
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC