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

Diff Legend

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