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.27 by root, Sat Apr 8 22:25:37 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;
42}
43
44sub needs_redraw {
45 0
31} 46}
32 47
33sub size_request { 48sub size_request {
34 die "size_request is abtract"; 49 die "size_request is abtract";
35} 50}
… …
80 95
81sub bbox { 96sub bbox {
82 my ($widget) = @_; 97 my ($widget) = @_;
83} 98}
84 99
100sub DESTROY {
101 my ($self) = @_;
102
103 $self->deactivate;
104}
105
85package Crossfire::Client::Widget::Container; 106package Crossfire::Client::Widget::Container;
86 107
87our @ISA = Crossfire::Client::Widget::; 108our @ISA = Crossfire::Client::Widget::;
88 109
89use SDL::OpenGL; 110use SDL::OpenGL;
… …
92sub get { $_[0]->{child} } 113sub get { $_[0]->{child} }
93 114
94sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95 116
96sub _draw { die "Containers can't be drawn!" } 117sub _draw { die "Containers can't be drawn!" }
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub 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
131sub 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
143sub size_request {
144 my ($self) = @_;
145 my $chld = $self->get
146 or return (0, 0);
147 $chld->size_request
148}
149
150sub _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}
97 174
98package Crossfire::Client::Widget::Frame; 175package Crossfire::Client::Widget::Frame;
99 176
100our @ISA = Crossfire::Client::Widget::Container::; 177our @ISA = Crossfire::Client::Widget::Container::;
101 178
… …
110 187
111sub _draw { 188sub _draw {
112 my ($self) = @_; 189 my ($self) = @_;
113 190
114 my $chld = $self->get; 191 my $chld = $self->get;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
115 194
116 my ($w, $h) = $chld->size_request; 195 my ($w, $h) = $chld->size_request;
117 196
118 glColor 1, 0, 0; 197 glColor 1, 0, 0;
119 glBegin GL_QUADS; 198 glBegin GL_QUADS;
… …
121 glTexCoord 0, 1; glVertex 0 , $h + 4; 200 glTexCoord 0, 1; glVertex 0 , $h + 4;
122 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 202 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 203 glEnd;
125 204
126 glPushMatrix;
127 glTranslate (2, 2, 0);
128 $chld->_draw; 205 $chld->draw;
129 glPopMatrix;
130} 206}
131 207
132package Crossfire::Client::Widget::Table; 208package Crossfire::Client::Widget::Table;
133 209
134our @ISA = Crossfire::Client::Widget::Container::; 210our @ISA = Crossfire::Client::Widget::Container::;
… …
144 my ($self, $row) = @_; 220 my ($self, $row) = @_;
145 221
146 my $hs = 0; 222 my $hs = 0;
147 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
148 my $c = $self->{childs}->[$row]->[$xi]; 224 my $c = $self->{childs}->[$row]->[$xi];
225 if ($c) {
149 my ($w, $h) = $c->size_request if $c; 226 my ($w, $h) = $c->size_request;
150 if ($hs < $h) { $hs = $h } 227 if ($hs < $h) { $hs = $h }
228 }
151 } 229 }
152 return $hs; 230 return $hs;
153} 231}
154 232
155sub max_col_width { 233sub max_col_width {
156 my ($self, $col) = @_; 234 my ($self, $col) = @_;
157 235
158 my $ws = 0; 236 my $ws = 0;
159 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
160 my $c = ($self->{childs}->[$yi] || [])->[$col]; 238 my $c = ($self->{childs}->[$yi] || [])->[$col];
239 if ($c) {
161 my ($w, $h) = $c->size_request if $c; 240 my ($w, $h) = $c->size_request;
162 if ($ws < $w) { $ws = $w } 241 if ($ws < $w) { $ws = $w }
242 }
163 } 243 }
164 return $ws; 244 return $ws;
165} 245}
166 246
167sub size_request { 247sub size_request {
… …
191 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
192 my $x = 0; 272 my $x = 0;
193 273
194 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
195 275
196 glPushMatrix;
197 glTranslate ($x, $y, 0);
198 my $c = $self->{childs}->[$yi]->[$xi]; 276 my $c = $self->{childs}->[$yi]->[$xi];
277 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request
199 $c->_draw if $c; 279 $c->draw if $c;
200 glPopMatrix; 280 }
201 281
202 $x += $self->max_col_width ($xi); 282 $x += $self->max_col_width ($xi);
203 } 283 }
204 284
205 $y += $self->max_row_height ($yi); 285 $y += $self->max_row_height ($yi);
… …
233sub _draw { 313sub _draw {
234 my ($self) = @_; 314 my ($self) = @_;
235 315
236 my ($x, $y); 316 my ($x, $y);
237 for (@{$self->{childs} || []}) { 317 for (@{$self->{childs} || []}) {
238 glPushMatrix; 318 $_->move (0, $y, 0); #TODO: move to size_request
239 glTranslate (0, $y, 0);
240 $_->_draw; 319 $_->draw;
241 glPopMatrix;
242 my ($w, $h) = $_->size_request; 320 my ($w, $h) = $_->size_request;
243 $y += $h; 321 $y += $h;
244 } 322 }
245} 323}
246 324
… …
282sub _draw { 360sub _draw {
283 my ($self) = @_; 361 my ($self) = @_;
284 362
285 my $tex = $self->{texture}; 363 my $tex = $self->{texture};
286 364
287 $self->{x}--;
288
289 glEnable GL_BLEND; 365 glEnable GL_BLEND;
290 glEnable GL_TEXTURE_2D; 366 glEnable GL_TEXTURE_2D;
291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 367 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
292 glBindTexture GL_TEXTURE_2D, $tex->{name}; 368 glBindTexture GL_TEXTURE_2D, $tex->{name};
293 369
294 glColor 1, 1, 1; 370 glColor 1, 0, 1;
295 371
296 glBegin GL_QUADS; 372 glBegin GL_QUADS;
297 glTexCoord 0, 0; glVertex 0 , 0; 373 glTexCoord 0, 0; glVertex 0 , 0;
298 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 374 glTexCoord 0, 1; glVertex 0 , $tex->{height};
299 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 375 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
325 401
326package Crossfire::Client::Widget::MapWidget; 402package Crossfire::Client::Widget::MapWidget;
327 403
328use strict; 404use strict;
329 405
330our @ISA = qw/Crossfire::Client::Widget/; 406use List::Util qw(min max);
331 407
332use SDL; 408use SDL;
333use SDL::OpenGL; 409use SDL::OpenGL;
334use SDL::OpenGL::Constants; 410use SDL::OpenGL::Constants;
411
412our @ISA = Crossfire::Client::Widget::;
335 413
336sub key_down { 414sub key_down {
337 print "MAPKEYDOWN\n"; 415 print "MAPKEYDOWN\n";
338} 416}
339 417
340sub key_up { 418sub key_up {
341} 419}
342 420
343sub _draw { 421sub _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
344 glEnable GL_TEXTURE_2D; 446 glEnable GL_TEXTURE_2D;
345 glEnable GL_BLEND; 447 glEnable GL_BLEND;
346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
347 449
348 my $map = $::CONN->{map}; 450 for my $x (0 .. $sw - 1) {
349
350 for my $x (0 .. $::CONN->{mapw} - 1) {
351 for my $y (0 .. $::CONN->{maph} - 1) { 451 for my $y (0 .. $sh - 1) {
352 452
353 my $cell = $map->[$x][$y] 453 my $cell = $map->[$x + $xofs][$y + $yofs]
354 or next; 454 or next;
355 455
356 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 {
357 glColor $darkness, $darkness, $darkness; 460 glColor $darkness, $darkness, $darkness;
461 }
358 462
359 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 463 for my $num (grep $_, @$cell[1,2,3]) {
360 my $tex = $::CONN->{face}[$num]{texture} || next; 464 my $tex = $::CONN->{face}[$num]{texture} || next;
361 465
362 glBindTexture GL_TEXTURE_2D, $tex->{name}; 466 glBindTexture GL_TEXTURE_2D, $tex->{name};
363 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
364 glBegin GL_QUADS; 474 glBegin GL_QUADS;
365 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 475 glTexCoord 0, 0; glVertex $px , $py;
366 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 476 glTexCoord 0, 1; glVertex $px , $py + $h;
367 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 477 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
368 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 478 glTexCoord 1, 0; glVertex $px + $w, $py;
369 glEnd; 479 glEnd;
370 } 480 }
371 } 481 }
372 } 482 }
373 483
… …
375 glDisable GL_BLEND; 485 glDisable GL_BLEND;
376} 486}
377 487
378my %DIR = ( 488my %DIR = (
379 SDLK_KP8, [1, "north"], 489 SDLK_KP8, [1, "north"],
380 SDLK_KP9, [2, "northest"], 490 SDLK_KP9, [2, "northeast"],
381 SDLK_KP6, [3, "east"], 491 SDLK_KP6, [3, "east"],
382 SDLK_KP3, [4, "southeast"], 492 SDLK_KP3, [4, "southeast"],
383 SDLK_KP2, [5, "south"], 493 SDLK_KP2, [5, "south"],
384 SDLK_KP1, [6, "southwest"], 494 SDLK_KP1, [6, "southwest"],
385 SDLK_KP4, [7, "west"], 495 SDLK_KP4, [7, "west"],
386 SDLK_KP7, [8, "northwest"], 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"],
387); 502);
388 503
389sub key_down { 504sub key_down {
390 my ($self, $ev) = @_; 505 my ($self, $ev) = @_;
391 506
… …
394 509
395 if ($sym == SDLK_KP5) { 510 if ($sym == SDLK_KP5) {
396 $::CONN->send ("command stay fire"); 511 $::CONN->send ("command stay fire");
397 } elsif (exists $DIR{$sym}) { 512 } elsif (exists $DIR{$sym}) {
398 if ($mod & KMOD_SHIFT) { 513 if ($mod & KMOD_SHIFT) {
514 $self->{shft}++;
399 $::CONN->send ("command fire $DIR{$sym}[0]"); 515 $::CONN->send ("command fire $DIR{$sym}[0]");
400 } elsif ($mod & KMOD_CTRL) { 516 } elsif ($mod & KMOD_CTRL) {
517 $self->{ctrl}++;
401 $::CONN->send ("command run $DIR{$sym}[0]"); 518 $::CONN->send ("command run $DIR{$sym}[0]");
402 } else { 519 } else {
520 $::CONN->send ("command $DIR{$sym}[1]");
403 } 521 }
404 } 522 }
405} 523}
406 524
407sub key_up { 525sub key_up {
408 my ($self, $ev) = @_; 526 my ($self, $ev) = @_;
409 527
410 my $mod = $ev->key_mod; 528 my $mod = $ev->key_mod;
411 my $sym = $ev->key_sym; 529 my $sym = $ev->key_sym;
412 530
413 if (exists $DIR{$sym}) { 531 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
414 if ($mod & KMOD_SHIFT) {
415 $::CONN->send ("command fire_stop"); 532 $::CONN->send ("command fire_stop");
416 } else { 533 }
534 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
417 $::CONN->send ("command run_stop"); 535 $::CONN->send ("command run_stop");
418 }
419 } 536 }
420} 537}
421 538
4221; 5391;
423 540

Diff Legend

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