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