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.134 by root, Wed Apr 19 06:06:45 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17sub check_tooltip {
18 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) {
23 $TOOLTIP->{owner} = $widget;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
30
31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 }
41
42 return;
43 }
44 }
45 }
46
47 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner};
49}
14 50
15# class methods for events 51# class methods for events
16sub feed_sdl_key_down_event { 52sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
54 if $FOCUS;
18} 55}
19 56
20sub feed_sdl_key_up_event { 57sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
59 if $FOCUS;
22} 60}
23 61
24sub feed_sdl_button_down_event { 62sub feed_sdl_button_down_event {
25 my ($ev) = @_; 63 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 64 my ($x, $y) = ($ev->{x}, $ev->{y});
27 65
28 if (!$BUTTON_STATE) { 66 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 67 my $widget = $ROOT->find_widget ($x, $y);
30 68
31 $GRAB = $widget; 69 $GRAB = $widget;
32 $GRAB->update if $GRAB; 70 $GRAB->update if $GRAB;
33 }
34 71
72 check_tooltip;
73 }
74
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 76
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 if ($GRAB) {
78 ($x, $y) = $GRAB->coord2local ($x, $y);
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
38} 81}
39 82
40sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
41 my ($ev) = @_; 84 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
43 86
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 88
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 90
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 if ($GRAB) {
92 ($x, $y) = $GRAB->coord2local ($x, $y);
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
49 95
50 if (!$BUTTON_STATE) { 96 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 97 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 98 $grab->update if $grab;
53 $GRAB->update if $GRAB; 99 $GRAB->update if $GRAB;
100
101 check_tooltip;
54 } 102 }
55} 103}
56 104
57sub feed_sdl_motion_event { 105sub feed_sdl_motion_event {
58 my ($ev) = @_; 106 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 107 my ($x, $y) = ($ev->{x}, $ev->{y});
60 108
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 109 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 110
63 if ($widget != $HOVER) { 111 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 112 my $hover = $HOVER; $HOVER = $widget;
65 113
66 $hover->update if $hover && $hover->{can_hover}; 114 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 115 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 116
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 117 check_tooltip;
118 }
119
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
123 }
71} 124}
72 125
73# convert position array to integers 126# convert position array to integers
74sub harmonize { 127sub harmonize {
75 my ($vals) = @_; 128 my ($vals) = @_;
… …
87 140
88package CFClient::UI::Base; 141package CFClient::UI::Base;
89 142
90use strict; 143use strict;
91 144
92use SDL::OpenGL; 145use CFClient::OpenGL;
93 146
94sub new { 147sub new {
95 my $class = shift; 148 my $class = shift;
96 149
97 my $self = bless { 150 my $self = bless {
98 x => 0, 151 x => 0,
99 y => 0, 152 y => 0,
100 z => 0, 153 z => 0,
154 can_events => 1,
101 @_ 155 @_
102 }, $class; 156 }, $class;
103 157
104 for (keys %$self) { 158 for (keys %$self) {
105 if (/^connect_(.*)$/) { 159 if (/^connect_(.*)$/) {
… …
108 } 162 }
109 163
110 $self 164 $self
111} 165}
112 166
167sub destroy {
168 my ($self) = @_;
169
170 $self->hide;
171 %$self = ();
172}
173
113sub show { 174sub show {
114 my ($self) = @_; 175 my ($self) = @_;
115 176
116 return if $self->{parent}; 177 return if $self->{parent};
117 178
… …
119} 180}
120 181
121sub hide { 182sub hide {
122 my ($self) = @_; 183 my ($self) = @_;
123 184
124 return unless $self->{parent}; 185 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self;
125 187
126 $self->{parent}->remove ($self); 188 $self->{parent}->remove ($self)
189 if $self->{parent};
127} 190}
128 191
129sub move { 192sub move {
130 my ($self, $x, $y, $z) = @_; 193 my ($self, $x, $y, $z) = @_;
131 194
… …
134 $self->{z} = $z if defined $z; 197 $self->{z} = $z if defined $z;
135 198
136 $self->update; 199 $self->update;
137} 200}
138 201
139sub needs_redraw { 202sub set_size {
140 0 203 my ($self, $w, $h) = @_;
204
205 $self->{user_w} = $w;
206 $self->{user_h} = $h;
207
208 $self->check_size;
141} 209}
142 210
143sub size_request { 211sub size_request {
144 require Carp; 212 require Carp;
145 Carp::confess "size_request is abtract"; 213 Carp::confess "size_request is abstract";
146} 214}
147 215
148sub configure { 216sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 217 my ($self, $x, $y, $w, $h) = @_;
150 218
219 if ($self->{aspect}) {
220 my $w2 = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect};
222
223 # use alignment to adjust x, y
224
225 $x += int +($w - $w2) * 0.5;
226 $y += int +($h - $h2) * 0.5;
227
228 ($w, $h) = ($w2, $h2);
229 }
230
231 if ($self->{x} != $x || $self->{y} != $y) {
151 $self->{x} = $x; 232 $self->{x} = $x;
152 $self->{y} = $y; 233 $self->{y} = $y;
153
154 return unless $self->{w} != $w || $self->{h} != $h;
155
156 $self->{w} = $w;
157 $self->{h} = $h;
158
159 $self->size_allocate ($w, $h);
160 $self->update; 234 $self->update;
235 }
236
237 if ($self->{w} != $w || $self->{h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
239 }
161} 240}
162 241
163sub size_allocate { 242sub size_allocate {
164 # nothing to be done 243 # nothing to be done
165} 244}
166 245
167# return top left coordinates 246sub children {
168sub _topleft { 247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
261sub set_max_size {
169 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
170 263
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
172} 266}
173 267
174# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
175sub coord2local { 269sub coord2local {
176 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
177 271
178 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
179 ($x - $X, $y - $Y)
180} 273}
181 274
182# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
183sub coord2global { 276sub coord2global {
184 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
185 278
186 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
187 ($x + $X, $y + $Y)
188} 280}
189 281
190sub focus_in { 282sub focus_in {
191 my ($self) = @_; 283 my ($self) = @_;
192 284
… …
252 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
253 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
254 glEnd; 346 glEnd;
255 glDisable GL_BLEND; 347 glDisable GL_BLEND;
256 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
257} 363}
258 364
259sub _draw { 365sub _draw {
260 my ($self) = @_; 366 my ($self) = @_;
261 367
262 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
263} 369}
264 370
265sub find_widget { 371sub find_widget {
266 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
267 375
268 return $self 376 return $self
269 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
271 379
… …
274 382
275sub set_parent { 383sub set_parent {
276 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
277 385
278 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
279} 390}
280 391
281sub check_size { 392sub check_size {
282 my ($self) = @_; 393 my ($self) = @_;
283 394
284 my ($w, $h) = $self->size_request; 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
285
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
293} 396}
294 397
295sub update { 398sub update {
296 my ($self) = @_; 399 my ($self) = @_;
297 400
… …
306} 409}
307 410
308sub emit { 411sub emit {
309 my ($self, $signal, @args) = @_; 412 my ($self, $signal, @args) = @_;
310 413
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312 $cb->($self, @args);
313 }
314} 415}
315 416
316sub DESTROY { 417sub DESTROY {
317 my ($self) = @_; 418 my ($self) = @_;
318 419
… …
324package CFClient::UI::DrawBG; 425package CFClient::UI::DrawBG;
325 426
326our @ISA = CFClient::UI::Base::; 427our @ISA = CFClient::UI::Base::;
327 428
328use strict; 429use strict;
329use SDL::OpenGL; 430use CFClient::OpenGL;
330 431
331sub new { 432sub new {
332 my $class = shift; 433 my $class = shift;
333 434
334 # range [value, low, high, page] 435 # range [value, low, high, page]
… …
363 464
364package CFClient::UI::Empty; 465package CFClient::UI::Empty;
365 466
366our @ISA = CFClient::UI::Base::; 467our @ISA = CFClient::UI::Base::;
367 468
469sub new {
470 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg);
472}
473
368sub size_request { 474sub size_request {
369 (0, 0) 475 (0, 0)
370} 476}
371 477
372sub draw { } 478sub draw { }
… …
380sub new { 486sub new {
381 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
382 488
383 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
384 490
385 my $self = $class->SUPER::new (children => [], %arg); 491 my $self = $class->SUPER::new (
492 children => [],
493 can_events => 0,
494 %arg,
495 );
386 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
387 497
388 $self 498 $self
389} 499}
390 500
391sub add { 501sub add {
392 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
393 503
394 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
395 506
396 use sort 'stable'; 507 use sort 'stable';
397 508
398 $self->{children} = [ 509 $self->{children} = [
399 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
400 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
401 ]; 512 ];
402 513
403 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
404} 520}
405 521
406sub remove { 522sub remove {
407 my ($self, $child) = @_; 523 my ($self, $child) = @_;
408 524
409 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
410 527
411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412 529
413 $self->check_size; 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
544
545 $self->check_size;
546 $self->update;
414} 547}
415 548
416sub find_widget { 549sub find_widget {
417 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
418 551
… …
482 615
483package CFClient::UI::Window; 616package CFClient::UI::Window;
484 617
485our @ISA = CFClient::UI::Bin::; 618our @ISA = CFClient::UI::Bin::;
486 619
487use SDL::OpenGL; 620use CFClient::OpenGL;
488 621
489sub new { 622sub new {
490 my ($class, %arg) = @_; 623 my ($class, %arg) = @_;
491 624
492 my $self = $class->SUPER::new (%arg); 625 my $self = $class->SUPER::new (%arg);
493} 626}
494 627
495sub update { 628sub update {
496 my ($self) = @_; 629 my ($self) = @_;
497 630
498 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
499 $self->render_chld;
500 $self->SUPER::update; 632 $self->SUPER::update;
501}
502
503sub render_chld {
504 my ($self) = @_;
505
506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
507 glClearColor 0, 0, 0, 1;
508 glClear GL_COLOR_BUFFER_BIT;
509 $self->child->draw;
510 };
511} 633}
512 634
513sub size_allocate { 635sub size_allocate {
514 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
515 637
516 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
517 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
518 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
519} 662}
520 663
521sub _draw { 664sub _draw {
522 my ($self) = @_; 665 my ($self) = @_;
523 666
524 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
525 668
526 my $tex = $self->{texture} 669 my $tex = $self->{texture}
527 or return; 670 or return;
671
672 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
675
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677
678 glDisable GL_TEXTURE_2D;
679}
680
681#############################################################################
682
683package CFClient::UI::ViewPort;
684
685our @ISA = CFClient::UI::Window::;
686
687sub size_request {
688 my ($self) = @_;
689
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692
693 @$self{qw(child_w child_h)}
694}
695
696sub size_allocate {
697 my ($self, $w, $h) = @_;
698
699 $self->update;
700}
701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
528 807
529 glEnable GL_BLEND; 808 glEnable GL_BLEND;
530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
531 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
533 812
534 $tex->draw_quad (0, 0, $w, $h); 813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
535 820
821
822 $self->child->draw;
536 glDisable GL_BLEND; 823 glDisable GL_BLEND;
537 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
538} 825}
539 826
540############################################################################# 827#############################################################################
541 828
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; 829package CFClient::UI::FancyFrame;
567 830
568our @ISA = CFClient::UI::Bin::; 831our @ISA = CFClient::UI::Bin::;
569 832
570use SDL::OpenGL; 833use 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 834
614my @tex = 835my @tex =
615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 836 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); 837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617 838
618sub new { 839sub new {
619 my $class = shift; 840 my $class = shift;
620 841
621 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
622 843
623 $class->SUPER::new ( 844 my $self = $class->SUPER::new (
624 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
626 border => 0.8, 847 border => 0.6,
848 can_events => 1,
627 @_ 849 @_
628 ) 850 );
851
852 $self->{title} &&= new CFClient::UI::Label
853 align => 0,
854 valign => 1,
855 text => $self->{title},
856 fontsize => $self->{border};
857
858 $self
629} 859}
630 860
631sub border { 861sub border {
632 int $_[0]{border} * $::FONTSIZE 862 int $_[0]{border} * $::FONTSIZE
633} 863}
634 864
635sub size_request { 865sub size_request {
636 my ($self) = @_; 866 my ($self) = @_;
637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639 867
640 my ($w, $h) = $self->SUPER::size_request; 868 my ($w, $h) = $self->SUPER::size_request;
641 869
642 ( 870 (
643 $w + $self->border * 2, 871 $w + $self->border * 2,
… …
649 my ($self, $w, $h) = @_; 877 my ($self, $w, $h) = @_;
650 878
651 $h -= List::Util::max 0, $self->border * 2; 879 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2; 880 $w -= List::Util::max 0, $self->border * 2;
653 881
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
654 $self->child->configure ($self->border, $self->border, $w, $h); 885 $self->child->configure ($self->border, $self->border, $w, $h);
655} 886}
656 887
657sub button_down { 888sub button_down {
658 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
659 890
891 my ($w, $h) = @$self{qw(w h)};
660 my $border = $self->border; 892 my $border = $self->border;
661 893
662 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
663 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
664 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
666 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
901
902 my $mx = $x < $border;
903 my $my = $y < $border;
667 904
668 $self->{motion} = sub { 905 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
670 907
671 ($x, $y) = ($ev->motion_x, $ev->motion_y); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
672 910
673 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
674 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
675 $self->check_size; 914 $self->check_size;
676 }; 915 };
677 916
678 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
679 && $y >= 0 && $y < $border) {
680
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
682 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
683 920
684 $self->{motion} = sub { 921 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
686 923
687 ($x, $y) = ($ev->motion_x, $ev->motion_y); 924 ($x, $y) = ($ev->{x}, $ev->{y});
688 925
689 $self->move ($bx + $x - $ox, $by + $y - $oy); 926 $self->move ($bx + $x - $ox, $by + $y - $oy);
690 $self->update; 927 $self->update;
691 }; 928 };
692 } 929 }
… …
721 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
722 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
724 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
725 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
726 my $bg = $tex[0]; 964 my $bg = $tex[0];
727 965
728 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
729 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
730 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
731 969
732 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
733 971
734 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
738 976
739 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
740 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
980
981 $self->{title}->draw if $self->{title};
741 982
742 $self->child->draw; 983 $self->child->draw;
743} 984}
744 985
745############################################################################# 986#############################################################################
… …
748 989
749our @ISA = CFClient::UI::Base::; 990our @ISA = CFClient::UI::Base::;
750 991
751use List::Util qw(max sum); 992use List::Util qw(max sum);
752 993
753use SDL::OpenGL; 994use CFClient::OpenGL;
754 995
755sub new { 996sub new {
756 my $class = shift; 997 my $class = shift;
757 998
758 $class->SUPER::new ( 999 $class->SUPER::new (
… …
768 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
769 1010
770 $child->check_size; 1011 $child->check_size;
771} 1012}
772 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
773# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
774sub clear { 1019sub clear {
775 my ($self) = @_; 1020 my ($self) = @_;
776 1021
1022 my @children = $self->children;
777 delete $self->{children}; 1023 delete $self->{children};
1024
1025 for (@children) {
1026 delete $_->{parent};
1027 $_->hide;
1028 }
1029
778 $self->update; 1030 $self->update;
779} 1031}
780 1032
781sub get_wh { 1033sub get_wh {
782 my ($self) = @_; 1034 my ($self) = @_;
… …
788 or next; 1040 or next;
789 1041
790 for my $x (0 .. $#$row) { 1042 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x] 1043 my $widget = $row->[$x]
792 or next; 1044 or next;
793 my ($w, $h) = $widget->size_request; 1045 my ($w, $h) = @$widget{qw(req_w req_h)};
794 1046
795 $w[$x] = max $w[$x], $w; 1047 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h; 1048 $h[$y] = max $h[$y], $h;
797 } 1049 }
798 } 1050 }
… …
903 1155
904 ($h, $w) = ($w, $h); 1156 ($h, $w) = ($w, $h);
905 1157
906 my $children = $self->{children}; 1158 my $children = $self->{children};
907 1159
908 my @h = map +($_->size_request)[0], @$children; 1160 my @h = map $_->{req_w}, @$children;
909 1161
910 my $req_h = List::Util::sum @h; 1162 my $req_h = List::Util::sum @h;
911 1163
912 if ($req_h > $h) { 1164 if ($req_h > $h) {
913 # ah well, not enough space 1165 # ah well, not enough space
… …
959} 1211}
960 1212
961sub size_allocate { 1213sub size_allocate {
962 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
963 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
964 my $children = $self->{children}; 1218 my $children = $self->{children};
965 1219
966 my @h = map +($_->size_request)[1], @$children; 1220 my @h = map $_->{req_h}, @$children;
967 1221
968 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
969 1223
970 if ($req_h > $h) { 1224 if ($req_h > $h) {
971 # ah well, not enough space 1225 # ah well, not enough space
… …
999 1253
1000package CFClient::UI::Label; 1254package CFClient::UI::Label;
1001 1255
1002our @ISA = CFClient::UI::Base::; 1256our @ISA = CFClient::UI::Base::;
1003 1257
1004use SDL::OpenGL; 1258use CFClient::OpenGL;
1005 1259
1006sub new { 1260sub new {
1007 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1008 1262
1009 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1011 fontsize => 1, 1269 fontsize => 1,
1012 text => "",
1013 align => -1, 1270 align => -1,
1014 valign => -1, 1271 valign => -1,
1015 padding => 2, 1272 padding => 2,
1016 layout => new CFClient::Layout, 1273 can_events => 0,
1017 %arg 1274 %arg
1018 ); 1275 );
1019 1276
1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1277 if (exists $self->{template}) {
1278 my $layout = new CFClient::Layout;
1279 $layout->set_text (delete $self->{template});
1280 $self->{template} = $layout;
1281 }
1021 1282
1022 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1024 1288
1025 $self 1289 $self
1026} 1290}
1027 1291
1028sub escape_text { 1292sub escape {
1029 local $_ = $_[1]; 1293 local $_ = $_[1];
1030 1294
1031 s/&/&amp;/g; 1295 s/&/&amp;/g;
1032 s/>/&gt;/g; 1296 s/>/&gt;/g;
1033 s/</&lt;/g; 1297 s/</&lt;/g;
1034 1298
1035 $_[1] 1299 $_[1]
1036} 1300}
1037 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1038sub set_text { 1309sub set_text {
1039 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1040 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1041 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1042 1317
1043 delete $self->{texture};
1044 $self->update; 1318 $self->update;
1319 $self->check_size;
1045} 1320}
1046 1321
1047sub set_markup { 1322sub set_markup {
1048 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1049 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1050 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1051 1332
1052 delete $self->{texture};
1053 $self->update; 1333 $self->update;
1334 $self->check_size;
1054} 1335}
1055 1336
1056sub size_request { 1337sub size_request {
1057 my ($self) = @_; 1338 my ($self) = @_;
1058 1339
1059 $self->{layout}->set_width; 1340 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1);
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061 1343
1062 my ($w, $h) = $self->{layout}->size; 1344 my ($w, $h) = $self->{layout}->size;
1345
1346 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font};
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349
1350 my ($w2, $h2) = $self->{template}->size;
1351
1352 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2;
1354 }
1063 1355
1064 ( 1356 (
1065 $w + $self->{padding} * 2, 1357 $w + $self->{padding} * 2,
1066 $h + $self->{padding} * 2, 1358 $h + $self->{padding} * 2,
1067 ) 1359 )
… …
1071 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1072 1364
1073 delete $self->{texture}; 1365 delete $self->{texture};
1074} 1366}
1075 1367
1368sub set_fontsize {
1369 my ($self, $fontsize) = @_;
1370
1371 $self->{fontsize} = $fontsize;
1372 delete $self->{texture};
1373
1374 $self->update;
1375 $self->check_size;
1376}
1377
1076sub _draw { 1378sub _draw {
1077 my ($self) = @_; 1379 my ($self) = @_;
1078 1380
1079 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1080 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1082 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1083 }; 1398 };
1084 1399
1085 glEnable GL_BLEND;
1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1087 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1089 1402
1403 if ($tex->{format} == GL_ALPHA) {
1090 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1091
1092 $self->{ox} = int (
1093 $self->{align} < 0 ? $self->{padding}
1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
1097
1098 $self->{oy} = int (
1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1105 1409
1106 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1107 glDisable GL_BLEND;
1108} 1411}
1109 1412
1110############################################################################# 1413#############################################################################
1111 1414
1112package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
1113 1416
1114our @ISA = CFClient::UI::Label::; 1417our @ISA = CFClient::UI::Label::;
1115 1418
1116use SDL; 1419use CFClient::OpenGL;
1117use SDL::OpenGL;
1118 1420
1119sub new { 1421sub new {
1120 my $class = shift; 1422 my $class = shift;
1121 1423
1122 $class->SUPER::new ( 1424 $class->SUPER::new (
1123 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1124 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1125 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1126 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1127 can_hover => 1, 1429 can_hover => 1,
1128 can_focus => 1, 1430 can_focus => 1,
1129 valign => 0, 1431 valign => 0,
1432 can_events => 1,
1130 @_ 1433 @_
1131 ) 1434 )
1132} 1435}
1133 1436
1134sub _set_text { 1437sub _set_text {
… …
1147 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1148 1451
1149 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1150} 1453}
1151 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1152sub get_text { 1464sub get_text {
1153 $_[0]{text} 1465 $_[0]{text}
1154} 1466}
1155 1467
1156sub size_request { 1468sub size_request {
… …
1162} 1474}
1163 1475
1164sub size_allocate { 1476sub size_allocate {
1165 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1166 1478
1167 $self->_set_text ($self->{text}); 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1168}
1169
1170sub set_text {
1171 my ($self, $text) = @_;
1172
1173 $self->{cursor} = length $text;
1174 $self->_set_text ($text);
1175 $self->update;
1176} 1480}
1177 1481
1178sub key_down { 1482sub key_down {
1179 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1180 1484
1181 my $mod = $ev->key_mod; 1485 my $mod = $ev->{mod};
1182 my $sym = $ev->key_sym; 1486 my $sym = $ev->{sym};
1183
1184 my $uni = $ev->key_unicode; 1487 my $uni = $ev->{unicode};
1185 1488
1186 my $text = $self->get_text; 1489 my $text = $self->get_text;
1187 1490
1188 if ($sym == SDLK_BACKSPACE) { 1491 if ($sym == 8) {
1189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1190 } elsif ($sym == SDLK_DELETE) { 1493 } elsif ($sym == 127) {
1191 substr $text, $self->{cursor}, 1, ""; 1494 substr $text, $self->{cursor}, 1, "";
1192 } elsif ($sym == SDLK_LEFT) { 1495 } elsif ($sym == CFClient::SDLK_LEFT) {
1193 --$self->{cursor} if $self->{cursor}; 1496 --$self->{cursor} if $self->{cursor};
1194 } elsif ($sym == SDLK_RIGHT) { 1497 } elsif ($sym == CFClient::SDLK_RIGHT) {
1195 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1498 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1196 } elsif ($sym == SDLK_HOME) { 1499 } elsif ($sym == CFClient::SDLK_HOME) {
1197 $self->{cursor} = 0; 1500 $self->{cursor} = 0;
1198 } elsif ($sym == SDLK_END) { 1501 } elsif ($sym == CFClient::SDLK_END) {
1199 $self->{cursor} = length $text; 1502 $self->{cursor} = length $text;
1200 } elsif ($sym == SDLK_ESCAPE) { 1503 } elsif ($sym == 27) {
1201 $self->emit ('escape'); 1504 $self->emit ('escape');
1202 } elsif ($uni) { 1505 } elsif ($uni) {
1203 substr $text, $self->{cursor}++, 0, chr $uni; 1506 substr $text, $self->{cursor}++, 0, chr $uni;
1204 } 1507 }
1205 1508
… …
1280 1583
1281package CFClient::UI::Entry; 1584package CFClient::UI::Entry;
1282 1585
1283our @ISA = CFClient::UI::EntryBase::; 1586our @ISA = CFClient::UI::EntryBase::;
1284 1587
1285use SDL; 1588use CFClient::OpenGL;
1286use SDL::OpenGL;
1287 1589
1288sub key_down { 1590sub key_down {
1289 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1290 1592
1291 my $sym = $ev->key_sym; 1593 my $sym = $ev->{sym};
1292 1594
1293 if ($sym == SDLK_RETURN) { 1595 if ($sym == 13) {
1596 unshift @{$self->{history}},
1597 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1294 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1295 $self->update; 1601 $self->update;
1602
1603 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text;
1606 }
1607 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++;
1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 }
1614
1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1616 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618
1619 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else {
1622 $self->set_text ($self->{history_saveback});
1623 }
1296 1624
1297 } else { 1625 } else {
1298 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1299 } 1627 }
1300 1628
… …
1304 1632
1305package CFClient::UI::Button; 1633package CFClient::UI::Button;
1306 1634
1307our @ISA = CFClient::UI::Label::; 1635our @ISA = CFClient::UI::Label::;
1308 1636
1309use SDL; 1637use CFClient::OpenGL;
1310use SDL::OpenGL;
1311 1638
1312my @tex = 1639my @tex =
1313 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1640 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314 qw(b1_button_active.png); 1641 qw(b1_button_active.png);
1315 1642
1316sub new { 1643sub new {
1317 my $class = shift; 1644 my $class = shift;
1318 1645
1319 $class->SUPER::new ( 1646 $class->SUPER::new (
1320 padding => 4, 1647 padding => 4,
1321 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1322 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1323 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1324 can_hover => 1, 1651 can_hover => 1,
1325 align => 0, 1652 align => 0,
1326 valign => 0, 1653 valign => 0,
1654 can_events => 1,
1327 @_ 1655 @_
1328 ) 1656 )
1329} 1657}
1330 1658
1331sub button_up { 1659sub button_up {
… …
1344 1672
1345 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1346 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1347 } 1675 }
1348 1676
1349 glEnable GL_BLEND;
1350 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1351 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1353 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1354 1680
1355 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1356 1682
1357 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1358 glDisable GL_BLEND;
1359 1684
1360 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1361} 1686}
1362 1687
1363############################################################################# 1688#############################################################################
… …
1365package CFClient::UI::CheckBox; 1690package CFClient::UI::CheckBox;
1366 1691
1367our @ISA = CFClient::UI::DrawBG::; 1692our @ISA = CFClient::UI::DrawBG::;
1368 1693
1369my @tex = 1694my @tex =
1370 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1695 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1371 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1696 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1372 1697
1373use SDL; 1698use CFClient::OpenGL;
1374use SDL::OpenGL;
1375 1699
1376sub new { 1700sub new {
1377 my $class = shift; 1701 my $class = shift;
1378 1702
1379 $class->SUPER::new ( 1703 $class->SUPER::new (
… …
1411 1735
1412 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1413 1737
1414 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1415 1739
1416 glEnable GL_BLEND;
1417 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419 1741
1420 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1421 1743
1422 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1423 1745
1424 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1747}
1748
1749#############################################################################
1750
1751package CFClient::UI::Image;
1752
1753our @ISA = CFClient::UI::Base::;
1754
1755use CFClient::OpenGL;
1756use Carp qw/confess/;
1757
1758our %loaded_images;
1759
1760sub new {
1761 my $class = shift;
1762
1763 my $self = $class->SUPER::new (can_events => 0, @_);
1764
1765 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1766
1767 $loaded_images{$self->{image}} ||=
1768 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1769
1770 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1771
1772 Scalar::Util::weaken $loaded_images{$self->{image}};
1773
1774 $self->{aspect} = $tex->{w} / $tex->{h};
1775
1776 $self
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 ($self->{tex}->{w}, $self->{tex}->{h})
1783}
1784
1785sub _draw {
1786 my ($self) = @_;
1787
1788 my $tex = $self->{tex};
1789
1790 my ($w, $h) = ($self->{w}, $self->{h});
1791
1792 if ($self->{rot90}) {
1793 glRotate 90, 0, 0, 1;
1794 glTranslate 0, -$self->{w}, 0;
1795
1796 ($w, $h) = ($h, $w);
1797 }
1798
1799 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801
1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1803
1425 glDisable GL_BLEND; 1804 glDisable GL_TEXTURE_2D;
1426} 1805}
1427 1806
1428############################################################################# 1807#############################################################################
1429 1808
1430package CFClient::UI::VGauge; 1809package CFClient::UI::VGauge;
1431 1810
1432our @ISA = CFClient::UI::Base::; 1811our @ISA = CFClient::UI::Base::;
1433 1812
1434use SDL::OpenGL; 1813use List::Util qw(min max);
1814
1815use CFClient::OpenGL;
1435 1816
1436my %tex = ( 1817my %tex = (
1437 food => [ 1818 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1820 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ], 1821 ],
1441 grace => [ 1822 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1824 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1444 ], 1825 ],
1445 hp => [ 1826 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1827 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1828 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ], 1829 ],
1449 mana => [ 1830 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1831 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1832 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1452 ], 1833 ],
1453); 1834);
1454 1835
1455# eg. VGauge->new (gauge => 'food'), default gauge: food 1836# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1837sub new {
1457 my $class = shift; 1838 my $class = shift;
1458 1839
1459 my $self = $class->SUPER::new (gauge => 'food', @_); 1840 my $self = $class->SUPER::new (
1841 type => 'food',
1842 @_
1843 );
1844
1845 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1460 1846
1461 $self 1847 $self
1462} 1848}
1463 1849
1464sub size_request { 1850sub size_request {
1465 my ($self) = @_; 1851 my ($self) = @_;
1466 1852
1467 my $tex = $tex{$self->{gauge}}[0]; 1853 #my $tex = $tex{$self->{type}}[0];
1468
1469 @$tex{qw(w h)} 1854 #@$tex{qw(w h)}
1855 (0, 0)
1470} 1856}
1471 1857
1472sub set_max { 1858sub set_max {
1473 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1474 1860
1861 return if $self->{max_val} == $max;
1862
1475 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1476} 1865}
1477 1866
1478sub set_value { 1867sub set_value {
1479 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1480 1869
1481 $self->set_max ($max) 1870 $self->set_max ($max)
1482 if defined $max; 1871 if defined $max;
1483 1872
1484 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1485 $self->{val} = $val; 1875 $self->{val} = $val;
1486
1487 $self->update; 1876 $self->update;
1488} 1877}
1489 1878
1490sub _draw { 1879sub _draw {
1491 my ($self) = @_; 1880 my ($self) = @_;
1492 1881
1493 my $tex = $tex{$self->{gauge}}; 1882 my $tex = $tex{$self->{type}};
1883 my ($t1, $t2, $t3) = @$tex;
1494 1884
1495 my ($w, $h) = ($self->{w}, $self->{h}); 1885 my ($w, $h) = ($self->{w}, $self->{h});
1496 1886
1887 if ($self->{vertical}) {
1888 glRotate 90, 0, 0, 1;
1889 glTranslate 0, -$self->{w}, 0;
1890
1891 ($w, $h) = ($h, $w);
1892 }
1893
1497 my $ycut = $self->{val} / ($self->{max_val} || 1); 1894 my $ycut = $self->{val} / ($self->{max_val} || 1);
1498 $ycut = 1 if $self->{val} > $self->{max_val};
1499 1895
1500 my $t1 = $tex->[0]; 1896 my $ycut1 = max 0, min 1, $ycut;
1501 my $t2 = $tex->[1]; 1897 my $ycut2 = max 0, min 1, $ycut - 1;
1898
1899 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2);
1502 1901
1503 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1504 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1505 glEnable GL_TEXTURE_2D; 1904 glEnable GL_TEXTURE_2D;
1506 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1507 1906
1508 my $h1 = $self->{h} - $ycut * $self->{h};
1509 my $h2 = $ycut * $self->{h};
1510
1511 my $yp = 0;
1512
1513 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1907 glBindTexture GL_TEXTURE_2D, $t1->{name};
1514 glBegin GL_QUADS; 1908 glBegin GL_QUADS;
1515 glTexCoord 0 , 0; glVertex 0 , $yp; 1909 glTexCoord 0 , 0; glVertex 0 , 0;
1516 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1910 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1517 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1911 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1518 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1912 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1519 glEnd; 1913 glEnd;
1520 1914
1521 $yp += $h1; 1915 my $ycut1 = List::Util::min 1, $ycut;
1522
1523 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t2->{name};
1524 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1525 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1526 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1919 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; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1921 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1529 glEnd; 1922 glEnd;
1923
1924 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd;
1932 }
1530 1933
1531 glDisable GL_BLEND; 1934 glDisable GL_BLEND;
1532 glDisable GL_TEXTURE_2D; 1935 glDisable GL_TEXTURE_2D;
1533} 1936}
1534 1937
1535############################################################################# 1938#############################################################################
1536 1939
1940package CFClient::UI::Gauge;
1941
1942our @ISA = CFClient::UI::VBox::;
1943
1944sub new {
1945 my ($class, %arg) = @_;
1946
1947 my $self = $class->SUPER::new (
1948 tooltip => $arg{type},
1949 can_hover => 1,
1950 can_events => 1,
1951 %arg,
1952 );
1953
1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1956 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1957
1958 $self
1959}
1960
1961sub set_fontsize {
1962 my ($self, $fsize) = @_;
1963
1964 $self->{value}->set_fontsize ($fsize);
1965 $self->{max} ->set_fontsize ($fsize);
1966}
1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1975sub set_value {
1976 my ($self, $val, $max) = @_;
1977
1978 $self->set_max ($max)
1979 if defined $max;
1980
1981 $self->{gauge}->set_value ($val, $max);
1982 $self->{value}->set_text ($val);
1983}
1984
1985#############################################################################
1986
1537package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
1538 1988
1539use strict; 1989use strict;
1540 1990
1541use SDL::OpenGL; 1991use CFClient::OpenGL;
1542 1992
1543our @ISA = CFClient::UI::DrawBG::; 1993our @ISA = CFClient::UI::DrawBG::;
1544 1994
1545my @tex = 1995my @tex =
1546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1556 # TODO: calculations are off 2006 # TODO: calculations are off
1557 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1558 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1559 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1560 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1561 req_w => 20, 2011 req_w => $::WIDTH / 80,
1562 req_h => 20, 2012 req_h => $::WIDTH / 80,
1563 vertical => 0, 2013 vertical => 0,
1564 can_hover => 1, 2014 can_hover => 1,
1565 inner_pad => 5, 2015 inner_pad => 5,
1566 @_ 2016 @_
1567 ); 2017 );
… …
1650 $page ||= 2; 2100 $page ||= 2;
1651 2101
1652 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1653 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1654 2104
1655 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2107
1660 # draw background 2108 # draw background
1661 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1662 2110
1663 # draw handle 2111 # draw handle
1664 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1665 2113
1666 glDisable GL_BLEND;
1667 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1668} 2115}
1669 2116
1670############################################################################# 2117#############################################################################
1671 2118
1672package CFClient::UI::TextView; 2119package CFClient::UI::TextView;
1673 2120
1674our @ISA = CFClient::UI::HBox::; 2121our @ISA = CFClient::UI::HBox::;
1675 2122
1676use SDL::OpenGL; 2123use CFClient::OpenGL;
1677 2124
1678sub new { 2125sub new {
1679 my $class = shift; 2126 my $class = shift;
1680 2127
1681 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
1682 fontsize => 1, 2129 fontsize => 1,
2130 can_events => 0,
2131 #font => default_font
1683 @_, 2132 @_,
1684 2133
1685 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
1686 par => [], 2135 par => [],
1687 height => 0, 2136 height => 0,
1688 children => [ 2137 children => [
1689 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
1690 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
1691 ], 2140 ],
1692 ); 2141 );
1693 2142
1694 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
1695 $self->update;
1696 });
1697 2144
1698 $self 2145 $self
1699} 2146}
1700 2147
1701sub set_fontsize { 2148sub set_fontsize {
… …
1709 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
1710 2157
1711 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
1712 2159
1713 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1714 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
1715 $layout->set_text ($text); 2162 $layout->set_markup ($text);
1716 2163
1717 ($layout->size)[1] 2164 ($layout->size)[1]
1718} 2165}
1719 2166
1720sub reflow { 2167sub reflow {
… …
1727sub size_allocate { 2174sub size_allocate {
1728 my ($self, $w, $h) = @_; 2175 my ($self, $w, $h) = @_;
1729 2176
1730 $self->SUPER::size_allocate ($w, $h); 2177 $self->SUPER::size_allocate ($w, $h);
1731 2178
2179 $self->{layout}->set_font ($self->{font}) if $self->{font};
1732 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2180 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1733 $self->{layout}->set_width ($self->{children}[0]{w}); 2181 $self->{layout}->set_width ($self->{children}[0]{w});
1734 2182
1735 $self->reflow; 2183 $self->reflow;
1736} 2184}
… …
1771 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1772 2220
1773 delete $self->{texture}; 2221 delete $self->{texture};
1774 } 2222 }
1775 2223
1776 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1777 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
1778 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
1779 2227
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784 2230
1785 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
1786 2232
… …
1789 2235
1790 my $y = 0; 2236 my $y = 0;
1791 2237
1792 my $layout = $self->{layout}; 2238 my $layout = $self->{layout};
1793 2239
2240 $layout->set_font ($self->{font}) if $self->{font};
2241
1794 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
1795 my $h = $par->[0]; 2243 my $h = $par->[0];
1796 2244
1797 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
1798 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
1799 2248
1800 glColor @{ $par->[1] };
1801 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
1802 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1803 } 2251 }
1804 2252
1805 $y += $h; 2253 $y += $h;
1806 } 2254 }
1807 2255
1808 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
1809 glDisable GL_BLEND;
1810 }; 2257 };
1811 }); 2258 });
1812} 2259}
1813 2260
1814sub _draw { 2261sub _draw {
1815 my ($self) = @_; 2262 my ($self) = @_;
1816 2263
1817 if ($self->{texture}) {
1818 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1820 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2266 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1821 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
1822 }
1823 2269
1824 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
1825 2271
1826} 2272}
1827 2273
1828############################################################################# 2274#############################################################################
1829 2275
1830package CFClient::UI::MapWidget;
1831
1832use strict;
1833
1834use List::Util qw(min max);
1835
1836use SDL;
1837use SDL::OpenGL;
1838
1839our @ISA = CFClient::UI::Base::;
1840
1841sub new {
1842 my $class = shift;
1843
1844 $class->SUPER::new (
1845 z => -1,
1846 can_focus => 1,
1847 list => (glGenLists 1),
1848 @_
1849 )
1850}
1851
1852sub key_down {
1853 print "MAPKEYDOWN\n";
1854}
1855
1856sub key_up {
1857}
1858
1859sub button_down {
1860 my ($self, $ev, $x, $y) = @_;
1861
1862 $self->focus_in;
1863
1864 if ($ev->button == 2) {
1865 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1866 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1867
1868 $self->{motion} = sub {
1869 my ($ev, $x, $y) = @_;
1870
1871 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1872
1873 $::CFG->{map_shift_x} = $bw + $x - $ox;
1874 $::CFG->{map_shift_y} = $bh + $y - $oy;
1875
1876 $self->update;
1877 };
1878 }
1879}
1880
1881sub button_up {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 delete $self->{motion};
1885}
1886
1887sub mouse_motion {
1888 my ($self, $ev, $x, $y) = @_;
1889
1890 $self->{motion}->($ev, $x, $y) if $self->{motion};
1891}
1892
1893sub size_request {
1894 (
1895 1 + 32 * int $::WIDTH / 32,
1896 1 + 32 * int $::HEIGHT / 32,
1897 )
1898}
1899
1900sub update {
1901 my ($self) = @_;
1902
1903 $self->{need_update} = 1;
1904 $self->SUPER::update;
1905}
1906
1907sub draw {
1908 my ($self) = @_;
1909
1910 if (delete $self->{need_update}) {
1911 glNewList $self->{list}, GL_COMPILE;
1912
1913 if ($::MAP) {
1914 my $sw = int $::WIDTH / 32;
1915 my $sh = int $::HEIGHT / 32;
1916
1917 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1918 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1919
1920 glTranslate $sx0 - 32, $sy0 - 32, 0;
1921
1922 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1923
1924 if ($::CFG->{fow_enable}) {
1925 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1926 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1927 glConvolutionFilter2D (
1928 GL_CONVOLUTION_2D,
1929 GL_ALPHA,
1930 3, 3,
1931 GL_ALPHA, GL_FLOAT,
1932 pack "f*",
1933 0.1, 0.1, 0.1,
1934 0.1, 0.2, 0.1,
1935 0.1, 0.1, 0.1,
1936 );
1937 glEnable GL_CONVOLUTION_2D;
1938 }
1939
1940 $self->{fow_texture} = new CFClient::Texture
1941 w => $w,
1942 h => $h,
1943 data => $data,
1944 internalformat => GL_ALPHA,
1945 format => GL_ALPHA;
1946
1947 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1948
1949 glEnable GL_BLEND;
1950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1951 glEnable GL_TEXTURE_2D;
1952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1953
1954 glColor +($::CFG->{fow_intensity}) x 3, 1;
1955 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1956
1957 glDisable GL_TEXTURE_2D;
1958 glDisable GL_BLEND;
1959 }
1960
1961 # HACK BEGIN
1962 {
1963 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1964 my ($w, $h) = (250, 250);
1965
1966 glEnable GL_BLEND;
1967 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1968 glEnable GL_TEXTURE_2D;
1969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1970
1971 $self->{mapmap_texture} =
1972 new CFClient::Texture
1973 w => $w,
1974 h => $h,
1975 data => $::MAP->mapmap ($w, $h),
1976 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1977
1978 $self->{mapmap_texture}->draw_quad (100, 100);
1979
1980 glDisable GL_TEXTURE_2D;
1981 glDisable GL_BLEND;
1982 }
1983 # HACK END
1984 }
1985
1986 glEndList;
1987 }
1988
1989 glPushMatrix;
1990 glCallList $self->{list};
1991 glPopMatrix;
1992
1993 if ($FOCUS != $self) {
1994 glColor 64/255, 64/255, 64/255;
1995 glLogicOp GL_AND;
1996 glEnable GL_COLOR_LOGIC_OP;
1997 glBegin GL_QUADS;
1998 glVertex 0, 0;
1999 glVertex 0, $::HEIGHT;
2000 glVertex $::WIDTH, $::HEIGHT;
2001 glVertex $::WIDTH, 0;
2002 glEnd;
2003 glDisable GL_COLOR_LOGIC_OP;
2004 }
2005}
2006
2007my %DIR = (
2008 SDLK_KP8, [1, "north"],
2009 SDLK_KP9, [2, "northeast"],
2010 SDLK_KP6, [3, "east"],
2011 SDLK_KP3, [4, "southeast"],
2012 SDLK_KP2, [5, "south"],
2013 SDLK_KP1, [6, "southwest"],
2014 SDLK_KP4, [7, "west"],
2015 SDLK_KP7, [8, "northwest"],
2016
2017 SDLK_UP, [1, "north"],
2018 SDLK_RIGHT, [3, "east"],
2019 SDLK_DOWN, [5, "south"],
2020 SDLK_LEFT, [7, "west"],
2021);
2022
2023sub key_down {
2024 my ($self, $ev) = @_;
2025
2026 my $mod = $ev->key_mod;
2027 my $sym = $ev->key_sym;
2028
2029 if ($sym == SDLK_KP5) {
2030 $::CONN->user_send ("stay fire");
2031 } elsif ($sym == SDLK_a) {
2032 $::CONN->user_send ("apply");
2033 } elsif ($sym == SDLK_QUOTE) {
2034 $self->emit ('activate_console');
2035 } elsif ($sym == SDLK_SLASH) {
2036 $self->emit ('activate_console' => '/');
2037 } elsif (exists $DIR{$sym}) {
2038 if ($mod & KMOD_SHIFT) {
2039 $self->{shft}++;
2040 $::CONN->user_send ("fire $DIR{$sym}[0]");
2041 } elsif ($mod & KMOD_CTRL) {
2042 $self->{ctrl}++;
2043 $::CONN->user_send ("run $DIR{$sym}[0]");
2044 } else {
2045 $::CONN->user_send ("$DIR{$sym}[1]");
2046 }
2047 }
2048}
2049
2050sub key_up {
2051 my ($self, $ev) = @_;
2052
2053 my $mod = $ev->key_mod;
2054 my $sym = $ev->key_sym;
2055
2056 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2057 $::CONN->user_send ("fire_stop");
2058 }
2059 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2060 $::CONN->user_send ("run_stop");
2061 }
2062}
2063
2064#############################################################################
2065
2066package CFClient::UI::Animator; 2276package CFClient::UI::Animator;
2067 2277
2068use SDL::OpenGL; 2278use CFClient::OpenGL;
2069 2279
2070our @ISA = CFClient::UI::Bin::; 2280our @ISA = CFClient::UI::Bin::;
2071 2281
2072sub moveto { 2282sub moveto {
2073 my ($self, $x, $y) = @_; 2283 my ($self, $x, $y) = @_;
… …
2111 2321
2112sub new { 2322sub new {
2113 my $class = shift; 2323 my $class = shift;
2114 2324
2115 my $self = $class->SUPER::new ( 2325 my $self = $class->SUPER::new (
2116 state => 0, 2326 state => 0,
2117 connect_activate => \&toggle_flopper, 2327 connect_activate => \&toggle_flopper,
2118 @_ 2328 @_
2119 ); 2329 );
2120 2330
2121 if ($self->{state}) { 2331 if ($self->{state}) {
… …
2142 $self->emit (changed => $self->{state}); 2352 $self->emit (changed => $self->{state});
2143} 2353}
2144 2354
2145############################################################################# 2355#############################################################################
2146 2356
2357package CFClient::UI::Tooltip;
2358
2359our @ISA = CFClient::UI::Bin::;
2360
2361use CFClient::OpenGL;
2362
2363sub new {
2364 my $class = shift;
2365
2366 $class->SUPER::new (
2367 @_,
2368 can_events => 0,
2369 )
2370}
2371
2372sub set_markup {
2373 my ($self, $text, $font) = @_;
2374
2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383}
2384
2385sub size_request {
2386 my ($self) = @_;
2387
2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2389
2390 ($w + 4, $h + 4)
2391}
2392
2393sub size_allocate {
2394 my ($self, $w, $h) = @_;
2395
2396 $self->SUPER::size_allocate ($w - 4, $h - 4);
2397}
2398
2399sub _draw {
2400 my ($self) = @_;
2401
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375;
2404
2405 my ($w, $h) = @$self{qw(w h)};
2406
2407 glColor 1, 0.8, 0.4;
2408 glBegin GL_QUADS;
2409 glVertex 0 , 0;
2410 glVertex 0 , $h;
2411 glVertex $w, $h;
2412 glVertex $w, 0;
2413 glEnd;
2414
2415 glColor 0, 0, 0;
2416 glBegin GL_LINE_LOOP;
2417 glVertex 0 , 0;
2418 glVertex 0 , $h;
2419 glVertex $w, $h;
2420 glVertex $w, 0;
2421 glEnd;
2422
2423 glPopMatrix;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw;
2427}
2428
2429#############################################################################
2430
2431package CFClient::UI::Face;
2432
2433our @ISA = CFClient::UI::Base::;
2434
2435use CFClient::OpenGL;
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 aspect => 1,
2442 @_,
2443 )
2444}
2445
2446sub size_request {
2447 (32, 8)
2448}
2449
2450sub _draw {
2451 my ($self) = @_;
2452
2453 return unless $::CONN;#d# manage and cache textures differently
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2455
2456 # TODO animation
2457 if ($tex) {
2458 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D;
2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2710}
2711
2712#############################################################################
2713
2147package CFClient::UI::Root; 2714package CFClient::UI::Root;
2148 2715
2149our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2150 2717
2151use SDL::OpenGL; 2718use CFClient::OpenGL;
2152 2719
2153sub check_size { 2720sub new {
2154 my ($self) = @_; 2721 my $class = shift;
2155 2722
2156 $self->configure (0, 0, $::WITH, $::HEIGHT); 2723 $class->SUPER::new (
2157} 2724 @_,
2158 2725 )
2159sub size_request {
2160 ($::WIDTH, $::HEIGHT)
2161} 2726}
2162 2727
2163sub configure { 2728sub configure {
2164 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2165 2730
2166 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2167 2732 $self->{h} = $h;
2168 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2169 for @{$self->{children}};
2170} 2733}
2171 2734
2172sub _topleft { 2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2767 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2772 $child->configure ($X, $Y, $W, $H);
2773 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2173 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2174 2781
2175 ($x, $y) 2782 ($x, $y)
2176} 2783}
2177 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2178sub update { 2791sub update {
2179 my ($self) = @_; 2792 my ($self) = @_;
2180 2793
2181 $self->check_size; 2794 $self->check_size;
2182 ::refresh (); 2795 $::WANT_REFRESH++;
2183} 2796}
2184 2797
2185sub add { 2798sub add {
2186 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2187 2800
2801 # integerise window positions
2802 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y};
2804
2188 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2189} 2806}
2190 2807
2191sub on_refresh { 2808sub on_refresh {
2192 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2193 2810
2194 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2195} 2812}
2196 2813
2197sub draw { 2814sub draw {
2198 my ($self) = @_; 2815 my ($self) = @_;
2199 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2200 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2201 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2202 } 2864 }
2203 2865
2204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2206 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;
… …
2217############################################################################# 2879#############################################################################
2218 2880
2219package CFClient::UI; 2881package CFClient::UI;
2220 2882
2221$ROOT = new CFClient::UI::Root; 2883$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip;
2222 2885
22231 28861
2224 2887

Diff Legend

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