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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC

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

Diff Legend

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