ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.16 by root, Fri Apr 7 23:16:29 2006 UTC vs.
Revision 1.18 by root, Sat Apr 8 13:36:26 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2 2
3use strict; 3use strict;
4
5use Scalar::Util;
6
4use SDL::OpenGL; 7use SDL::OpenGL;
5use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
6 9
7our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
8our @ACTIVE_WIDGETS; 11our @ACTIVE_WIDGETS;
… …
19 bless { @_ }, $class 22 bless { @_ }, $class
20} 23}
21 24
22sub activate { 25sub activate {
23 push @ACTIVE_WIDGETS, $_[0]; 26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
24} 28}
25 29
26sub deactivate { 30sub 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
37sub move {
38 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x;
40 $self->{y} = $y;
41 $self->{z} = $z if defined $z;
31} 42}
32 43
33sub size_request { 44sub size_request {
34 die "size_request is abtract"; 45 die "size_request is abtract";
35} 46}
… …
78 my ($widget) = @_; 89 my ($widget) = @_;
79} 90}
80 91
81sub bbox { 92sub bbox {
82 my ($widget) = @_; 93 my ($widget) = @_;
94}
95
96sub DESTROY {
97 my ($self) = @_;
98
99 $self->deactivate;
83} 100}
84 101
85package Crossfire::Client::Widget::Container; 102package Crossfire::Client::Widget::Container;
86 103
87our @ISA = Crossfire::Client::Widget::; 104our @ISA = Crossfire::Client::Widget::;
… …
144 my ($self, $row) = @_; 161 my ($self, $row) = @_;
145 162
146 my $hs = 0; 163 my $hs = 0;
147 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 164 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
148 my $c = $self->{childs}->[$row]->[$xi]; 165 my $c = $self->{childs}->[$row]->[$xi];
166 if ($c) {
149 my ($w, $h) = $c->size_request if $c; 167 my ($w, $h) = $c->size_request;
150 if ($hs < $h) { $hs = $h } 168 if ($hs < $h) { $hs = $h }
169 }
151 } 170 }
152 return $hs; 171 return $hs;
153} 172}
154 173
155sub max_col_width { 174sub max_col_width {
156 my ($self, $col) = @_; 175 my ($self, $col) = @_;
157 176
158 my $ws = 0; 177 my $ws = 0;
159 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 178 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
160 my $c = ($self->{childs}->[$yi] || [])->[$col]; 179 my $c = ($self->{childs}->[$yi] || [])->[$col];
180 if ($c) {
161 my ($w, $h) = $c->size_request if $c; 181 my ($w, $h) = $c->size_request;
162 if ($ws < $w) { $ws = $w } 182 if ($ws < $w) { $ws = $w }
183 }
163 } 184 }
164 return $ws; 185 return $ws;
165} 186}
166 187
167sub size_request { 188sub size_request {
… …
282sub _draw { 303sub _draw {
283 my ($self) = @_; 304 my ($self) = @_;
284 305
285 my $tex = $self->{texture}; 306 my $tex = $self->{texture};
286 307
287 $self->{x}--;
288
289 glEnable GL_BLEND; 308 glEnable GL_BLEND;
290 glEnable GL_TEXTURE_2D; 309 glEnable GL_TEXTURE_2D;
291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
292 glBindTexture GL_TEXTURE_2D, $tex->{name}; 311 glBindTexture GL_TEXTURE_2D, $tex->{name};
293 312
… …
375 glDisable GL_BLEND; 394 glDisable GL_BLEND;
376} 395}
377 396
378my %DIR = ( 397my %DIR = (
379 SDLK_KP8, [1, "north"], 398 SDLK_KP8, [1, "north"],
380 SDLK_KP9, [2, "northest"], 399 SDLK_KP9, [2, "northeast"],
381 SDLK_KP6, [3, "east"], 400 SDLK_KP6, [3, "east"],
382 SDLK_KP3, [4, "southeast"], 401 SDLK_KP3, [4, "southeast"],
383 SDLK_KP2, [5, "south"], 402 SDLK_KP2, [5, "south"],
384 SDLK_KP1, [6, "southwest"], 403 SDLK_KP1, [6, "southwest"],
385 SDLK_KP4, [7, "west"], 404 SDLK_KP4, [7, "west"],
386 SDLK_KP7, [8, "northwest"], 405 SDLK_KP7, [8, "northwest"],
406
407 SDLK_UP, [1, "north"],
408 SDLK_RIGHT, [3, "east"],
409 SDLK_DOWN, [5, "south"],
410 SDLK_LEFT, [7, "west"],
387); 411);
388 412
389sub key_down { 413sub key_down {
390 my ($self, $ev) = @_; 414 my ($self, $ev) = @_;
391 415
… …
394 418
395 if ($sym == SDLK_KP5) { 419 if ($sym == SDLK_KP5) {
396 $::CONN->send ("command stay fire"); 420 $::CONN->send ("command stay fire");
397 } elsif (exists $DIR{$sym}) { 421 } elsif (exists $DIR{$sym}) {
398 if ($mod & KMOD_SHIFT) { 422 if ($mod & KMOD_SHIFT) {
423 $self->{shft}++;
399 $::CONN->send ("command fire $DIR{$sym}[0]"); 424 $::CONN->send ("command fire $DIR{$sym}[0]");
400 } elsif ($mod & KMOD_CTRL) { 425 } elsif ($mod & KMOD_CTRL) {
426 $self->{ctrl}++;
401 $::CONN->send ("command run $DIR{$sym}[0]"); 427 $::CONN->send ("command run $DIR{$sym}[0]");
402 } else { 428 } else {
429 $::CONN->send ("command $DIR{$sym}[1]");
403 } 430 }
404 } 431 }
405} 432}
406 433
407sub key_up { 434sub key_up {
408 my ($self, $ev) = @_; 435 my ($self, $ev) = @_;
409 436
410 my $mod = $ev->key_mod; 437 my $mod = $ev->key_mod;
411 my $sym = $ev->key_sym; 438 my $sym = $ev->key_sym;
412 439
413 if (exists $DIR{$sym}) { 440 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
414 if ($mod & KMOD_SHIFT) {
415 $::CONN->send ("command fire_stop"); 441 $::CONN->send ("command fire_stop");
416 } else { 442 }
443 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
417 $::CONN->send ("command run_stop"); 444 $::CONN->send ("command run_stop");
418 }
419 } 445 }
420} 446}
421 447
4221; 4481;
423 449

Diff Legend

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