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.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs.
Revision 1.29 by root, Sun Apr 9 00:09:50 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 width/height of texture
154
155 my $tex = $self->{texture}
156 or return;
157
158 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 1, 1;
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171
172 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D;
174}
97 175
98package Crossfire::Client::Widget::Frame; 176package Crossfire::Client::Widget::Frame;
99 177
100our @ISA = Crossfire::Client::Widget::Container::; 178our @ISA = Crossfire::Client::Widget::Container::;
101 179
… …
110 188
111sub _draw { 189sub _draw {
112 my ($self) = @_; 190 my ($self) = @_;
113 191
114 my $chld = $self->get; 192 my $chld = $self->get;
193
194 $chld->move (2, 2, 0); #TODO:move to size_request
115 195
116 my ($w, $h) = $chld->size_request; 196 my ($w, $h) = $chld->size_request;
117 197
118 glColor 1, 0, 0; 198 glColor 1, 0, 0;
119 glBegin GL_QUADS; 199 glBegin GL_QUADS;
… …
121 glTexCoord 0, 1; glVertex 0 , $h + 4; 201 glTexCoord 0, 1; glVertex 0 , $h + 4;
122 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 202 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 203 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 204 glEnd;
125 205
126 glPushMatrix;
127 glTranslate (2, 2, 0);
128 $chld->_draw; 206 $chld->draw;
129 glPopMatrix;
130} 207}
131 208
132package Crossfire::Client::Widget::Table; 209package Crossfire::Client::Widget::Table;
133 210
134our @ISA = Crossfire::Client::Widget::Container::; 211our @ISA = Crossfire::Client::Widget::Container::;
… …
195 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
196 my $x = 0; 273 my $x = 0;
197 274
198 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
199 276
200 glPushMatrix;
201 glTranslate ($x, $y, 0);
202 my $c = $self->{childs}->[$yi]->[$xi]; 277 my $c = $self->{childs}->[$yi]->[$xi];
278 if ($c) {
279 $c->move ($x, $y, 0); #TODO: Move to size_request
203 $c->_draw if $c; 280 $c->draw if $c;
204 glPopMatrix; 281 }
205 282
206 $x += $self->max_col_width ($xi); 283 $x += $self->max_col_width ($xi);
207 } 284 }
208 285
209 $y += $self->max_row_height ($yi); 286 $y += $self->max_row_height ($yi);
… …
237sub _draw { 314sub _draw {
238 my ($self) = @_; 315 my ($self) = @_;
239 316
240 my ($x, $y); 317 my ($x, $y);
241 for (@{$self->{childs} || []}) { 318 for (@{$self->{childs} || []}) {
242 glPushMatrix; 319 $_->move (0, $y, 0); #TODO: move to size_request
243 glTranslate (0, $y, 0);
244 $_->_draw; 320 $_->draw;
245 glPopMatrix;
246 my ($w, $h) = $_->size_request; 321 my ($w, $h) = $_->size_request;
247 $y += $h; 322 $y += $h;
248 } 323 }
249} 324}
250 325
… …
253our @ISA = Crossfire::Client::Widget::; 328our @ISA = Crossfire::Client::Widget::;
254 329
255use SDL::OpenGL; 330use SDL::OpenGL;
256 331
257sub new { 332sub new {
258 my ($class, $x, $y, $z, $ttf, $text) = @_; 333 my ($class, $x, $y, $z, $height, $text) = @_;
259 334
260 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 335 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
261 336
262 $self->set_text ($text); 337 $self->set_text ($text);
263 338
264 $self 339 $self
265} 340}
266 341
267sub set_text { 342sub set_text {
268 my ($self, $text) = @_; 343 my ($self, $text) = @_;
344
345 $self->{text} = $text;
346
269 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 347 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
270} 348}
271 349
272sub get_text { 350sub get_text {
273 my ($self, $text) = @_; 351 my ($self, $text) = @_;
352
274 $self->{text} 353 $self->{text}
275} 354}
276 355
277sub size_request { 356sub size_request {
278 my ($self) = @_; 357 my ($self) = @_;
… …
286sub _draw { 365sub _draw {
287 my ($self) = @_; 366 my ($self) = @_;
288 367
289 my $tex = $self->{texture}; 368 my $tex = $self->{texture};
290 369
291 $self->{x}--;
292
293 glEnable GL_BLEND; 370 glEnable GL_BLEND;
294 glEnable GL_TEXTURE_2D; 371 glEnable GL_TEXTURE_2D;
295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
296 glBindTexture GL_TEXTURE_2D, $tex->{name}; 373 glBindTexture GL_TEXTURE_2D, $tex->{name};
297 374
298 glColor 1, 1, 1; 375 glColor 1, 1, 1, 0.8;
299 376
300 glBegin GL_QUADS; 377 glBegin GL_QUADS;
301 glTexCoord 0, 0; glVertex 0 , 0; 378 glTexCoord 0, 0; glVertex 0 , 0;
302 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 379 glTexCoord 0, 1; glVertex 0 , $tex->{height};
303 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 380 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
329 406
330package Crossfire::Client::Widget::MapWidget; 407package Crossfire::Client::Widget::MapWidget;
331 408
332use strict; 409use strict;
333 410
334our @ISA = qw/Crossfire::Client::Widget/; 411use List::Util qw(min max);
335 412
336use SDL; 413use SDL;
337use SDL::OpenGL; 414use SDL::OpenGL;
338use SDL::OpenGL::Constants; 415use SDL::OpenGL::Constants;
416
417our @ISA = Crossfire::Client::Widget::;
339 418
340sub key_down { 419sub key_down {
341 print "MAPKEYDOWN\n"; 420 print "MAPKEYDOWN\n";
342} 421}
343 422
344sub key_up { 423sub key_up {
345} 424}
346 425
347sub _draw { 426sub _draw {
427 my ($self) = @_;
428
429 my $mx = $::CONN->{mapx};
430 my $my = $::CONN->{mapy};
431
432 my $map = $::CONN->{map};
433
434 my ($xofs, $yofs);
435
436 my $sw = 1 + int $::WIDTH / 32;
437 my $sh = 1 + int $::HEIGHT / 32;
438
439 if ($::CONN->{mapw} > $sw) {
440 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
441 } else {
442 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
443 }
444
445 if ($::CONN->{maph} > $sh) {
446 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
447 } else {
448 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
449 }
450
348 glEnable GL_TEXTURE_2D; 451 glEnable GL_TEXTURE_2D;
349 glEnable GL_BLEND; 452 glEnable GL_BLEND;
350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
351 454
352 my $map = $::CONN->{map}; 455 for my $x (0 .. $sw - 1) {
353
354 for my $x (0 .. $::CONN->{mapw} - 1) {
355 for my $y (0 .. $::CONN->{maph} - 1) { 456 for my $y (0 .. $sh - 1) {
356 457
357 my $cell = $map->[$x][$y] 458 my $cell = $map->[$x + $xofs][$y + $yofs]
358 or next; 459 or next;
359 460
360 my $darkness = $cell->[3] * (1 / 255); 461 my $darkness = $cell->[0] * (1 / 255);
462 if ($darkness < 0) {
463 glColor 0.3, 0.3, 0.3;
464 } else {
361 glColor $darkness, $darkness, $darkness; 465 glColor $darkness, $darkness, $darkness;
466 }
362 467
363 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 468 for my $num (grep $_, @$cell[1,2,3]) {
364 my $tex = $::CONN->{face}[$num]{texture} || next; 469 my $tex = $::CONN->{face}[$num]{texture} || next;
365 470
366 glBindTexture GL_TEXTURE_2D, $tex->{name}; 471 glBindTexture GL_TEXTURE_2D, $tex->{name};
367 472
473 my $w = $tex->{width};
474 my $h = $tex->{height};
475
476 my $px = ($x + 1) * 32 - $w;
477 my $py = ($y + 1) * 32 - $h;
478
368 glBegin GL_QUADS; 479 glBegin GL_QUADS;
369 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 480 glTexCoord 0, 0; glVertex $px , $py;
370 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 481 glTexCoord 0, 1; glVertex $px , $py + $h;
371 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 482 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
372 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 483 glTexCoord 1, 0; glVertex $px + $w, $py;
373 glEnd; 484 glEnd;
374 } 485 }
375 } 486 }
376 } 487 }
377 488
… …
379 glDisable GL_BLEND; 490 glDisable GL_BLEND;
380} 491}
381 492
382my %DIR = ( 493my %DIR = (
383 SDLK_KP8, [1, "north"], 494 SDLK_KP8, [1, "north"],
384 SDLK_KP9, [2, "northest"], 495 SDLK_KP9, [2, "northeast"],
385 SDLK_KP6, [3, "east"], 496 SDLK_KP6, [3, "east"],
386 SDLK_KP3, [4, "southeast"], 497 SDLK_KP3, [4, "southeast"],
387 SDLK_KP2, [5, "south"], 498 SDLK_KP2, [5, "south"],
388 SDLK_KP1, [6, "southwest"], 499 SDLK_KP1, [6, "southwest"],
389 SDLK_KP4, [7, "west"], 500 SDLK_KP4, [7, "west"],
390 SDLK_KP7, [8, "northwest"], 501 SDLK_KP7, [8, "northwest"],
502
503 SDLK_UP, [1, "north"],
504 SDLK_RIGHT, [3, "east"],
505 SDLK_DOWN, [5, "south"],
506 SDLK_LEFT, [7, "west"],
391); 507);
392 508
393sub key_down { 509sub key_down {
394 my ($self, $ev) = @_; 510 my ($self, $ev) = @_;
395 511
… …
398 514
399 if ($sym == SDLK_KP5) { 515 if ($sym == SDLK_KP5) {
400 $::CONN->send ("command stay fire"); 516 $::CONN->send ("command stay fire");
401 } elsif (exists $DIR{$sym}) { 517 } elsif (exists $DIR{$sym}) {
402 if ($mod & KMOD_SHIFT) { 518 if ($mod & KMOD_SHIFT) {
519 $self->{shft}++;
403 $::CONN->send ("command fire $DIR{$sym}[0]"); 520 $::CONN->send ("command fire $DIR{$sym}[0]");
404 } elsif ($mod & KMOD_CTRL) { 521 } elsif ($mod & KMOD_CTRL) {
522 $self->{ctrl}++;
405 $::CONN->send ("command run $DIR{$sym}[0]"); 523 $::CONN->send ("command run $DIR{$sym}[0]");
406 } else { 524 } else {
525 $::CONN->send ("command $DIR{$sym}[1]");
407 } 526 }
408 } 527 }
409} 528}
410 529
411sub key_up { 530sub key_up {
412 my ($self, $ev) = @_; 531 my ($self, $ev) = @_;
413 532
414 my $mod = $ev->key_mod; 533 my $mod = $ev->key_mod;
415 my $sym = $ev->key_sym; 534 my $sym = $ev->key_sym;
416 535
417 if (exists $DIR{$sym}) { 536 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
418 if ($mod & KMOD_SHIFT) {
419 $::CONN->send ("command fire_stop"); 537 $::CONN->send ("command fire_stop");
420 } else { 538 }
539 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->send ("command run_stop"); 540 $::CONN->send ("command run_stop");
422 }
423 } 541 }
424} 542}
425 543
4261; 5441;
427 545

Diff Legend

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