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.135 by root, Wed Apr 19 06:21:07 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
27 64
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
33 }
34 70
71 check_tooltip;
72 }
73
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 106 my ($x, $y) = ($ev->{x}, $ev->{y});
60 107
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 108 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 109
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
87 139
88package CFClient::UI::Base; 140package CFClient::UI::Base;
89 141
90use strict; 142use strict;
91 143
92use SDL::OpenGL; 144use CFClient::OpenGL;
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
146} 213}
147 214
148sub configure { 215sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
150 217
218 if ($self->{aspect}) {
219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
221
222 # use alignment to adjust x, y
223
224 $x += int +($w - $w2) * 0.5;
225 $y += int +($h - $h2) * 0.5;
226
227 ($w, $h) = ($w2, $h2);
228 }
229
230 if ($self->{x} != $x || $self->{y} != $y) {
151 $self->{x} = $x; 231 $self->{x} = $x;
152 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update;
234 }
153 235
154 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
155
156 $self->{w} = $w; 237 $self->{w} = $w;
157 $self->{h} = $h; 238 $self->{h} = $h;
158 239
159 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
160 $self->update; 241 $self->update;
242 }
161} 243}
162 244
163sub size_allocate { 245sub size_allocate {
164 # nothing to be done 246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
263 my ($self, $w, $h) = @_;
264
265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
165} 267}
166 268
167# return top left coordinates 269# return top left coordinates
168sub _topleft { 270sub _topleft {
169 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
170 275
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
172} 277}
173 278
174# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
252 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
253 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
254 glEnd; 359 glEnd;
255 glDisable GL_BLEND; 360 glDisable GL_BLEND;
256 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
257} 376}
258 377
259sub _draw { 378sub _draw {
260 my ($self) = @_; 379 my ($self) = @_;
261 380
262 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
263} 382}
264 383
265sub find_widget { 384sub find_widget {
266 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
267 388
268 return $self 389 return $self
269 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
271 392
… …
279} 400}
280 401
281sub check_size { 402sub check_size {
282 my ($self) = @_; 403 my ($self) = @_;
283 404
284 my ($w, $h) = $self->size_request; 405 $self->{parent}
406 or return 1;
285 407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
286 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w; 413 $self->{req_w} = $w;
288 $self->{req_h} = $h; 414 $self->{req_h} = $h;
289 415
290 $self->{parent}->check_size 416 $self->{parent}->check_size
291 if $self->{parent}; 417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
292 } 425 }
293} 426}
294 427
295sub update { 428sub update {
296 my ($self) = @_; 429 my ($self) = @_;
… …
306} 439}
307 440
308sub emit { 441sub emit {
309 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
310 443
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312 $cb->($self, @args);
313 }
314} 445}
315 446
316sub DESTROY { 447sub DESTROY {
317 my ($self) = @_; 448 my ($self) = @_;
318 449
… …
324package CFClient::UI::DrawBG; 455package CFClient::UI::DrawBG;
325 456
326our @ISA = CFClient::UI::Base::; 457our @ISA = CFClient::UI::Base::;
327 458
328use strict; 459use strict;
329use SDL::OpenGL; 460use CFClient::OpenGL;
330 461
331sub new { 462sub new {
332 my $class = shift; 463 my $class = shift;
333 464
334 # range [value, low, high, page] 465 # range [value, low, high, page]
… …
363 494
364package CFClient::UI::Empty; 495package CFClient::UI::Empty;
365 496
366our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
367 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
368sub size_request { 504sub size_request {
369 (0, 0) 505 (0, 0)
370} 506}
371 507
372sub draw { } 508sub draw { }
… …
380sub new { 516sub new {
381 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
382 518
383 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
384 520
385 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
386 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
387 527
388 $self 528 $self
389} 529}
390 530
… …
401 ]; 541 ];
402 542
403 $child->check_size; 543 $child->check_size;
404} 544}
405 545
546sub children {
547 @{ $_[0]{children} }
548}
549
406sub remove { 550sub remove {
407 my ($self, $child) = @_; 551 my ($self, $child) = @_;
408 552
409 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
410 555
411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412 557
413 $self->check_size; 558 $self->check_size;
559 $self->update;
560}
561
562sub clear {
563 my ($self) = @_;
564
565 my $children = delete $self->{children};
566 $self->{children} = [];
567
568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
414} 572}
415 573
416sub find_widget { 574sub find_widget {
417 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
418 576
… …
482 640
483package CFClient::UI::Window; 641package CFClient::UI::Window;
484 642
485our @ISA = CFClient::UI::Bin::; 643our @ISA = CFClient::UI::Bin::;
486 644
487use SDL::OpenGL; 645use CFClient::OpenGL;
488 646
489sub new { 647sub new {
490 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
491 649
492 my $self = $class->SUPER::new (%arg); 650 my $self = $class->SUPER::new (%arg);
493} 651}
494 652
495sub update { 653sub update {
496 my ($self) = @_; 654 my ($self) = @_;
497 655
498 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
499 $self->render_chld;
500 $self->SUPER::update; 657 $self->SUPER::update;
501} 658}
502 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
503sub render_chld { 667sub render_child {
504 my ($self) = @_; 668 my ($self) = @_;
505 669
506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
507 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
508 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
509 $self->child->draw; 673 $self->child->draw;
510 }; 674 };
511} 675}
512 676
513sub size_allocate {
514 my ($self, $w, $h) = @_;
515
516 $self->child->configure (0, 0, $w, $h);
517
518 $self->render_chld;
519}
520
521sub _draw { 677sub _draw {
522 my ($self) = @_; 678 my ($self) = @_;
523 679
524 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
525 681
526 my $tex = $self->{texture} 682 my $tex = $self->{texture}
527 or return; 683 or return;
684
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1;
690
691 $tex->draw_quad (0, 0, $w, $h);
692
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D;
695}
696
697#############################################################################
698
699package CFClient::UI::ViewPort;
700
701our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728
729sub new {
730 my $class = shift;
731
732 my $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1],
734 border_bg => [1, 1, 1, 1],
735 border => 0.8,
736 @_
737 );
738
739 $self
740}
741
742sub _draw {
743 my ($self) = @_;
744
745 my ($w, $h) = ($self->{w}, $self->{h});
528 746
529 glEnable GL_BLEND; 747 glEnable GL_BLEND;
530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
531 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
533 751
534 $tex->draw_quad (0, 0, $w, $h); 752# glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
535 759
760
761 $self->child->draw;
536 glDisable GL_BLEND; 762 glDisable GL_BLEND;
537 glDisable GL_TEXTURE_2D; 763 glDisable GL_TEXTURE_2D;
538} 764}
539 765
540############################################################################# 766#############################################################################
541 767
542package CFClient::UI::ViewPort;
543
544our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
566package CFClient::UI::Frame; 768package CFClient::UI::FancyFrame;
567 769
568our @ISA = CFClient::UI::Bin::; 770our @ISA = CFClient::UI::Bin::;
569 771
570use SDL::OpenGL; 772use CFClient::OpenGL;
571
572sub size_request {
573 my ($self) = @_;
574 my $chld = $self->child
575 or return (0, 0);
576
577 $chld->move (2, 2);
578
579 map { $_ + 4 } $chld->size_request;
580}
581
582sub size_allocate {
583 my ($self, $x, $y, $w, $h) = @_;
584
585 $self->child->configure (2, 2, $w - 4, $h - 4);
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 my $chld = $self->child;
592
593 my ($w, $h) = $chld->size_request;
594
595 glBegin GL_QUADS;
596 glColor 0, 0, 0;
597 glVertex 0 , 0;
598 glVertex 0 , $h + 4;
599 glVertex $w + 4 , $h + 4;
600 glVertex $w + 4 , 0;
601 glEnd;
602
603 $chld->draw;
604}
605
606#############################################################################
607
608package CFClient::UI::FancyFrame;
609
610our @ISA = CFClient::UI::Bin::;
611
612use SDL::OpenGL;
613 773
614my @tex = 774my @tex =
615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617 777
618sub new { 778sub new {
619 my $class = shift; 779 my $class = shift;
620 780
621 # TODO: user_x, user_y, overwrite moveto? 781 # TODO: user_x, user_y, overwrite moveto?
622 782
623 $class->SUPER::new ( 783 my $self = $class->SUPER::new (
624 bg => [1, 1, 1, 1], 784 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1], 785 border_bg => [1, 1, 1, 1],
626 border => 0.8, 786 border => 0.8,
787 can_events => 1,
627 @_ 788 @_
628 ) 789 );
790
791 $self->{title} &&= new CFClient::UI::Label
792 align => 0,
793 valign => 1,
794 text => $self->{title},
795 fontsize => 1;
796
797 $self
629} 798}
630 799
631sub border { 800sub border {
632 int $_[0]{border} * $::FONTSIZE 801 int $_[0]{border} * $::FONTSIZE
633} 802}
634 803
635sub size_request { 804sub size_request {
636 my ($self) = @_; 805 my ($self) = @_;
637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639 806
640 my ($w, $h) = $self->SUPER::size_request; 807 my ($w, $h) = $self->SUPER::size_request;
641 808
642 ( 809 (
643 $w + $self->border * 2, 810 $w + $self->border * 2,
… …
649 my ($self, $w, $h) = @_; 816 my ($self, $w, $h) = @_;
650 817
651 $h -= List::Util::max 0, $self->border * 2; 818 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2; 819 $w -= List::Util::max 0, $self->border * 2;
653 820
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
822 if $self->{title};
823
654 $self->child->configure ($self->border, $self->border, $w, $h); 824 $self->child->configure ($self->border, $self->border, $w, $h);
655} 825}
656 826
657sub button_down { 827sub button_down {
658 my ($self, $ev, $x, $y) = @_; 828 my ($self, $ev, $x, $y) = @_;
… …
660 my $border = $self->border; 830 my $border = $self->border;
661 831
662 if ($x < $self->{w} && $x >= $self->{w} - $border 832 if ($x < $self->{w} && $x >= $self->{w} - $border
663 && $y < $self->{h} && $y >= $self->{h} - $border) { 833 && $y < $self->{h} && $y >= $self->{h} - $border) {
664 834
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 835 my ($ox, $oy) = ($ev->{x}, $ev->{y});
666 my ($bw, $bh) = ($self->{w}, $self->{h}); 836 my ($bw, $bh) = ($self->{w}, $self->{h});
667 837
668 $self->{motion} = sub { 838 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_; 839 my ($ev, $x, $y) = @_;
670 840
671 ($x, $y) = ($ev->motion_x, $ev->motion_y); 841 ($x, $y) = ($ev->{x}, $ev->{y});
672 842
673 $self->{user_w} = $bw + $x - $ox; 843 $self->{user_w} = $bw + $x - $ox;
674 $self->{user_h} = $bh + $y - $oy; 844 $self->{user_h} = $bh + $y - $oy;
675 $self->check_size; 845 $self->check_size;
676 }; 846 };
677 847
678 } elsif ($x >= 0 && $x < $self->{w} 848 } elsif ($x >= 0 && $x < $self->{w}
679 && $y >= 0 && $y < $border) { 849 && $y >= 0 && $y < $border) {
680 850
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 851 my ($ox, $oy) = ($ev->{x}, $ev->{y});
682 my ($bx, $by) = ($self->{x}, $self->{y}); 852 my ($bx, $by) = ($self->{x}, $self->{y});
683 853
684 $self->{motion} = sub { 854 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_; 855 my ($ev, $x, $y) = @_;
686 856
687 ($x, $y) = ($ev->motion_x, $ev->motion_y); 857 ($x, $y) = ($ev->{x}, $ev->{y});
688 858
689 $self->move ($bx + $x - $ox, $by + $y - $oy); 859 $self->move ($bx + $x - $ox, $by + $y - $oy);
690 $self->update; 860 $self->update;
691 }; 861 };
692 } 862 }
… …
737 $bg->draw_quad ($border, $border, $cw, $ch); 907 $bg->draw_quad ($border, $border, $cw, $ch);
738 908
739 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
740 glDisable GL_BLEND; 910 glDisable GL_BLEND;
741 911
912 $self->{title}->draw if $self->{title};
742 $self->child->draw; 913 $self->child->draw;
743} 914}
744 915
745############################################################################# 916#############################################################################
746 917
… …
748 919
749our @ISA = CFClient::UI::Base::; 920our @ISA = CFClient::UI::Base::;
750 921
751use List::Util qw(max sum); 922use List::Util qw(max sum);
752 923
753use SDL::OpenGL; 924use CFClient::OpenGL;
754 925
755sub new { 926sub new {
756 my $class = shift; 927 my $class = shift;
757 928
758 $class->SUPER::new ( 929 $class->SUPER::new (
… …
768 $self->{children}[$y][$x] = $child; 939 $self->{children}[$y][$x] = $child;
769 940
770 $child->check_size; 941 $child->check_size;
771} 942}
772 943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
773# TODO: move to container class maybe? send childs a signal on removal? 948# TODO: move to container class maybe? send childs a signal on removal?
774sub clear { 949sub clear {
775 my ($self) = @_; 950 my ($self) = @_;
776 951
952 my @children = $self->children;
777 delete $self->{children}; 953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
778 $self->update; 960 $self->update;
779} 961}
780 962
781sub get_wh { 963sub get_wh {
782 my ($self) = @_; 964 my ($self) = @_;
… …
788 or next; 970 or next;
789 971
790 for my $x (0 .. $#$row) { 972 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x] 973 my $widget = $row->[$x]
792 or next; 974 or next;
793 my ($w, $h) = $widget->size_request; 975 my ($w, $h) = @$widget{qw(req_w req_h)};
794 976
795 $w[$x] = max $w[$x], $w; 977 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h; 978 $h[$y] = max $h[$y], $h;
797 } 979 }
798 } 980 }
… …
903 1085
904 ($h, $w) = ($w, $h); 1086 ($h, $w) = ($w, $h);
905 1087
906 my $children = $self->{children}; 1088 my $children = $self->{children};
907 1089
908 my @h = map +($_->size_request)[0], @$children; 1090 my @h = map $_->{req_w}, @$children;
909 1091
910 my $req_h = List::Util::sum @h; 1092 my $req_h = List::Util::sum @h;
911 1093
912 if ($req_h > $h) { 1094 if ($req_h > $h) {
913 # ah well, not enough space 1095 # ah well, not enough space
… …
961sub size_allocate { 1143sub size_allocate {
962 my ($self, $w, $h) = @_; 1144 my ($self, $w, $h) = @_;
963 1145
964 my $children = $self->{children}; 1146 my $children = $self->{children};
965 1147
966 my @h = map +($_->size_request)[1], @$children; 1148 my @h = map $_->{req_h}, @$children;
967 1149
968 my $req_h = List::Util::sum @h; 1150 my $req_h = List::Util::sum @h;
969 1151
970 if ($req_h > $h) { 1152 if ($req_h > $h) {
971 # ah well, not enough space 1153 # ah well, not enough space
… …
999 1181
1000package CFClient::UI::Label; 1182package CFClient::UI::Label;
1001 1183
1002our @ISA = CFClient::UI::Base::; 1184our @ISA = CFClient::UI::Base::;
1003 1185
1004use SDL::OpenGL; 1186use CFClient::OpenGL;
1005 1187
1006sub new { 1188sub new {
1007 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
1008 1190
1009 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
1193 #font => default_font
1011 fontsize => 1, 1194 fontsize => 1,
1012 text => "", 1195 text => "",
1013 align => -1, 1196 align => -1,
1014 valign => -1, 1197 valign => -1,
1015 padding => 2, 1198 padding => 2,
1016 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1200 can_events => 0,
1017 %arg 1201 %arg
1018 ); 1202 );
1019 1203
1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1204 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout;
1208 }
1021 1209
1022 $self->set_text (delete $self->{text}) if exists $self->{text}; 1210 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1024 1212
1025 $self 1213 $self
1026} 1214}
1027 1215
1028sub escape_text { 1216sub escape {
1029 local $_ = $_[1]; 1217 local $_ = $_[1];
1030 1218
1031 s/&/&amp;/g; 1219 s/&/&amp;/g;
1032 s/>/&gt;/g; 1220 s/>/&gt;/g;
1033 s/</&lt;/g; 1221 s/</&lt;/g;
1034 1222
1035 $_[1] 1223 $_[1]
1036} 1224}
1037 1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1038sub set_text { 1239sub set_text {
1039 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
1040 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1041 $self->{layout}->set_text ($text); 1245 $self->{layout}->set_text ($text);
1042 1246
1043 delete $self->{texture}; 1247 delete $self->{texture};
1044 $self->update; 1248 $self->update;
1249 $self->check_size;
1045} 1250}
1046 1251
1047sub set_markup { 1252sub set_markup {
1048 my ($self, $markup) = @_; 1253 my ($self, $markup) = @_;
1049 1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1050 $self->{layout}->set_markup ($markup); 1258 $self->{layout}->set_markup ($markup);
1051 1259
1052 delete $self->{texture}; 1260 delete $self->{texture};
1053 $self->update; 1261 $self->update;
1262 $self->check_size;
1054} 1263}
1055 1264
1056sub size_request { 1265sub size_request {
1057 my ($self) = @_; 1266 my ($self) = @_;
1058 1267
1059 $self->{layout}->set_width; 1268 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1);
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061 1271
1062 my ($w, $h) = $self->{layout}->size; 1272 my ($w, $h) = $self->{layout}->size;
1273
1274 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font};
1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1277
1278 my ($w2, $h2) = $self->{template}->size;
1279
1280 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2;
1282 }
1063 1283
1064 ( 1284 (
1065 $w + $self->{padding} * 2, 1285 $w + $self->{padding} * 2,
1066 $h + $self->{padding} * 2, 1286 $h + $self->{padding} * 2,
1067 ) 1287 )
… …
1071 my ($self, $w, $h) = @_; 1291 my ($self, $w, $h) = @_;
1072 1292
1073 delete $self->{texture}; 1293 delete $self->{texture};
1074} 1294}
1075 1295
1296sub set_fontsize {
1297 my ($self, $fontsize) = @_;
1298
1299 $self->{fontsize} = $fontsize;
1300 delete $self->{texture};
1301 $self->check_size;
1302 $self->update;
1303}
1304
1076sub _draw { 1305sub _draw {
1077 my ($self) = @_; 1306 my ($self) = @_;
1078 1307
1079 my $tex = $self->{texture} ||= do { 1308 my $tex = $self->{texture} ||= do {
1309 $self->{layout}->set_font ($self->{font}) if $self->{font};
1080 $self->{layout}->set_width ($self->{w}); 1310 $self->{layout}->set_width ($self->{w});
1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1082 new_from_layout CFClient::Texture $self->{layout} 1312 new_from_layout CFClient::Texture $self->{layout}
1083 }; 1313 };
1084 1314
… …
1111 1341
1112package CFClient::UI::EntryBase; 1342package CFClient::UI::EntryBase;
1113 1343
1114our @ISA = CFClient::UI::Label::; 1344our @ISA = CFClient::UI::Label::;
1115 1345
1116use SDL; 1346use CFClient::OpenGL;
1117use SDL::OpenGL;
1118 1347
1119sub new { 1348sub new {
1120 my $class = shift; 1349 my $class = shift;
1121 1350
1122 $class->SUPER::new ( 1351 $class->SUPER::new (
1123 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1124 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1125 active_bg => [1, 1, 1, 0.5], 1354 active_bg => [1, 1, 1, 0.5],
1126 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1127 can_hover => 1, 1356 can_hover => 1,
1128 can_focus => 1, 1357 can_focus => 1,
1129 valign => 0, 1358 valign => 0,
1359 can_events => 1,
1130 @_ 1360 @_
1131 ) 1361 )
1132} 1362}
1133 1363
1134sub _set_text { 1364sub _set_text {
… …
1162} 1392}
1163 1393
1164sub size_allocate { 1394sub size_allocate {
1165 my ($self, $w, $h) = @_; 1395 my ($self, $w, $h) = @_;
1166 1396
1167 $self->_set_text ($self->{text}); 1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1168} 1398}
1169 1399
1170sub set_text { 1400sub set_text {
1171 my ($self, $text) = @_; 1401 my ($self, $text) = @_;
1172 1402
… …
1176} 1406}
1177 1407
1178sub key_down { 1408sub key_down {
1179 my ($self, $ev) = @_; 1409 my ($self, $ev) = @_;
1180 1410
1181 my $mod = $ev->key_mod; 1411 my $mod = $ev->{mod};
1182 my $sym = $ev->key_sym; 1412 my $sym = $ev->{sym};
1183
1184 my $uni = $ev->key_unicode; 1413 my $uni = $ev->{unicode};
1185 1414
1186 my $text = $self->get_text; 1415 my $text = $self->get_text;
1187 1416
1188 if ($sym == SDLK_BACKSPACE) { 1417 if ($sym == 8) {
1189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1190 } elsif ($sym == SDLK_DELETE) { 1419 } elsif ($sym == 127) {
1191 substr $text, $self->{cursor}, 1, ""; 1420 substr $text, $self->{cursor}, 1, "";
1192 } elsif ($sym == SDLK_LEFT) { 1421 } elsif ($sym == CFClient::SDLK_LEFT) {
1193 --$self->{cursor} if $self->{cursor}; 1422 --$self->{cursor} if $self->{cursor};
1194 } elsif ($sym == SDLK_RIGHT) { 1423 } elsif ($sym == CFClient::SDLK_RIGHT) {
1195 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1424 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1196 } elsif ($sym == SDLK_HOME) { 1425 } elsif ($sym == CFClient::SDLK_HOME) {
1197 $self->{cursor} = 0; 1426 $self->{cursor} = 0;
1198 } elsif ($sym == SDLK_END) { 1427 } elsif ($sym == CFClient::SDLK_END) {
1199 $self->{cursor} = length $text; 1428 $self->{cursor} = length $text;
1200 } elsif ($sym == SDLK_ESCAPE) { 1429 } elsif ($sym == 27) {
1201 $self->emit ('escape'); 1430 $self->emit ('escape');
1202 } elsif ($uni) { 1431 } elsif ($uni) {
1203 substr $text, $self->{cursor}++, 0, chr $uni; 1432 substr $text, $self->{cursor}++, 0, chr $uni;
1204 } 1433 }
1205 1434
… …
1280 1509
1281package CFClient::UI::Entry; 1510package CFClient::UI::Entry;
1282 1511
1283our @ISA = CFClient::UI::EntryBase::; 1512our @ISA = CFClient::UI::EntryBase::;
1284 1513
1285use SDL; 1514use CFClient::OpenGL;
1286use SDL::OpenGL;
1287 1515
1288sub key_down { 1516sub key_down {
1289 my ($self, $ev) = @_; 1517 my ($self, $ev) = @_;
1290 1518
1291 my $sym = $ev->key_sym; 1519 my $sym = $ev->{sym};
1292 1520
1293 if ($sym == SDLK_RETURN) { 1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1294 $self->emit (activate => $self->get_text); 1526 $self->emit (activate => $txt);
1295 $self->update; 1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1296 1550
1297 } else { 1551 } else {
1298 $self->SUPER::key_down ($ev); 1552 $self->SUPER::key_down ($ev);
1299 } 1553 }
1300 1554
… …
1304 1558
1305package CFClient::UI::Button; 1559package CFClient::UI::Button;
1306 1560
1307our @ISA = CFClient::UI::Label::; 1561our @ISA = CFClient::UI::Label::;
1308 1562
1309use SDL; 1563use CFClient::OpenGL;
1310use SDL::OpenGL;
1311 1564
1312my @tex = 1565my @tex =
1313 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314 qw(b1_button_active.png); 1567 qw(b1_button_active.png);
1315 1568
1316sub new { 1569sub new {
1317 my $class = shift; 1570 my $class = shift;
1318 1571
1319 $class->SUPER::new ( 1572 $class->SUPER::new (
1320 padding => 4, 1573 padding => 4,
1321 fg => [1, 1, 1], 1574 fg => [1, 1, 1],
1322 bg => [1, 1, 1, 0.2], 1575 bg => [1, 1, 1, 0.2],
1323 active_fg => [0, 0, 1], 1576 active_fg => [0, 0, 1],
1324 can_hover => 1, 1577 can_hover => 1,
1325 align => 0, 1578 align => 0,
1326 valign => 0, 1579 valign => 0,
1580 can_events => 1,
1327 @_ 1581 @_
1328 ) 1582 )
1329} 1583}
1330 1584
1331sub button_up { 1585sub button_up {
… …
1365package CFClient::UI::CheckBox; 1619package CFClient::UI::CheckBox;
1366 1620
1367our @ISA = CFClient::UI::DrawBG::; 1621our @ISA = CFClient::UI::DrawBG::;
1368 1622
1369my @tex = 1623my @tex =
1370 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1624 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1371 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1625 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1372 1626
1373use SDL; 1627use CFClient::OpenGL;
1374use SDL::OpenGL;
1375 1628
1376sub new { 1629sub new {
1377 my $class = shift; 1630 my $class = shift;
1378 1631
1379 $class->SUPER::new ( 1632 $class->SUPER::new (
… …
1425 glDisable GL_BLEND; 1678 glDisable GL_BLEND;
1426} 1679}
1427 1680
1428############################################################################# 1681#############################################################################
1429 1682
1430package CFClient::UI::VGauge; 1683package CFClient::UI::Image;
1431 1684
1432our @ISA = CFClient::UI::Base::; 1685our @ISA = CFClient::UI::Base::;
1433 1686
1434use SDL::OpenGL; 1687use CFClient::OpenGL;
1688use Carp qw/confess/;
1435 1689
1436my %tex = ( 1690our %loaded_images;
1437 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ],
1441 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444 ],
1445 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ],
1449 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452 ],
1453);
1454 1691
1455# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1692sub new {
1457 my $class = shift; 1693 my $class = shift;
1458 1694
1459 my $self = $class->SUPER::new (gauge => 'food', @_); 1695 my $self = $class->SUPER::new (can_events => 0, @_);
1696
1697 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1698
1699 $loaded_images{$self->{image}} ||=
1700 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1701
1702 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1703
1704 Scalar::Util::weaken $loaded_images{$self->{image}};
1705
1706 $self->{aspect} = $tex->{w} / $tex->{h};
1460 1707
1461 $self 1708 $self
1462} 1709}
1463 1710
1464sub size_request { 1711sub size_request {
1465 my ($self) = @_; 1712 my ($self) = @_;
1466 1713
1467 my $tex = $tex{$self->{gauge}}[0]; 1714 ($self->{tex}->{w}, $self->{tex}->{h})
1468
1469 @$tex{qw(w h)}
1470}
1471
1472sub set_max {
1473 my ($self, $max) = @_;
1474
1475 $self->{max_val} = $max;
1476}
1477
1478sub set_value {
1479 my ($self, $val, $max) = @_;
1480
1481 $self->set_max ($max)
1482 if defined $max;
1483
1484 $max = $self->{max_val};
1485 $self->{val} = $val;
1486
1487 $self->update;
1488} 1715}
1489 1716
1490sub _draw { 1717sub _draw {
1491 my ($self) = @_; 1718 my ($self) = @_;
1492 1719
1493 my $tex = $tex{$self->{gauge}}; 1720 my $tex = $self->{tex};
1494 1721
1495 my ($w, $h) = ($self->{w}, $self->{h}); 1722 my ($w, $h) = ($self->{w}, $self->{h});
1496 1723
1497 my $ycut = $self->{val} / ($self->{max_val} || 1); 1724 if ($self->{rot90}) {
1498 $ycut = 1 if $self->{val} > $self->{max_val}; 1725 glRotate 90, 0, 0, 1;
1726 glTranslate 0, -$self->{w}, 0;
1499 1727
1500 my $t1 = $tex->[0]; 1728 ($w, $h) = ($h, $w);
1501 my $t2 = $tex->[1]; 1729 }
1502 1730
1503 glEnable GL_BLEND; 1731 glEnable GL_BLEND;
1504 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1505 glEnable GL_TEXTURE_2D; 1733 glEnable GL_TEXTURE_2D;
1506 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1507 1735
1736 $tex->draw_quad (0, 0, $w, $h);
1737
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D;
1740}
1741
1742#############################################################################
1743
1744package CFClient::UI::VGauge;
1745
1746our @ISA = CFClient::UI::Base::;
1747
1748use List::Util qw(min max);
1749
1750use CFClient::OpenGL;
1751
1752my %tex = (
1753 food => [
1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1756 ],
1757 grace => [
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1760 ],
1761 hp => [
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1764 ],
1765 mana => [
1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1768 ],
1769);
1770
1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1772sub new {
1773 my $class = shift;
1774
1775 my $self = $class->SUPER::new (
1776 type => 'food',
1777 @_
1778 );
1779
1780 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1781
1782 $self
1783}
1784
1785sub size_request {
1786 my ($self) = @_;
1787
1788 #my $tex = $tex{$self->{type}}[0];
1789 #@$tex{qw(w h)}
1790 (0, 0)
1791}
1792
1793sub set_max {
1794 my ($self, $max) = @_;
1795
1796 return if $self->{max_val} == $max;
1797
1798 $self->{max_val} = $max;
1799 $self->update;
1800}
1801
1802sub set_value {
1803 my ($self, $val, $max) = @_;
1804
1805 $self->set_max ($max)
1806 if defined $max;
1807
1808 return if $self->{val} == $val;
1809
1810 $self->{val} = $val;
1811 $self->update;
1812}
1813
1814sub _draw {
1815 my ($self) = @_;
1816
1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1819
1820 my ($w, $h) = ($self->{w}, $self->{h});
1821
1822 if ($self->{vertical}) {
1823 glRotate 90, 0, 0, 1;
1824 glTranslate 0, -$self->{w}, 0;
1825
1826 ($w, $h) = ($h, $w);
1827 }
1828
1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1830
1831 my $ycut1 = max 0, min 1, $ycut;
1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1508 my $h1 = $self->{h} - $ycut * $self->{h}; 1834 my $h1 = $self->{h} * (1 - $ycut1);
1509 my $h2 = $ycut * $self->{h}; 1835 my $h2 = $self->{h} * (1 - $ycut2);
1510 1836
1511 my $yp = 0; 1837 glEnable GL_BLEND;
1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1841
1513 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1514 glBegin GL_QUADS; 1843 glBegin GL_QUADS;
1515 glTexCoord 0 , 0; glVertex 0 , $yp; 1844 glTexCoord 0 , 0; glVertex 0 , 0;
1516 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1517 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1518 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1519 glEnd; 1848 glEnd;
1520 1849
1521 $yp += $h1; 1850 my $ycut1 = List::Util::min 1, $ycut;
1522
1523 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1524 glBegin GL_QUADS; 1852 glBegin GL_QUADS;
1525 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1526 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1527 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1528 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1529 glEnd; 1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1530 1868
1531 glDisable GL_BLEND; 1869 glDisable GL_BLEND;
1532 glDisable GL_TEXTURE_2D; 1870 glDisable GL_TEXTURE_2D;
1533} 1871}
1534 1872
1535############################################################################# 1873#############################################################################
1536 1874
1875package CFClient::UI::Gauge;
1876
1877our @ISA = CFClient::UI::VBox::;
1878
1879sub new {
1880 my ($class, %arg) = @_;
1881
1882 my $self = $class->SUPER::new (
1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1886 %arg,
1887 );
1888
1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1892
1893 $self
1894}
1895
1896sub set_fontsize {
1897 my ($self, $fsize) = @_;
1898
1899 $self->{value}->set_fontsize ($fsize);
1900 $self->{max} ->set_fontsize ($fsize);
1901}
1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1910sub set_value {
1911 my ($self, $val, $max) = @_;
1912
1913 $self->set_max ($max)
1914 if defined $max;
1915
1916 $self->{gauge}->set_value ($val, $max);
1917 $self->{value}->set_text ($val);
1918}
1919
1920#############################################################################
1921
1537package CFClient::UI::Slider; 1922package CFClient::UI::Slider;
1538 1923
1539use strict; 1924use strict;
1540 1925
1541use SDL::OpenGL; 1926use CFClient::OpenGL;
1542 1927
1543our @ISA = CFClient::UI::DrawBG::; 1928our @ISA = CFClient::UI::DrawBG::;
1544 1929
1545my @tex = 1930my @tex =
1546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1931 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1671 2056
1672package CFClient::UI::TextView; 2057package CFClient::UI::TextView;
1673 2058
1674our @ISA = CFClient::UI::HBox::; 2059our @ISA = CFClient::UI::HBox::;
1675 2060
1676use SDL::OpenGL; 2061use CFClient::OpenGL;
1677 2062
1678sub new { 2063sub new {
1679 my $class = shift; 2064 my $class = shift;
1680 2065
1681 my $self = $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1682 fontsize => 1, 2067 fontsize => 1,
2068 can_events => 0,
2069 #font => default_font
1683 @_, 2070 @_,
1684 2071
1685 layout => (new CFClient::Layout), 2072 layout => (new CFClient::Layout),
1686 par => [], 2073 par => [],
1687 height => 0, 2074 height => 0,
1688 children => [ 2075 children => [
1689 (new CFClient::UI::Empty expand => 1), 2076 (new CFClient::UI::Empty expand => 1),
1690 (new CFClient::UI::Slider vertical => 1), 2077 (new CFClient::UI::Slider vertical => 1),
1691 ], 2078 ],
1692 ); 2079 );
1693 2080
… …
1727sub size_allocate { 2114sub size_allocate {
1728 my ($self, $w, $h) = @_; 2115 my ($self, $w, $h) = @_;
1729 2116
1730 $self->SUPER::size_allocate ($w, $h); 2117 $self->SUPER::size_allocate ($w, $h);
1731 2118
2119 $self->{layout}->set_font ($self->{font}) if $self->{font};
1732 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1733 $self->{layout}->set_width ($self->{children}[0]{w}); 2121 $self->{layout}->set_width ($self->{children}[0]{w});
1734 2122
1735 $self->reflow; 2123 $self->reflow;
1736} 2124}
… …
1789 2177
1790 my $y = 0; 2178 my $y = 0;
1791 2179
1792 my $layout = $self->{layout}; 2180 my $layout = $self->{layout};
1793 2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
1794 for my $par (@{$self->{par}}) { 2184 for my $par (@{$self->{par}}) {
1795 my $h = $par->[0]; 2185 my $h = $par->[0];
1796 2186
1797 if ($y0 < $y + $h && $y < $y1) { 2187 if ($y0 < $y + $h && $y < $y1) {
1798 $layout->set_text ($par->[2]); 2188 $layout->set_text ($par->[2]);
… …
1815 my ($self) = @_; 2205 my ($self) = @_;
1816 2206
1817 if ($self->{texture}) { 2207 if ($self->{texture}) {
1818 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1;
1820 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1821 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
1822 } 2213 }
1823 2214
1824 $self->{children}[1]->draw; 2215 $self->{children}[1]->draw;
… …
1827 2218
1828############################################################################# 2219#############################################################################
1829 2220
1830package CFClient::UI::Animator; 2221package CFClient::UI::Animator;
1831 2222
1832use SDL::OpenGL; 2223use CFClient::OpenGL;
1833 2224
1834our @ISA = CFClient::UI::Bin::; 2225our @ISA = CFClient::UI::Bin::;
1835 2226
1836sub moveto { 2227sub moveto {
1837 my ($self, $x, $y) = @_; 2228 my ($self, $x, $y) = @_;
… …
1875 2266
1876sub new { 2267sub new {
1877 my $class = shift; 2268 my $class = shift;
1878 2269
1879 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
1880 state => 0, 2271 state => 0,
1881 connect_activate => \&toggle_flopper, 2272 connect_activate => \&toggle_flopper,
1882 @_ 2273 @_
1883 ); 2274 );
1884 2275
1885 if ($self->{state}) { 2276 if ($self->{state}) {
… …
1906 $self->emit (changed => $self->{state}); 2297 $self->emit (changed => $self->{state});
1907} 2298}
1908 2299
1909############################################################################# 2300#############################################################################
1910 2301
2302package CFClient::UI::Tooltip;
2303
2304our @ISA = CFClient::UI::Bin::;
2305
2306use CFClient::OpenGL;
2307
2308sub new {
2309 my $class = shift;
2310
2311 $class->SUPER::new (
2312 @_,
2313 can_events => 0,
2314 )
2315}
2316
2317sub set_markup {
2318 my ($self, $text) = @_;
2319
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2321 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label});
2323}
2324
2325sub size_request {
2326 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331
2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339}
2340
2341sub _draw {
2342 my ($self) = @_;
2343
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375;
2346
2347 my ($w, $h) = @$self{qw(w h)};
2348
2349 glColor 1, 0.8, 0.4;
2350 glBegin GL_QUADS;
2351 glVertex 0 , 0;
2352 glVertex 0 , $h;
2353 glVertex $w, $h;
2354 glVertex $w, 0;
2355 glEnd;
2356
2357 glColor 0, 0, 0;
2358 glBegin GL_LINE_LOOP;
2359 glVertex 0 , 0;
2360 glVertex 0 , $h;
2361 glVertex $w, $h;
2362 glVertex $w, 0;
2363 glEnd;
2364
2365 glPopMatrix;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw;
2369}
2370
2371#############################################################################
2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
1911package CFClient::UI::Root; 2411package CFClient::UI::Root;
1912 2412
1913our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
1914 2414
1915use SDL::OpenGL; 2415use CFClient::OpenGL;
1916 2416
1917sub check_size { 2417sub check_size {
1918 my ($self) = @_; 2418 my ($self) = @_;
1919 2419
1920 $self->configure (0, 0, $::WITH, $::HEIGHT); 2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
1921} 2421}
1922 2422
1923sub size_request { 2423sub size_request {
1924 ($::WIDTH, $::HEIGHT) 2424 ($::WIDTH, $::HEIGHT)
1925} 2425}
… …
1927sub configure { 2427sub configure {
1928 my ($self, $x, $y, $w, $h) = @_; 2428 my ($self, $x, $y, $w, $h) = @_;
1929 2429
1930 $self->SUPER::configure ($x, $y, $w, $h); 2430 $self->SUPER::configure ($x, $y, $w, $h);
1931 2431
1932 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1933 for @{$self->{children}}; 2432 for my $child (@{$self->{children}}) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2437 $child->configure ($X, $Y, $W,$H);
2438 }
1934} 2439}
1935 2440
1936sub _topleft { 2441sub _topleft {
1937 my ($self, $x, $y) = @_; 2442 my ($self, $x, $y) = @_;
1938 2443
… …
1946 ::refresh (); 2451 ::refresh ();
1947} 2452}
1948 2453
1949sub add { 2454sub add {
1950 my ($self, $child) = @_; 2455 my ($self, $child) = @_;
2456
2457 # integerize window positions
2458 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y};
1951 2460
1952 $self->SUPER::add ($child); 2461 $self->SUPER::add ($child);
1953} 2462}
1954 2463
1955sub on_refresh { 2464sub on_refresh {
… …
1981############################################################################# 2490#############################################################################
1982 2491
1983package CFClient::UI; 2492package CFClient::UI;
1984 2493
1985$ROOT = new CFClient::UI::Root; 2494$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip;
1986 2496
19871 24971
1988 2498

Diff Legend

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