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.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.61 by root, Tue Apr 11 13:17:24 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless { @_ }, $class
… …
44 99
45 $self->{w} = $w; 100 $self->{w} = $w;
46 $self->{h} = $h; 101 $self->{h} = $h;
47} 102}
48 103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109}
110
49sub focus_in { 111sub focus_in {
50 my ($widget) = @_; 112 my ($self) = @_;
51 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
52} 117}
53 118
54sub focus_out { 119sub focus_out {
55 my ($widget) = @_; 120 my ($self) = @_;
56}
57 121
58sub key_down { 122 return unless $FOCUS == $self;
59 my ($widget, $sdlev) = @_;
60}
61 123
62sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
63 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
64} 126}
65 127
128sub mouse_motion { }
129sub button_up { }
66sub button_down { 130sub button_down { }
67 my ($widget, $sdlev) = @_; 131sub key_down { }
68} 132sub key_up { }
69 133
70sub button_up {
71 my ($widget, $sdlev) = @_;
72}
73
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 139
80sub draw { 140sub draw {
81 my ($self) = @_; 141 my ($self) = @_;
82 142
83 glPushMatrix; 143 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
86 glPopMatrix; 157 glPopMatrix;
87} 158}
88 159
89sub _draw { 160sub _draw {
90 my ($self) = @_; 161 my ($self) = @_;
… …
139 #$self->deactivate; 210 #$self->deactivate;
140} 211}
141 212
142############################################################################# 213#############################################################################
143 214
144package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
145 216
146our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
147 218
148sub new { 219sub new {
149 my ($class, @widgets) = @_; 220 my ($class, @widgets) = @_;
150 221
151 my $self = $class->SUPER::new (children => []); 222 my $self = $class->SUPER::new (children => []);
… …
177} 248}
178 249
179sub find_widget { 250sub find_widget {
180 my ($self, $x, $y) = @_; 251 my ($self, $x, $y) = @_;
181 252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
182 my $res; 256 my $res;
183 257
184 for (@{ $self->{children} }) { 258 for (reverse @{ $self->{children} }) {
185 $res = $_->find_widget ($x, $y) 259 $res = $_->find_widget ($x, $y)
186 and return $res; 260 and return $res;
187 } 261 }
188 262
189 () 263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
190} 264}
191 265
192sub _draw { 266sub _draw {
193 my ($self) = @_; 267 my ($self) = @_;
194 268
195 $_->draw for @{$self->{children}}; 269 $_->draw for @{$self->{children}};
196} 270}
197 271
198############################################################################# 272#############################################################################
199 273
200package Crossfire::Client::Widget::Bin; 274package CFClient::Widget::Bin;
201 275
202our @ISA = Crossfire::Client::Widget::Container::; 276our @ISA = CFClient::Widget::Container::;
203 277
204sub child { $_[0]->{children}[0] } 278sub child { $_[0]->{children}[0] }
205 279
206sub size_request { 280sub size_request {
207 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
215 if $self->{children}[0] 289 if $self->{children}[0]
216} 290}
217 291
218############################################################################# 292#############################################################################
219 293
220package Crossfire::Client::Widget::Toplevel;
221
222our @ISA = Crossfire::Client::Widget::Container::;
223
224sub update {
225 my ($self) = @_;
226
227 ::refresh ();
228}
229
230sub add {
231 my ($self, $widget) = @_;
232
233 $self->SUPER::add ($widget);
234
235 $widget->size_allocate ($widget->size_request);
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window; 294package CFClient::Widget::Window;
241 295
242our @ISA = Crossfire::Client::Widget::Bin::; 296our @ISA = CFClient::Widget::Bin::;
243 297
244use SDL::OpenGL; 298use SDL::OpenGL;
245 299
246sub new { 300sub new {
247 my ($class, $x, $y, $z, $w, $h) = @_; 301 my ($class, $x, $y, $z, $w, $h) = @_;
… …
260 314
261sub render_chld { 315sub render_chld {
262 my ($self) = @_; 316 my ($self) = @_;
263 317
264 $self->{texture} = 318 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 319 CFClient::Texture->new_from_opengl (
266 $self->{w}, $self->{h}, sub { $self->child->draw } 320 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 321 );
268} 322}
269 323
270sub size_allocate { 324sub size_allocate {
… …
287 or return; 341 or return;
288 342
289 glEnable GL_BLEND; 343 glEnable GL_BLEND;
290 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
292 glBindTexture GL_TEXTURE_2D, $tex->{name};
293 346
294 glBegin GL_QUADS; 347 $tex->draw_quad (0, 0, $w, $h);
295 glTexCoord 0, 0; glVertex 0, 0;
296 glTexCoord 0, 1; glVertex 0, $h;
297 glTexCoord 1, 1; glVertex $w, $h;
298 glTexCoord 1, 0; glVertex $w, 0;
299 glEnd;
300 348
301 glDisable GL_BLEND; 349 glDisable GL_BLEND;
302 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
303} 351}
304 352
305############################################################################# 353#############################################################################
306 354
307package Crossfire::Client::Widget::Frame; 355package CFClient::Widget::Frame;
308 356
309our @ISA = Crossfire::Client::Widget::Bin::; 357our @ISA = CFClient::Widget::Bin::;
310 358
311use SDL::OpenGL; 359use SDL::OpenGL;
312 360
313sub size_request { 361sub size_request {
314 my ($self) = @_; 362 my ($self) = @_;
… …
337 385
338 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
339 387
340 glBegin GL_QUADS; 388 glBegin GL_QUADS;
341 glColor 0, 0, 0; 389 glColor 0, 0, 0;
342 glTexCoord 0, 0; glVertex 0 , 0; 390 glVertex 0 , 0;
343 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
344 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
345 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
346 glEnd; 394 glEnd;
347 395
348 $chld->draw; 396 $chld->draw;
349} 397}
350 398
351############################################################################# 399#############################################################################
352 400
353package Crossfire::Client::Widget::FancyFrame; 401package CFClient::Widget::FancyFrame;
354 402
355our @ISA = Crossfire::Client::Widget::Bin::; 403our @ISA = CFClient::Widget::Bin::;
356 404
357use SDL::OpenGL; 405use SDL::OpenGL;
358 406
359my @tex = 407my @tex =
360 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
361 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
362 410
363sub size_request { 411sub size_request {
364 my ($self) = @_; 412 my ($self) = @_;
365 413
… …
400 glEnable GL_TEXTURE_2D; 448 glEnable GL_TEXTURE_2D;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403 451
404 my $top = $tex[1]; 452 my $top = $tex[1];
405 glBindTexture GL_TEXTURE_2D, $top->{name}; 453 $top->draw_quad (0, 0, $w, $top->{height});
406
407 glBegin GL_QUADS;
408 glTexCoord 0, 0; glVertex 0 , 0;
409 glTexCoord 0, 1; glVertex 0 , $top->{height};
410 glTexCoord 1, 1; glVertex $w , $top->{height};
411 glTexCoord 1, 0; glVertex $w , 0;
412 glEnd;
413 454
414 my $left = $tex[3]; 455 my $left = $tex[3];
415 glBindTexture GL_TEXTURE_2D, $left->{name}; 456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , $top->{height};
419 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422 glEnd;
423 457
424 my $right = $tex[2]; 458 my $right = $tex[2];
425 glBindTexture GL_TEXTURE_2D, $right->{name}; 459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $w , $top->{height};
432 glEnd;
433 460
434 my $bottom = $tex[4]; 461 my $bottom = $tex[4];
435 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439 glTexCoord 0, 1; glVertex 0 , $h;
440 glTexCoord 1, 1; glVertex $w , $h;
441 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442 glEnd;
443 463
444 my $bg = $tex[0]; 464 my $bg = $tex[0];
445 glBindTexture GL_TEXTURE_2D, $bg->{name}; 465 glBindTexture GL_TEXTURE_2D, $bg->{name};
446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449 469
450 my $rep_x = $cw / $bg->{width}; 470 my $rep_x = $cw / $bg->{width};
451 my $rep_y = $ch / $bg->{height}; 471 my $rep_y = $ch / $bg->{height};
452 472
453 glBegin GL_QUADS; 473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
454 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458 glEnd;
459 474
460 glDisable GL_BLEND; 475 glDisable GL_BLEND;
461 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
462 477
463 $self->child->draw; 478 $self->child->draw;
464 479
465} 480}
466 481
467############################################################################# 482#############################################################################
468 483
469package Crossfire::Client::Widget::Table; 484package CFClient::Widget::Table;
470 485
471our @ISA = Crossfire::Client::Widget::Bin::; 486our @ISA = CFClient::Widget::Bin::;
472 487
473use SDL::OpenGL; 488use SDL::OpenGL;
474 489
475sub add { 490sub add {
476 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
… …
551 } 566 }
552} 567}
553 568
554############################################################################# 569#############################################################################
555 570
556package Crossfire::Client::Widget::VBox; 571package CFClient::Widget::VBox;
557 572
558our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = CFClient::Widget::Container::;
559 574
560use SDL::OpenGL; 575use SDL::OpenGL;
561 576
562sub size_request { 577sub size_request {
563 my ($self) = @_; 578 my ($self) = @_;
… …
611 } 626 }
612} 627}
613 628
614############################################################################# 629#############################################################################
615 630
616package Crossfire::Client::Widget::Label; 631package CFClient::Widget::Label;
617 632
618our @ISA = Crossfire::Client::Widget::; 633our @ISA = CFClient::Widget::;
619 634
620use SDL::OpenGL; 635use SDL::OpenGL;
621 636
622sub new { 637sub new {
623 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
624 639
640 $height ||= $::FONTSIZE;
641
625 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 643 my $self = $class->SUPER::new (
644 x => $x,
645 y => $y,
646 z => $z,
647 height => $height,
648 layout => new CFClient::Layout $height,
649 );
627 650
628 $self->set_text ($text); 651 $self->set_text ($text);
629 652
630 $self 653 $self
631} 654}
632 655
633sub set_text { 656sub set_text {
634 my ($self, $text) = @_; 657 my ($self, $text) = @_;
635 658
636 $self->{text} = $text; 659 $self->{text} = $text;
637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 660 $self->{layout}->set_markup ($text);
638 661
639 $self->update; 662 delete $self->{texture};
640} 663}
641 664
642sub get_text { 665sub get_text {
643 my ($self, $text) = @_; 666 my ($self, $text) = @_;
644 667
… …
646} 669}
647 670
648sub size_request { 671sub size_request {
649 my ($self) = @_; 672 my ($self) = @_;
650 673
651 ( 674 $self->{layout}->set_width;
675 $self->{layout}->size
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
677# (
652 $self->{texture}{width}, 678# $self->{texture}{width},
653 $self->{texture}{height}, 679# $self->{texture}{height},
654 ) 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
655} 693}
656 694
657sub _draw { 695sub _draw {
658 my ($self) = @_; 696 my ($self) = @_;
659 697
660 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
661 702
662 glEnable GL_BLEND; 703 glEnable GL_BLEND;
663 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666 glBindTexture GL_TEXTURE_2D, $tex->{name};
667 707
668 glColor 1, 0, 0, 1; # TODO color 708 glColor 1, 0, 0, 1; # TODO color
669 709
670 glBegin GL_QUADS; 710 $tex->draw_quad (0, 0);
671 glTexCoord 0, 0; glVertex 0 , 0;
672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
674 glTexCoord 1, 0; glVertex $tex->{width}, 0;
675 glEnd;
676 711
677 glDisable GL_BLEND; 712 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
679} 714}
680 715
681############################################################################# 716#############################################################################
682 717
683package Crossfire::Client::Widget::TextEntry; 718package CFClient::Widget::Entry;
684 719
685our @ISA = Crossfire::Client::Widget::Label::; 720our @ISA = CFClient::Widget::Label::;
686 721
687use SDL; 722use SDL;
688use SDL::OpenGL; 723use SDL::OpenGL;
689 724
690sub key_down { 725sub key_down {
691 my ($self, $ev) = @_; 726 my ($self, $ev) = @_;
692 727
693 my $mod = $ev->key_mod; 728 my $mod = $ev->key_mod;
694 my $sym = $ev->key_sym; 729 my $sym = $ev->key_sym;
695 730
696 $ev->set_unicode (1);
697 my $uni = $ev->key_unicode; 731 my $uni = $ev->key_unicode;
698 732
699 my $text = $self->get_text; 733 my $text = $self->get_text;
700 734
701 if ($sym == SDLK_BACKSPACE) { 735 if ($sym == SDLK_BACKSPACE) {
702 substr $text, -1, 1, ''; 736 substr $text, -1, 1, '';
703
704 } elsif ($uni) { 737 } elsif ($uni) {
705 $text .= chr $uni; 738 $text .= chr $uni;
706 } 739 }
740
707 $self->set_text ($text); 741 $self->set_text ($text);
708} 742}
709 743
710############################################################################# 744sub button_down {
745 my ($self, $ev) = @_;
711 746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
712package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
713 777
714use strict; 778use strict;
715 779
716use List::Util qw(min max); 780use List::Util qw(min max);
717 781
718use SDL; 782use SDL;
719use SDL::OpenGL; 783use SDL::OpenGL;
720use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
721 785
722our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
723 787
724sub key_down { 788sub key_down {
725 print "MAPKEYDOWN\n"; 789 print "MAPKEYDOWN\n";
726} 790}
727 791
728sub key_up { 792sub key_up {
729} 793}
730 794
731sub size_request { 795sub size_request {
732 796 (
733} 797 1 + int $::WIDTH / 32,
734 798 1 + int $::HEIGHT / 32,
735sub size_allocate { 799 )
736} 800}
737 801
738sub _draw { 802sub _draw {
739 my ($self) = @_; 803 my ($self) = @_;
740 804
… …
763 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
764 glEnable GL_BLEND; 828 glEnable GL_BLEND;
765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
766 830
767 my $sw4 = ($sw + 3) & ~3; 831 my $sw4 = ($sw + 3) & ~3;
768 my $lighting = "\x00" x ($sw4 * $sh); 832 my $darkness = "\x00" x ($sw4 * $sh);
769 833
770 for my $x (0 .. $sw - 1) { 834 for my $x (0 .. $sw - 1) {
835 my $row = $map->[$x + $xofs];
771 for my $y (0 .. $sh - 1) { 836 for my $y (0 .. $sh - 1) {
772 837
773 my $cell = $map->[$x + $xofs][$y + $yofs] 838 my $cell = $row->[$y + $yofs]
774 or next; 839 or next;
775 840
776 my $darkness = $cell->[0] * (1 / 255); 841 my $dark = $cell->[0];
777 if ($darkness < 0) { 842 if ($dark < 0) {
778 $darkness = 0.15; 843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
779 } 846 }
780 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
781 847
782 for my $num (grep $_, @$cell[1,2,3]) { 848 for my $num (grep $_, @$cell[1,2,3]) {
783 my $tex = $::CONN->{face}[$num]{texture} || next; 849 my $tex = $::CONN->{face}[$num]{texture} || next;
784 850
785 glBindTexture GL_TEXTURE_2D, $tex->{name};
786
787 my $w = $tex->{width}; 851 my $w = $tex->{width};
788 my $h = $tex->{height}; 852 my $h = $tex->{height};
789 853
790 my $px = ($x + 1) * 32 - $w; 854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
791 my $py = ($y + 1) * 32 - $h;
792
793 glBegin GL_QUADS;
794 glTexCoord 0, 0; glVertex $px , $py;
795 glTexCoord 0, 1; glVertex $px , $py + $h;
796 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
797 glTexCoord 1, 0; glVertex $px + $w, $py;
798 glEnd;
799 } 855 }
800 } 856 }
801 } 857 }
802 858
803# if (1) { # higher quality darkness 859# if (1) { # higher quality darkness
… …
808# 864#
809# $lighting = $pb->get_pixels; 865# $lighting = $pb->get_pixels;
810# $lighting =~ s/(.)../$1/gs; 866# $lighting =~ s/(.)../$1/gs;
811# } 867# }
812 868
813 $lighting = new Crossfire::Client::Texture 869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871
872 $darkness = new CFClient::Texture
814 width => $sw4, 873 width => $sw4,
815 height => $sh, 874 height => $sh,
816 data => $lighting, 875 data => $darkness,
817 internalformat => GL_ALPHA4, 876 internalformat => GL_ALPHA,
818 format => GL_ALPHA; 877 format => GL_ALPHA;
819 878
820 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 879 glColor 0.45, 0.45, 0.45, 1;
821 glColor 0, 0, 0, 0.75; 880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823 glBindTexture GL_TEXTURE_2D, $lighting->{name};
824 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825 glBegin GL_QUADS;
826 glTexCoord 0, 0; glVertex 0 , 0;
827 glTexCoord 0, 1; glVertex 0 , $sh * 32;
828 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830 glEnd;
831 881
832 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
833 glDisable GL_BLEND; 883 glDisable GL_BLEND;
834} 884}
835 885
… …
884 } 934 }
885} 935}
886 936
887############################################################################# 937#############################################################################
888 938
889package Crossfire::Client::Widget::Animator; 939package CFClient::Widget::Animator;
890 940
891use SDL::OpenGL; 941use SDL::OpenGL;
892 942
893our @ISA = Crossfire::Client::Widget::Bin::; 943our @ISA = CFClient::Widget::Bin::;
894 944
895sub moveto { 945sub moveto {
896 my ($self, $x, $y) = @_; 946 my ($self, $x, $y) = @_;
897 947
898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899 $self->{speed} = 0.2; 949 $self->{speed} = 0.001;
900 $self->{time} = 1; 950 $self->{time} = 1;
901 951
902 ::animation_start $self; 952 ::animation_start $self;
903} 953}
904 954
… …
919 969
920sub _draw { 970sub _draw {
921 my ($self) = @_; 971 my ($self) = @_;
922 972
923 glPushMatrix; 973 glPushMatrix;
924 glRotate $self->{time} * 10000, 0, 1, 0; 974 glRotate $self->{time} * 1000, 0, 1, 0;
925 $self->{children}[0]->draw; 975 $self->{children}[0]->draw;
926 glPopMatrix; 976 glPopMatrix;
927} 977}
928 978
9291; 979#############################################################################
930 980
981package CFClient::Widget::Toplevel;
982
983our @ISA = CFClient::Widget::Container::;
984
985sub size_request {
986 ($::WIDTH, $::HEIGHT)
987}
988
989sub size_allocate {
990 my ($self, $w, $h) = @_;
991
992 $self->SUPER::size_allocate ($w, $h);
993
994 $_->size_allocate ($_->size_request)
995 for @{$self->{children}};
996}
997
998sub translate {
999 my ($self, $x, $y) = @_;
1000
1001 ($x, $y)
1002}
1003
1004sub update {
1005 my ($self) = @_;
1006
1007 $self->size_allocate ($self->size_request);
1008 ::refresh ();
1009}
1010
1011sub add {
1012 my ($self, $widget) = @_;
1013
1014 $self->SUPER::add ($widget);
1015
1016 $widget->size_allocate ($widget->size_request);
1017}
1018
1019sub draw {
1020 my ($self) = @_;
1021
1022 $self->_draw;
1023}
1024
1025#############################################################################
1026
1027package CFClient::Widget;
1028
1029$TOPLEVEL = new CFClient::Widget::Toplevel;
1030
10311
1032

Diff Legend

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