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.46 by root, Sun Apr 9 22:21:02 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 14:04:27 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 {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
52} 122}
53 123
54sub focus_out { 124sub focus_out {
55 my ($widget) = @_; 125 my ($self) = @_;
56}
57 126
58sub key_down { 127 return unless $FOCUS == $self;
59 my ($widget, $sdlev) = @_;
60}
61 128
62sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
63 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
64} 131}
65 132
133sub mouse_motion { }
134sub button_up { }
66sub button_down { 135sub button_down { }
67 my ($widget, $sdlev) = @_; 136sub key_down { }
68} 137sub key_up { }
69 138
70sub button_up {
71 my ($widget, $sdlev) = @_;
72}
73
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 144
80sub draw { 145sub draw {
81 my ($self) = @_; 146 my ($self) = @_;
82 147
83 glPushMatrix; 148 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
86 glPopMatrix; 162 glPopMatrix;
87} 163}
88 164
89sub _draw { 165sub _draw {
90 my ($self) = @_; 166 my ($self) = @_;
… …
139 #$self->deactivate; 215 #$self->deactivate;
140} 216}
141 217
142############################################################################# 218#############################################################################
143 219
144package Crossfire::Client::Widget::Container; 220package CFClient::Widget::Container;
145 221
146our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
147 223
148sub new { 224sub new {
149 my ($class, @widgets) = @_; 225 my ($class, %arg) = @_;
150 226
227 my $children = delete $arg{children} || [];
228
151 my $self = $class->SUPER::new (children => []); 229 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 230 $self->add ($_) for @$children;
153 231
154 $self 232 $self
155} 233}
156 234
157sub add { 235sub add {
… …
198 $_->draw for @{$self->{children}}; 276 $_->draw for @{$self->{children}};
199} 277}
200 278
201############################################################################# 279#############################################################################
202 280
203package Crossfire::Client::Widget::Bin; 281package CFClient::Widget::Bin;
204 282
205our @ISA = Crossfire::Client::Widget::Container::; 283our @ISA = CFClient::Widget::Container::;
206 284
207sub child { $_[0]->{children}[0] } 285sub child { $_[0]->{children}[0] }
208 286
209sub size_request { 287sub size_request {
210 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 288 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
218 if $self->{children}[0] 296 if $self->{children}[0]
219} 297}
220 298
221############################################################################# 299#############################################################################
222 300
223package Crossfire::Client::Widget::Toplevel; 301package CFClient::Widget::Window;
224 302
225our @ISA = Crossfire::Client::Widget::Container::; 303our @ISA = CFClient::Widget::Bin::;
304
305use SDL::OpenGL;
306
307sub new {
308 my ($class, %arg) = @_;
309
310 my $self = $class->SUPER::new (%arg);
311}
226 312
227sub update { 313sub update {
228 my ($self) = @_; 314 my ($self) = @_;
229 315
230 ::refresh (); 316 # we want to do this delayed...
231}
232
233sub add {
234 my ($self, $widget) = @_;
235
236 $self->SUPER::add ($widget);
237
238 $widget->size_allocate ($widget->size_request);
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
247use SDL::OpenGL;
248
249sub new {
250 my ($class, $x, $y, $z, $w, $h) = @_;
251
252 my $self = $class->SUPER::new;
253
254 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
255}
256
257sub update {
258 my ($self) = @_;
259
260 $self->render_chld; 317 $self->render_chld;
261 $self->SUPER::update; 318 $self->SUPER::update;
262} 319}
263 320
264sub render_chld { 321sub render_chld {
265 my ($self) = @_; 322 my ($self) = @_;
266 323
267 $self->{texture} = 324 $self->{texture} =
268 Crossfire::Client::Texture->new_from_opengl ( 325 CFClient::Texture->new_from_opengl (
269 $self->{w}, $self->{h}, sub { $self->child->draw } 326 $self->{w}, $self->{h}, sub { $self->child->draw }
270 ); 327 );
271} 328}
272 329
273sub size_allocate { 330sub size_allocate {
… …
290 or return; 347 or return;
291 348
292 glEnable GL_BLEND; 349 glEnable GL_BLEND;
293 glEnable GL_TEXTURE_2D; 350 glEnable GL_TEXTURE_2D;
294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
295 glBindTexture GL_TEXTURE_2D, $tex->{name};
296 352
297 glBegin GL_QUADS; 353 $tex->draw_quad (0, 0, $w, $h);
298 glTexCoord 0, 0; glVertex 0, 0;
299 glTexCoord 0, 1; glVertex 0, $h;
300 glTexCoord 1, 1; glVertex $w, $h;
301 glTexCoord 1, 0; glVertex $w, 0;
302 glEnd;
303 354
304 glDisable GL_BLEND; 355 glDisable GL_BLEND;
305 glDisable GL_TEXTURE_2D; 356 glDisable GL_TEXTURE_2D;
306} 357}
307 358
308############################################################################# 359#############################################################################
309 360
310package Crossfire::Client::Widget::Frame; 361package CFClient::Widget::Frame;
311 362
312our @ISA = Crossfire::Client::Widget::Bin::; 363our @ISA = CFClient::Widget::Bin::;
313 364
314use SDL::OpenGL; 365use SDL::OpenGL;
315 366
316sub size_request { 367sub size_request {
317 my ($self) = @_; 368 my ($self) = @_;
… …
340 391
341 my ($w, $h) = $chld->size_request; 392 my ($w, $h) = $chld->size_request;
342 393
343 glBegin GL_QUADS; 394 glBegin GL_QUADS;
344 glColor 0, 0, 0; 395 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 396 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 397 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 398 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 399 glVertex $w + 4 , 0;
349 glEnd; 400 glEnd;
350 401
351 $chld->draw; 402 $chld->draw;
352} 403}
353 404
354############################################################################# 405#############################################################################
355 406
356package Crossfire::Client::Widget::FancyFrame; 407package CFClient::Widget::FancyFrame;
357 408
358our @ISA = Crossfire::Client::Widget::Bin::; 409our @ISA = CFClient::Widget::Bin::;
359 410
360use SDL::OpenGL; 411use SDL::OpenGL;
361 412
362my @tex = 413my @tex =
363 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 414 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
364 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 415 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
365 416
366sub size_request { 417sub size_request {
367 my ($self) = @_; 418 my ($self) = @_;
368 419
… …
403 glEnable GL_TEXTURE_2D; 454 glEnable GL_TEXTURE_2D;
404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406 457
407 my $top = $tex[1]; 458 my $top = $tex[1];
408 glBindTexture GL_TEXTURE_2D, $top->{name}; 459 $top->draw_quad (0, 0, $w, $top->{height});
409
410 glBegin GL_QUADS;
411 glTexCoord 0, 0; glVertex 0 , 0;
412 glTexCoord 0, 1; glVertex 0 , $top->{height};
413 glTexCoord 1, 1; glVertex $w , $top->{height};
414 glTexCoord 1, 0; glVertex $w , 0;
415 glEnd;
416 460
417 my $left = $tex[3]; 461 my $left = $tex[3];
418 glBindTexture GL_TEXTURE_2D, $left->{name}; 462 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
419
420 glBegin GL_QUADS;
421 glTexCoord 0, 0; glVertex 0 , $top->{height};
422 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425 glEnd;
426 463
427 my $right = $tex[2]; 464 my $right = $tex[2];
428 glBindTexture GL_TEXTURE_2D, $right->{name}; 465 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
429
430 glBegin GL_QUADS;
431 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434 glTexCoord 1, 0; glVertex $w , $top->{height};
435 glEnd;
436 466
437 my $bottom = $tex[4]; 467 my $bottom = $tex[4];
438 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 468 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
439
440 glBegin GL_QUADS;
441 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442 glTexCoord 0, 1; glVertex 0 , $h;
443 glTexCoord 1, 1; glVertex $w , $h;
444 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445 glEnd;
446 469
447 my $bg = $tex[0]; 470 my $bg = $tex[0];
448 glBindTexture GL_TEXTURE_2D, $bg->{name}; 471 glBindTexture GL_TEXTURE_2D, $bg->{name};
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 473 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 474 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452 475
453 my $rep_x = $cw / $bg->{width}; 476 my $rep_x = $cw / $bg->{width};
454 my $rep_y = $ch / $bg->{height}; 477 my $rep_y = $ch / $bg->{height};
455 478
456 glBegin GL_QUADS; 479 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
457 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461 glEnd;
462 480
463 glDisable GL_BLEND; 481 glDisable GL_BLEND;
464 glDisable GL_TEXTURE_2D; 482 glDisable GL_TEXTURE_2D;
465 483
466 $self->child->draw; 484 $self->child->draw;
467 485
468} 486}
469 487
470############################################################################# 488#############################################################################
471 489
472package Crossfire::Client::Widget::Table; 490package CFClient::Widget::Table;
473 491
474our @ISA = Crossfire::Client::Widget::Bin::; 492our @ISA = CFClient::Widget::Bin::;
475 493
476use SDL::OpenGL; 494use SDL::OpenGL;
477 495
478sub add { 496sub add {
479 my ($self, $x, $y, $chld) = @_; 497 my ($self, $x, $y, $chld) = @_;
… …
554 } 572 }
555} 573}
556 574
557############################################################################# 575#############################################################################
558 576
559package Crossfire::Client::Widget::VBox; 577package CFClient::Widget::VBox;
560 578
561our @ISA = Crossfire::Client::Widget::Container::; 579our @ISA = CFClient::Widget::Container::;
562 580
563use SDL::OpenGL; 581use SDL::OpenGL;
564 582
565sub size_request { 583sub size_request {
566 my ($self) = @_; 584 my ($self) = @_;
… …
614 } 632 }
615} 633}
616 634
617############################################################################# 635#############################################################################
618 636
619package Crossfire::Client::Widget::Label; 637package CFClient::Widget::Label;
620 638
621our @ISA = Crossfire::Client::Widget::; 639our @ISA = CFClient::Widget::;
622 640
623use SDL::OpenGL; 641use SDL::OpenGL;
624 642
625sub new { 643sub new {
626 my ($class, $x, $y, $z, $height, $text) = @_; 644 my ($class, %arg) = @_;
627 645
628 # TODO: color, and make height, xyz etc. optional 646 # TODO: color, and make height, xyz etc. optional
629 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 647 my $self = $class->SUPER::new (
648 color => [1, 1, 1],
649 height => $::FONTSIZE,
650 text => "",
651 layout => new CFClient::Layout,
652 %arg
653 );
630 654
631 $self->set_text ($text); 655 $self->set_text ($self->{text});
632 656
633 $self 657 $self
634} 658}
635 659
636sub set_text { 660sub set_text {
637 my ($self, $text) = @_; 661 my ($self, $text) = @_;
638 662
639 $self->{text} = $text; 663 $self->{text} = $text;
640 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 664 $self->{layout}->set_markup ($text);
641 665
642 $self->update; 666 delete $self->{texture};
643} 667}
644 668
645sub get_text { 669sub get_text {
646 my ($self, $text) = @_; 670 my ($self, $text) = @_;
647 671
… …
649} 673}
650 674
651sub size_request { 675sub size_request {
652 my ($self) = @_; 676 my ($self) = @_;
653 677
654 ( 678 $self->{layout}->set_width;
679 $self->{layout}->set_height ($self->{height});
680 $self->{layout}->size
681# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
682# (
655 $self->{texture}{width}, 683# $self->{texture}{width},
656 $self->{texture}{height}, 684# $self->{texture}{height},
657 ) 685# )
686# } else {
687# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
688#
689# ($w, $h)
690# }
691}
692
693sub size_allocate {
694 my ($self, $w, $h) = @_;
695
696 $self->SUPER::size_allocate ($w, $h);
697 delete $self->{texture};
658} 698}
659 699
660sub _draw { 700sub _draw {
661 my ($self) = @_; 701 my ($self) = @_;
662 702
663 my $tex = $self->{texture}; 703 my $tex = $self->{texture} ||= do {
704 $self->{layout}->set_width ($self->{w});
705 new_from_layout CFClient::Texture $self->{layout};
706 };
664 707
665 glEnable GL_BLEND; 708 glEnable GL_BLEND;
666 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
667 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
669 glBindTexture GL_TEXTURE_2D, $tex->{name};
670 712
671 glColor 1, 0, 0, 1; # TODO color 713 glColor @{$self->{color}};
672 714
673 glBegin GL_QUADS; 715 $tex->draw_quad (0, 0);
674 glTexCoord 0, 0; glVertex 0 , 0;
675 glTexCoord 0, 1; glVertex 0 , $tex->{height};
676 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
677 glTexCoord 1, 0; glVertex $tex->{width}, 0;
678 glEnd;
679 716
680 glDisable GL_BLEND; 717 glDisable GL_BLEND;
681 glDisable GL_TEXTURE_2D; 718 glDisable GL_TEXTURE_2D;
682} 719}
683 720
684############################################################################# 721#############################################################################
685 722
686package Crossfire::Client::Widget::TextEntry; 723package CFClient::Widget::Entry;
687 724
688our @ISA = Crossfire::Client::Widget::Label::; 725our @ISA = CFClient::Widget::Label::;
689 726
690use SDL; 727use SDL;
691use SDL::OpenGL; 728use SDL::OpenGL;
692 729
693sub key_down { 730sub key_down {
694 my ($self, $ev) = @_; 731 my ($self, $ev) = @_;
695 732
696 my $mod = $ev->key_mod; 733 my $mod = $ev->key_mod;
697 my $sym = $ev->key_sym; 734 my $sym = $ev->key_sym;
698 735
699 $ev->set_unicode (1);
700 my $uni = $ev->key_unicode; 736 my $uni = $ev->key_unicode;
701 737
702 my $text = $self->get_text; 738 my $text = $self->get_text;
703 739
704 if ($sym == SDLK_BACKSPACE) { 740 if ($sym == SDLK_BACKSPACE) {
705 substr $text, -1, 1, ''; 741 substr $text, -1, 1, '';
706
707 } elsif ($uni) { 742 } elsif ($uni) {
708 $text .= chr $uni; 743 $text .= chr $uni;
709 } 744 }
745
710 $self->set_text ($text); 746 $self->set_text ($text);
711} 747}
712 748
713############################################################################# 749sub button_down {
750 my ($self, $ev) = @_;
714 751
752 $self->focus_in;
753}
754
755sub mouse_motion {
756 my ($self, $ev, $x, $y) = @_;
757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
758}
759
760sub _draw {
761 my ($self) = @_;
762
763 if ($FOCUS == $self) {
764 glColor 1, 1, 1;
765 } else {
766 glColor 0.7, 0.7, 0.7;
767 }
768
769 glBegin GL_QUADS;
770 glVertex 0 , 0;
771 glVertex 0 , $self->{h} - 1;
772 glVertex $self->{w} - 1, $self->{h} - 1;
773 glVertex $self->{w} - 1, 0;
774 glEnd;
775
776 $self->SUPER::_draw;
777}
778
779#############################################################################
780
715package Crossfire::Client::Widget::MapWidget; 781package CFClient::Widget::MapWidget;
716 782
717use strict; 783use strict;
718 784
719use List::Util qw(min max); 785use List::Util qw(min max);
720 786
721use SDL; 787use SDL;
722use SDL::OpenGL; 788use SDL::OpenGL;
723use SDL::OpenGL::Constants; 789use SDL::OpenGL::Constants;
724 790
725our @ISA = Crossfire::Client::Widget::; 791our @ISA = CFClient::Widget::;
792
793sub new {
794 my $class = shift;
795
796 $class->SUPER::new (
797 z => -1,
798 list => (glGenLists 1),
799 @_
800 )
801}
726 802
727sub key_down { 803sub key_down {
728 print "MAPKEYDOWN\n"; 804 print "MAPKEYDOWN\n";
729} 805}
730 806
731sub key_up { 807sub key_up {
732} 808}
733 809
734sub size_request { 810sub size_request {
735 811 (
812 1 + int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32,
814 )
736} 815}
737 816
738sub size_allocate { 817sub update {
818 my ($self) = @_;
819
820 $self->{need_update} = 1;
739} 821}
740 822
741sub _draw { 823sub _draw {
742 my ($self) = @_; 824 my ($self) = @_;
743 825
826 if (delete $self->{need_update}) {
827 glNewList $self->{list}, GL_COMPILE;
828
744 my $mx = $::CONN->{mapx}; 829 my $mx = $::CONN->{mapx};
745 my $my = $::CONN->{mapy}; 830 my $my = $::CONN->{mapy};
746 831
747 my $map = $::CONN->{map}; 832 my $map = $::CONN->{map};
748 833
749 my ($xofs, $yofs); 834 my ($xofs, $yofs);
750 835
751 my $sw = 1 + int $::WIDTH / 32; 836 my $sw = 1 + int $::WIDTH / 32;
752 my $sh = 1 + int $::HEIGHT / 32; 837 my $sh = 1 + int $::HEIGHT / 32;
753 838
754 if ($::CONN->{mapw} > $sw) { 839 if ($::CONN->{mapw} > $sw) {
755 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 840 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
756 } else { 841 } else {
757 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 842 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
758 } 843 }
759 844
760 if ($::CONN->{maph} > $sh) { 845 if ($::CONN->{maph} > $sh) {
761 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 846 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
762 } else { 847 } else {
763 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 848 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
764 } 849 }
765 850
766 glEnable GL_TEXTURE_2D; 851 glEnable GL_TEXTURE_2D;
767 glEnable GL_BLEND; 852 glEnable GL_BLEND;
768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
769 854
770 my $sw4 = ($sw + 3) & ~3; 855 my $sw4 = ($sw + 3) & ~3;
771 my $lighting = "\x00" x ($sw4 * $sh); 856 my $darkness = "\x00" x ($sw4 * $sh);
772 857
773 for my $x (0 .. $sw - 1) { 858 for my $x (0 .. $sw - 1) {
859 my $row = $map->[$x + $xofs];
774 for my $y (0 .. $sh - 1) { 860 for my $y (0 .. $sh - 1) {
775 861
776 my $cell = $map->[$x + $xofs][$y + $yofs] 862 my $cell = $row->[$y + $yofs]
777 or next; 863 or next;
778 864
779 my $darkness = $cell->[0] * (1 / 255); 865 my $dark = $cell->[0];
780 if ($darkness < 0) { 866 if ($dark < 0) {
781 $darkness = 0.15; 867 substr $darkness, $y * $sw4 + $x, 1, chr 224;
868 } else {
869 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
782 } 870 }
783 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
784 871
785 for my $num (grep $_, @$cell[1,2,3]) { 872 for my $num (grep $_, @$cell[1,2,3]) {
786 my $tex = $::CONN->{face}[$num]{texture} || next; 873 my $tex = $::CONN->{face}[$num]{texture} || next;
787 874
788 glBindTexture GL_TEXTURE_2D, $tex->{name};
789
790 my $w = $tex->{width}; 875 my $w = $tex->{width};
791 my $h = $tex->{height}; 876 my $h = $tex->{height};
792 877
793 my $px = ($x + 1) * 32 - $w; 878 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
794 my $py = ($y + 1) * 32 - $h;
795
796 glBegin GL_QUADS;
797 glTexCoord 0, 0; glVertex $px , $py;
798 glTexCoord 0, 1; glVertex $px , $py + $h;
799 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
800 glTexCoord 1, 0; glVertex $px + $w, $py;
801 glEnd; 879 }
802 } 880 }
803 } 881 }
804 }
805 882
806# if (1) { # higher quality darkness 883# if (1) { # higher quality darkness
807# $lighting =~ s/(.)/$1$1$1/gs; 884# $lighting =~ s/(.)/$1$1$1/gs;
808# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 885# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
809# 886#
… …
811# 888#
812# $lighting = $pb->get_pixels; 889# $lighting = $pb->get_pixels;
813# $lighting =~ s/(.)../$1/gs; 890# $lighting =~ s/(.)../$1/gs;
814# } 891# }
815 892
816 $lighting = new Crossfire::Client::Texture
817 width => $sw4,
818 height => $sh,
819 data => $lighting,
820 internalformat => GL_ALPHA4,
821 format => GL_ALPHA;
822
823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 893 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
824 glColor 0, 0, 0, 0.75;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 glBindTexture GL_TEXTURE_2D, $lighting->{name};
827 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828 glBegin GL_QUADS;
829 glTexCoord 0, 0; glVertex 0 , 0;
830 glTexCoord 0, 1; glVertex 0 , $sh * 32;
831 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833 glEnd;
834 895
896 $darkness = new CFClient::Texture
897 width => $sw4,
898 height => $sh,
899 data => $darkness,
900 internalformat => GL_ALPHA,
901 format => GL_ALPHA;
902
903 glColor 0.45, 0.45, 0.45, 1;
904 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
905
835 glDisable GL_TEXTURE_2D; 906 glDisable GL_TEXTURE_2D;
836 glDisable GL_BLEND; 907 glDisable GL_BLEND;
908
909 glEndList;
910 }
911
912 glCallList $self->{list};
837} 913}
838 914
839my %DIR = ( 915my %DIR = (
840 SDLK_KP8, [1, "north"], 916 SDLK_KP8, [1, "north"],
841 SDLK_KP9, [2, "northeast"], 917 SDLK_KP9, [2, "northeast"],
… …
887 } 963 }
888} 964}
889 965
890############################################################################# 966#############################################################################
891 967
892package Crossfire::Client::Widget::Animator; 968package CFClient::Widget::Animator;
893 969
894use SDL::OpenGL; 970use SDL::OpenGL;
895 971
896our @ISA = Crossfire::Client::Widget::Bin::; 972our @ISA = CFClient::Widget::Bin::;
897 973
898sub moveto { 974sub moveto {
899 my ($self, $x, $y) = @_; 975 my ($self, $x, $y) = @_;
900 976
901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902 $self->{speed} = 0.2; 978 $self->{speed} = 0.001;
903 $self->{time} = 1; 979 $self->{time} = 1;
904 980
905 ::animation_start $self; 981 ::animation_start $self;
906} 982}
907 983
… …
922 998
923sub _draw { 999sub _draw {
924 my ($self) = @_; 1000 my ($self) = @_;
925 1001
926 glPushMatrix; 1002 glPushMatrix;
927 glRotate $self->{time} * 10000, 0, 1, 0; 1003 glRotate $self->{time} * 1000, 0, 1, 0;
928 $self->{children}[0]->draw; 1004 $self->{children}[0]->draw;
929 glPopMatrix; 1005 glPopMatrix;
930} 1006}
931 1007
9321; 1008#############################################################################
933 1009
1010package CFClient::Widget::Toplevel;
1011
1012our @ISA = CFClient::Widget::Container::;
1013
1014sub size_request {
1015 ($::WIDTH, $::HEIGHT)
1016}
1017
1018sub size_allocate {
1019 my ($self, $w, $h) = @_;
1020
1021 $self->SUPER::size_allocate ($w, $h);
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025}
1026
1027sub translate {
1028 my ($self, $x, $y) = @_;
1029
1030 ($x, $y)
1031}
1032
1033sub update {
1034 my ($self) = @_;
1035
1036 $self->size_allocate ($self->size_request);
1037 ::refresh ();
1038}
1039
1040sub add {
1041 my ($self, $widget) = @_;
1042
1043 $self->SUPER::add ($widget);
1044
1045 $widget->size_allocate ($widget->size_request);
1046}
1047
1048sub draw {
1049 my ($self) = @_;
1050
1051 $self->_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::Widget;
1057
1058$TOPLEVEL = new CFClient::Widget::Toplevel;
1059
10601
1061

Diff Legend

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