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.58 by root, Tue Apr 11 12:21:29 2006 UTC vs.
Revision 1.68 by root, Tue Apr 11 17:02:36 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, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $TOPLEVEL; 14our $TOPLEVEL;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
… …
73} 73}
74 74
75sub new { 75sub new {
76 my $class = shift; 76 my $class = shift;
77 77
78 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
79} 84}
80 85
81sub move { 86sub move {
82 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 88 $self->{x} = $x;
… …
109} 114}
110 115
111sub focus_in { 116sub focus_in {
112 my ($self) = @_; 117 my ($self) = @_;
113 118
119 return if $FOCUS == $self;
120
114 my $focus = $FOCUS; $FOCUS = $self; 121 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 122 $focus->update if $focus;
116 $FOCUS->update; 123 $FOCUS->update;
117} 124}
118 125
… …
125 $focus->update if $focus; #? 132 $focus->update if $focus; #?
126} 133}
127 134
128sub mouse_motion { } 135sub mouse_motion { }
129sub button_up { } 136sub button_up { }
130sub button_down { }
131sub key_down { } 137sub key_down { }
132sub key_up { } 138sub key_up { }
139
140sub button_down {
141 my ($self, $ev, $x, $y) = @_;
142
143 $self->focus_in;
144}
133 145
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 151
140sub draw { 152sub draw {
141 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
142 156
143 glPushMatrix; 157 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 159 $self->_draw;
146 if ($self == $HOVER) { 160 if ($self == $HOVER) {
… …
210 #$self->deactivate; 224 #$self->deactivate;
211} 225}
212 226
213############################################################################# 227#############################################################################
214 228
215package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
216 230
217our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
218 235
219sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
220 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
221 282
283 my $children = delete $arg{children} || [];
284
222 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
224 287
225 $self 288 $self
226} 289}
227 290
228sub add { 291sub add {
229 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
230 293
231 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 295 $chld->set_parent ($self);
233 296
234 @{$self->{children}} = 297 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
237 301
238 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
240} 304}
241 305
… …
269 $_->draw for @{$self->{children}}; 333 $_->draw for @{$self->{children}};
270} 334}
271 335
272############################################################################# 336#############################################################################
273 337
274package Crossfire::Client::Widget::Bin; 338package CFClient::Widget::Bin;
275 339
276our @ISA = Crossfire::Client::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
277 366
278sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
279 368
280sub size_request { 369sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
282} 371}
283 372
284sub size_allocate { 373sub size_allocate {
285 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
286 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
287 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
288 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
289 if $self->{children}[0]
290} 380}
291 381
292############################################################################# 382#############################################################################
293 383
294package Crossfire::Client::Widget::Window; 384package CFClient::Widget::Window;
295 385
296our @ISA = Crossfire::Client::Widget::Bin::; 386our @ISA = CFClient::Widget::Bin::;
297 387
298use SDL::OpenGL; 388use SDL::OpenGL;
299 389
300sub new { 390sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 391 my ($class, %arg) = @_;
302 392
303 my $self = $class->SUPER::new; 393 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 394}
307 395
308sub update { 396sub update {
309 my ($self) = @_; 397 my ($self) = @_;
310 398
399 # we want to do this delayed...
311 $self->render_chld; 400 $self->render_chld;
312 $self->SUPER::update; 401 $self->SUPER::update;
313} 402}
314 403
315sub render_chld { 404sub render_chld {
316 my ($self) = @_; 405 my ($self) = @_;
317 406
318 $self->{texture} = 407 $self->{texture} =
319 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
320 $self->{w}, $self->{h}, sub { $self->child->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 410 );
322} 411}
323 412
324sub size_allocate { 413sub size_allocate {
325 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
415
416 return unless $self->{w} != $w || $self->{h} != $h;
326 417
327 $self->{w} = $w; 418 $self->{w} = $w;
328 $self->{h} = $h; 419 $self->{h} = $h;
329 420
330 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
… …
350 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
351} 442}
352 443
353############################################################################# 444#############################################################################
354 445
355package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
356 447
357our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
358 449
359use SDL::OpenGL; 450use SDL::OpenGL;
360 451
361sub size_request { 452sub size_request {
362 my ($self) = @_; 453 my ($self) = @_;
… …
369} 460}
370 461
371sub size_allocate { 462sub size_allocate {
372 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
373 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
374 $self->{w} = $w; 467 $self->{w} = $w;
375 $self->{h} = $h; 468 $self->{h} = $h;
376 469
377 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
378 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
396 $chld->draw; 489 $chld->draw;
397} 490}
398 491
399############################################################################# 492#############################################################################
400 493
401package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
402 495
403our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
404 497
405use SDL::OpenGL; 498use SDL::OpenGL;
406 499
407my @tex = 500my @tex =
408 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 503
411sub size_request { 504sub size_request {
412 my ($self) = @_; 505 my ($self) = @_;
413 506
… …
422} 515}
423 516
424sub size_allocate { 517sub size_allocate {
425 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
426 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
427 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
428 523
429 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
430 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
431 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
433 528
434 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
435 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
436 531
532 my $child = $self->child;
533
437 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
439} 536}
440 537
441sub _draw { 538sub _draw {
442 my ($self) = @_; 539 my ($self) = @_;
443 540
… …
479 576
480} 577}
481 578
482############################################################################# 579#############################################################################
483 580
484package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
485 582
486our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
487 584
488use SDL::OpenGL; 585use SDL::OpenGL;
489 586
490sub add { 587sub add {
491 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
566 } 663 }
567} 664}
568 665
569############################################################################# 666#############################################################################
570 667
571package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
572 669
573our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
574 671
575use SDL::OpenGL; 672use SDL::OpenGL;
576 673
577sub size_request { 674sub size_request {
578 my ($self) = @_; 675 my ($self) = @_;
… …
586} 683}
587 684
588sub size_allocate { 685sub size_allocate {
589 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
590 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
591 $self->w ($w); 690 $self->{w} = $w;
592 $self->h ($h); 691 $self->{h} = $h;
593 692
594 my $exp; 693 return unless $self->{h};
595 my @oth; 694
596 # find expand widget 695 my $children = $self->{children};
597 for (@{$self->{children}}) { 696
598 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
599 $exp = $_; 698
600 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
601 } 716 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 717 }
613 718
614 my $y = 0; 719 my $y = 0;
615 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
616 $_->move (0, $y); 723 $child->move (0, $y);
617
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
624 $y += $h; 726 $y += $h;
625 }
626 } 727 }
627} 728}
628 729
629############################################################################# 730#############################################################################
630 731
631package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
632 733
633our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
634 735
635use SDL::OpenGL; 736use SDL::OpenGL;
636 737
637sub new { 738sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
639 740
741 my $self = $class->SUPER::new (
742 fg => [1, 1, 1],
640 $height ||= $::FONTSIZE; 743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
641 748
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
644
645 $self->set_text ($text); 749 $self->set_text ($self->{text});
646 750
647 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
648} 762}
649 763
650sub set_text { 764sub set_text {
651 my ($self, $text) = @_; 765 my ($self, $text) = @_;
652 766
653 $self->{text} = $text; 767 $self->{text} = $text;
654 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
655 769
770 delete $self->{texture};
656 $self->update; 771 $self->update;
657} 772}
658 773
659sub get_text { 774sub get_text {
660 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
663} 778}
664 779
665sub size_request { 780sub size_request {
666 my ($self) = @_; 781 my ($self) = @_;
667 782
783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
668 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
669 ( 787# (
670 $self->{texture}{width}, 788# $self->{texture}{width},
671 $self->{texture}{height}, 789# $self->{texture}{height},
672 ) 790# )
673 } else { 791# } else {
674 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
675 793#
676 ($w, $h) 794# ($w, $h)
677 } 795# }
796}
678 797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
679} 812}
680 813
681sub _draw { 814sub _draw {
682 my ($self) = @_; 815 my ($self) = @_;
683 816
684 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
685 821
686 glEnable GL_BLEND; 822 glEnable GL_BLEND;
687 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
688 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
690 826
691 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
692 828
693 $tex->draw_quad (0, 0); 829 $tex->draw_quad (0, 0);
694 830
695 glDisable GL_BLEND; 831 glDisable GL_BLEND;
696 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
697} 833}
698 834
699############################################################################# 835#############################################################################
700 836
701package Crossfire::Client::Widget::Entry; 837package CFClient::Widget::Entry;
702 838
703our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
704 840
705use SDL; 841use SDL;
706use SDL::OpenGL; 842use SDL::OpenGL;
707 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
708sub key_down { 897sub key_down {
709 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
710 899
711 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
712 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
… …
714 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
715 904
716 my $text = $self->get_text; 905 my $text = $self->get_text;
717 906
718 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
719 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
720 } elsif ($uni) { 915 } elsif ($uni) {
721 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
722 } 917 }
723 918
724 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
921}
922
923sub focus_in {
924 my ($self) = @_;
925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
725} 929}
726 930
727sub button_down { 931sub button_down {
728 my ($self, $ev) = @_; 932 my ($self, $ev, $x, $y) = @_;
729 933
730 $self->focus_in; 934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
731} 945}
732 946
733sub mouse_motion { 947sub mouse_motion {
734 my ($self, $ev, $x, $y) = @_; 948 my ($self, $ev, $x, $y) = @_;
735 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
736} 950}
737 951
738sub _draw { 952sub _draw {
739 my ($self) = @_; 953 my ($self) = @_;
740 954
955 local $self->{fg} = $self->{fg};
956
741 if ($FOCUS == $self) { 957 if ($FOCUS == $self) {
742 glColor 1, 1, 1; 958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
743 } else { 960 } else {
744 glColor 0.7, 0.7, 0.7; 961 glColor @{$self->{bg}};
745 } 962 }
746 963
747 glBegin GL_QUADS; 964 glBegin GL_QUADS;
748 glVertex 0 , 0; 965 glVertex 0 , 0;
749 glVertex 0 , $self->{h} - 1; 966 glVertex 0 , $self->{h};
750 glVertex $self->{w} - 1, $self->{h} - 1; 967 glVertex $self->{w}, $self->{h};
751 glVertex $self->{w} - 1, 0; 968 glVertex $self->{w}, 0;
752 glEnd; 969 glEnd;
753 970
754 $self->SUPER::_draw; 971 $self->SUPER::_draw;
755}
756 972
757############################################################################# 973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
758 982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w =
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub _draw {
1018 my ($self) = @_;
1019
1020 $self->SUPER::_draw ();
1021
1022 my ($w, $h) = @$self{qw(w h)};
1023
1024 if ($self->{vertical}) {
1025 # draw a vertical slider like a rotated horizontal slider
1026
1027 glTranslate 0, $self->{w};
1028 glRotate 90, 0, 0, 1;
1029
1030 ($w, $h) = ($h, $w);
1031 }
1032
1033 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1034 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1035
1036 glColor @$fg;
1037 glBegin GL_LINES;
1038 glVertex 0, 0; glVertex 0, $h;
1039 glVertex $w - 1, 0; glVertex $w - 1, $h;
1040 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1041 glEnd;
1042}
1043
1044#############################################################################
1045
759package Crossfire::Client::Widget::MapWidget; 1046package CFClient::Widget::MapWidget;
760 1047
761use strict; 1048use strict;
762 1049
763use List::Util qw(min max); 1050use List::Util qw(min max);
764 1051
765use SDL; 1052use SDL;
766use SDL::OpenGL; 1053use SDL::OpenGL;
767use SDL::OpenGL::Constants; 1054use SDL::OpenGL::Constants;
768 1055
769our @ISA = Crossfire::Client::Widget::; 1056our @ISA = CFClient::Widget::;
1057
1058sub new {
1059 my $class = shift;
1060
1061 $class->SUPER::new (
1062 z => -1,
1063 list => (glGenLists 1),
1064 @_
1065 )
1066}
770 1067
771sub key_down { 1068sub key_down {
772 print "MAPKEYDOWN\n"; 1069 print "MAPKEYDOWN\n";
773} 1070}
774 1071
… …
780 1 + int $::WIDTH / 32, 1077 1 + int $::WIDTH / 32,
781 1 + int $::HEIGHT / 32, 1078 1 + int $::HEIGHT / 32,
782 ) 1079 )
783} 1080}
784 1081
1082sub update {
1083 my ($self) = @_;
1084
1085 $self->{need_update} = 1;
1086}
1087
785sub _draw { 1088sub _draw {
786 my ($self) = @_; 1089 my ($self) = @_;
787 1090
1091 if (delete $self->{need_update}) {
1092 glNewList $self->{list}, GL_COMPILE;
1093
788 my $mx = $::CONN->{mapx}; 1094 my $mx = $::CONN->{mapx};
789 my $my = $::CONN->{mapy}; 1095 my $my = $::CONN->{mapy};
790 1096
791 my $map = $::CONN->{map}; 1097 my $map = $::CONN->{map};
792 1098
793 my ($xofs, $yofs); 1099 my ($xofs, $yofs);
794 1100
795 my $sw = 1 + int $::WIDTH / 32; 1101 my $sw = 1 + int $::WIDTH / 32;
796 my $sh = 1 + int $::HEIGHT / 32; 1102 my $sh = 1 + int $::HEIGHT / 32;
797 1103
798 if ($::CONN->{mapw} > $sw) { 1104 if ($::CONN->{mapw} > $sw) {
799 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1105 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
800 } else { 1106 } else {
801 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1107 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
802 } 1108 }
803 1109
804 if ($::CONN->{maph} > $sh) { 1110 if ($::CONN->{maph} > $sh) {
805 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1111 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
806 } else { 1112 } else {
807 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1113 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
808 } 1114 }
809 1115
810 glEnable GL_TEXTURE_2D; 1116 glEnable GL_TEXTURE_2D;
811 glEnable GL_BLEND; 1117 glEnable GL_BLEND;
812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
813 1119
814 my $sw4 = ($sw + 3) & ~3; 1120 my $sw4 = ($sw + 3) & ~3;
815 my $darkness = "\x00" x ($sw4 * $sh); 1121 my $darkness = "\x00" x ($sw4 * $sh);
816 1122
817 for my $x (0 .. $sw - 1) { 1123 for my $x (0 .. $sw - 1) {
818 my $row = $map->[$x + $xofs]; 1124 my $row = $map->[$x + $xofs];
819 for my $y (0 .. $sh - 1) { 1125 for my $y (0 .. $sh - 1) {
820 1126
821 my $cell = $row->[$y + $yofs] 1127 my $cell = $row->[$y + $yofs]
822 or next; 1128 or next;
823 1129
824 my $dark = $cell->[0]; 1130 my $dark = $cell->[0];
825 if ($dark < 0) { 1131 if ($dark < 0) {
826 substr $darkness, $y * $sw4 + $x, 1, chr 224; 1132 substr $darkness, $y * $sw4 + $x, 1, chr 224;
827 } else { 1133 } else {
828 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 1134 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
829 } 1135 }
830 1136
831 for my $num (grep $_, @$cell[1,2,3]) { 1137 for my $num (grep $_, @$cell[1,2,3]) {
832 my $tex = $::CONN->{face}[$num]{texture} || next; 1138 my $tex = $::CONN->{face}[$num]{texture} || next;
833 1139
834 my $w = $tex->{width}; 1140 my $w = $tex->{width};
835 my $h = $tex->{height}; 1141 my $h = $tex->{height};
836 1142
837 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1143 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1144 }
838 } 1145 }
839 } 1146 }
840 }
841 1147
842# if (1) { # higher quality darkness 1148# if (1) { # higher quality darkness
843# $lighting =~ s/(.)/$1$1$1/gs; 1149# $lighting =~ s/(.)/$1$1$1/gs;
844# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1150# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
845# 1151#
… …
847# 1153#
848# $lighting = $pb->get_pixels; 1154# $lighting = $pb->get_pixels;
849# $lighting =~ s/(.)../$1/gs; 1155# $lighting =~ s/(.)../$1/gs;
850# } 1156# }
851 1157
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
854 1160
855 $darkness = new Crossfire::Client::Texture 1161 $darkness = new CFClient::Texture
856 width => $sw4, 1162 width => $sw4,
857 height => $sh, 1163 height => $sh,
858 data => $darkness, 1164 data => $darkness,
859 internalformat => GL_ALPHA, 1165 internalformat => GL_ALPHA,
860 format => GL_ALPHA; 1166 format => GL_ALPHA;
861 1167
862 glColor 0.45, 0.45, 0.45, 1; 1168 glColor 0.45, 0.45, 0.45, 1;
863 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1169 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
864 1170
865 glDisable GL_TEXTURE_2D; 1171 glDisable GL_TEXTURE_2D;
866 glDisable GL_BLEND; 1172 glDisable GL_BLEND;
1173
1174 glEndList;
1175 }
1176
1177 glCallList $self->{list};
867} 1178}
868 1179
869my %DIR = ( 1180my %DIR = (
870 SDLK_KP8, [1, "north"], 1181 SDLK_KP8, [1, "north"],
871 SDLK_KP9, [2, "northeast"], 1182 SDLK_KP9, [2, "northeast"],
… …
917 } 1228 }
918} 1229}
919 1230
920############################################################################# 1231#############################################################################
921 1232
922package Crossfire::Client::Widget::Animator; 1233package CFClient::Widget::Animator;
923 1234
924use SDL::OpenGL; 1235use SDL::OpenGL;
925 1236
926our @ISA = Crossfire::Client::Widget::Bin::; 1237our @ISA = CFClient::Widget::Bin::;
927 1238
928sub moveto { 1239sub moveto {
929 my ($self, $x, $y) = @_; 1240 my ($self, $x, $y) = @_;
930 1241
931 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1242 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
959 glPopMatrix; 1270 glPopMatrix;
960} 1271}
961 1272
962############################################################################# 1273#############################################################################
963 1274
964package Crossfire::Client::Widget::Toplevel; 1275package CFClient::Widget::Toplevel;
965 1276
966our @ISA = Crossfire::Client::Widget::Container::; 1277our @ISA = CFClient::Widget::Container::;
967 1278
968sub size_request { 1279sub size_request {
969 ($::WIDTH, $::HEIGHT) 1280 ($::WIDTH, $::HEIGHT)
970} 1281}
971 1282
… …
1005 $self->_draw; 1316 $self->_draw;
1006} 1317}
1007 1318
1008############################################################################# 1319#############################################################################
1009 1320
1010package Crossfire::Client::Widget; 1321package CFClient::Widget;
1011 1322
1012$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1323$TOPLEVEL = new CFClient::Widget::Toplevel;
1013 1324
10141 13251
1015 1326

Diff Legend

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