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.130 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 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) = @_;
117 193
118 $self->{x} = int $x; 194 $self->{x} = int $x;
119 $self->{y} = int $y; 195 $self->{y} = int $y;
120 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
121 197
122 $self->update; 198 $self->update;
123} 199}
124 200
125sub needs_redraw { 201sub set_size {
126 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
127} 208}
128 209
129sub size_request { 210sub size_request {
130 require Carp; 211 require Carp;
131 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
132} 213}
133 214
134sub configure { 215sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
136 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) {
137 $self->{x} = $x; 231 $self->{x} = $x;
138 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update;
234 }
139 235
140 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
141 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
142 $self->{w} = $w; 238 }
143 $self->{h} = $h;
144
145 $self->size_allocate ($w, $h);
146} 239}
147 240
148sub size_allocate { 241sub size_allocate {
149 # nothing to be done 242 # nothing to be done
150} 243}
151 244
152# return top left coordinates 245sub children {
153sub _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 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size {
154 my ($self, $x, $y) = @_; 261 my ($self, $w, $h) = @_;
155 262
156 $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;
157} 265}
158 266
159# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
160sub coord2local { 268sub coord2local {
161 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
162 270
163 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
164 ($x - $X, $y - $Y)
165} 272}
166 273
167# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
168sub coord2global { 275sub coord2global {
169 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
170 277
171 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
172 ($x + $X, $y + $Y)
173} 279}
174 280
175sub focus_in { 281sub focus_in {
176 my ($self) = @_; 282 my ($self) = @_;
177 283
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
239 glEnd; 345 glEnd;
240 glDisable GL_BLEND; 346 glDisable GL_BLEND;
241 } 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 }
242} 362}
243 363
244sub _draw { 364sub _draw {
245 my ($self) = @_; 365 my ($self) = @_;
246 366
247 warn "no draw defined for $self\n"; 367 warn "no draw defined for $self\n";
248} 368}
249 369
250sub find_widget { 370sub find_widget {
251 my ($self, $x, $y) = @_; 371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
252 374
253 return $self 375 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 378
… …
258} 380}
259 381
260sub set_parent { 382sub set_parent {
261 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
262 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
263 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
264} 387}
265 388
266sub check_size { 389sub check_size {
267 my ($self) = @_; 390 my ($self) = @_;
268 391
269 my ($w, $h) = $self->size_request; 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281} 393}
282 394
283sub update { 395sub update {
284 my ($self) = @_; 396 my ($self) = @_;
285 397
… …
288} 400}
289 401
290sub connect { 402sub connect {
291 my ($self, $signal, $cb) = @_; 403 my ($self, $signal, $cb) = @_;
292 404
293 push @{ $self->{cb}{$signal} }, $cb; 405 push @{ $self->{signal_cb}{$signal} }, $cb;
294} 406}
295 407
296sub emit { 408sub emit {
297 my ($self, $signal, @args) = @_; 409 my ($self, $signal, @args) = @_;
298 410
299 $_->($self, @args) 411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 for @{$self->{cb}{$signal} || []};
301} 412}
302 413
303sub DESTROY { 414sub DESTROY {
304 my ($self) = @_; 415 my ($self) = @_;
305 416
… …
311package CFClient::UI::DrawBG; 422package CFClient::UI::DrawBG;
312 423
313our @ISA = CFClient::UI::Base::; 424our @ISA = CFClient::UI::Base::;
314 425
315use strict; 426use strict;
316use SDL::OpenGL; 427use CFClient::OpenGL;
317 428
318sub new { 429sub new {
319 my $class = shift; 430 my $class = shift;
320 431
321 # range [value, low, high, page] 432 # range [value, low, high, page]
… …
350 461
351package CFClient::UI::Empty; 462package CFClient::UI::Empty;
352 463
353our @ISA = CFClient::UI::Base::; 464our @ISA = CFClient::UI::Base::;
354 465
466sub new {
467 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg);
469}
470
355sub size_request { 471sub size_request {
356 (0, 0) 472 (0, 0)
357} 473}
358 474
359sub draw { } 475sub draw { }
… …
367sub new { 483sub new {
368 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
369 485
370 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
371 487
372 my $self = $class->SUPER::new (children => [], %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
373 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
374 494
375 $self 495 $self
376} 496}
377 497
378sub add { 498sub add {
379 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
380 500
381 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
382 503
383 use sort 'stable'; 504 use sort 'stable';
384 505
385 $self->{children} = [ 506 $self->{children} = [
386 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
387 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
388 ]; 509 ];
389 510
390 $self->{w} = $self->{h} = -1;
391
392 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
393} 519}
394 520
395sub remove { 521sub remove {
396 my ($self, $widget) = @_; 522 my ($self, $child) = @_;
397 523
524 delete $child->{parent};
525 $child->hide;
526
398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399 528
400 $self->check_size; 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;
401} 546}
402 547
403sub find_widget { 548sub find_widget {
404 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
405 550
… …
435 580
436 $class->SUPER::new (children => [$child], %arg) 581 $class->SUPER::new (children => [$child], %arg)
437} 582}
438 583
439sub add { 584sub add {
440 my ($self, $widget) = @_; 585 my ($self, $child) = @_;
441 586
442 $self->{children} = []; 587 $self->{children} = [];
443 588
444 $self->SUPER::add ($widget); 589 $self->SUPER::add ($child);
445} 590}
446 591
447sub remove { 592sub remove {
448 my ($self, $widget) = @_; 593 my ($self, $widget) = @_;
449 594
… …
469 614
470package CFClient::UI::Window; 615package CFClient::UI::Window;
471 616
472our @ISA = CFClient::UI::Bin::; 617our @ISA = CFClient::UI::Bin::;
473 618
474use SDL::OpenGL; 619use CFClient::OpenGL;
475 620
476sub new { 621sub new {
477 my ($class, %arg) = @_; 622 my ($class, %arg) = @_;
478 623
479 my $self = $class->SUPER::new (%arg); 624 my $self = $class->SUPER::new (%arg);
480} 625}
481 626
482sub update { 627sub update {
483 my ($self) = @_; 628 my ($self) = @_;
484 629
485 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
486 $self->render_chld;
487 $self->SUPER::update; 631 $self->SUPER::update;
488}
489
490sub render_chld {
491 my ($self) = @_;
492
493 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
494 glClearColor 0, 0, 0, 1;
495 glClear GL_COLOR_BUFFER_BIT;
496 $self->child->draw;
497 };
498} 632}
499 633
500sub size_allocate { 634sub size_allocate {
501 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
502 636
503 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
504 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
505 $self->render_chld; 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;
660 };
506} 661}
507 662
508sub _draw { 663sub _draw {
509 my ($self) = @_; 664 my ($self) = @_;
510 665
511 my ($w, $h) = ($self->w, $self->h); 666 my ($w, $h) = ($self->w, $self->h);
512 667
513 my $tex = $self->{texture} 668 my $tex = $self->{texture}
514 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});
515 809
516 glEnable GL_BLEND; 810 glEnable GL_BLEND;
517 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
518 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
520 814
521 $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;
522 822
823
824 $self->child->draw;
523 glDisable GL_BLEND; 825 glDisable GL_BLEND;
524 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
525} 827}
526 828
527############################################################################# 829#############################################################################
528 830
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
553package CFClient::UI::Frame; 831package CFClient::UI::FancyFrame;
554 832
555our @ISA = CFClient::UI::Bin::; 833our @ISA = CFClient::UI::Bin::;
556 834
557use SDL::OpenGL; 835use CFClient::OpenGL;
558
559sub size_request {
560 my ($self) = @_;
561 my $chld = $self->child
562 or return (0, 0);
563
564 $chld->move (2, 2);
565
566 map { $_ + 4 } $chld->size_request;
567}
568
569sub size_allocate {
570 my ($self, $x, $y, $w, $h) = @_;
571
572 $self->child->configure (2, 2, $w - 4, $h - 4);
573}
574
575sub _draw {
576 my ($self) = @_;
577
578 my $chld = $self->child;
579
580 my ($w, $h) = $chld->size_request;
581
582 glBegin GL_QUADS;
583 glColor 0, 0, 0;
584 glVertex 0 , 0;
585 glVertex 0 , $h + 4;
586 glVertex $w + 4 , $h + 4;
587 glVertex $w + 4 , 0;
588 glEnd;
589
590 $chld->draw;
591}
592
593#############################################################################
594
595package CFClient::UI::FancyFrame;
596
597our @ISA = CFClient::UI::Bin::;
598
599use SDL::OpenGL;
600 836
601my @tex = 837my @tex =
602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
603 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);
604 840
605sub new { 841sub new {
606 my $class = shift; 842 my $class = shift;
607 843
608 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
609 845
610 $class->SUPER::new ( 846 my $self = $class->SUPER::new (
611 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8, 849 border => 0.6,
850 can_events => 1,
614 @_ 851 @_
615 ) 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
616} 865}
617 866
618sub size_request { 867sub size_request {
619 my ($self) = @_; 868 my ($self) = @_;
620 869
621 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623 my ($w, $h) = $self->SUPER::size_request; 870 my ($w, $h) = $self->SUPER::size_request;
624 871
625 ( 872 (
626 $w + $self->{border} * 2, 873 $w + $self->border * 2,
627 $h + $self->{border} * 2, 874 $h + $self->border * 2,
628 ) 875 )
629} 876}
630 877
631sub size_allocate { 878sub size_allocate {
632 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
633 880
634 $h -= List::Util::max 0, $self->{border} * 2; 881 $h -= List::Util::max 0, $self->border * 2;
635 $w -= List::Util::max 0, $self->{border} * 2; 882 $w -= List::Util::max 0, $self->border * 2;
636 883
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
885 if $self->{title};
886
637 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 887 $self->child->configure ($self->border, $self->border, $w, $h);
638} 888}
639 889
640sub button_down { 890sub button_down {
641 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
642 892
643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 893 my ($w, $h) = @$self{qw(w h)};
644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 894 my $border = $self->border;
645 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});
646 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
647 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;
648 906
649 $self->{motion} = sub { 907 $self->{motion} = sub {
650 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
651 909
652 ($x, $y) = ($ev->motion_x, $ev->motion_y); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
653 912
654 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
655 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
656 $self->check_size; 916 $self->check_size;
657 }; 917 };
658 918
659 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
660 && $y >= 0 && $y < $self->{border}) {
661
662 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
663 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
664 922
665 $self->{motion} = sub { 923 $self->{motion} = sub {
666 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
667 925
668 ($x, $y) = ($ev->motion_x, $ev->motion_y); 926 ($x, $y) = ($ev->{x}, $ev->{y});
669 927
670 $self->move ($bx + $x - $ox, $by + $y - $oy); 928 $self->move ($bx + $x - $ox, $by + $y - $oy);
671 $self->update; 929 $self->update;
672 }; 930 };
673 } 931 }
… …
694 glEnable GL_BLEND; 952 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D; 954 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698 956
957 my $border = $self->border;
958
699 glColor @{ $self->{border_bg} }; 959 glColor @{ $self->{border_bg} };
700 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 960 $tex[1]->draw_quad (0, 0, $w, $border);
701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
704 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
705 my $bg = $tex[0]; 966 my $bg = $tex[0];
706 967
707 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
708 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
709 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
710 971
711 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
712 973
713 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
717 978
718 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
719 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
982
983 $self->{title}->draw if $self->{title};
720 984
721 $self->child->draw; 985 $self->child->draw;
722} 986}
723 987
724############################################################################# 988#############################################################################
… …
727 991
728our @ISA = CFClient::UI::Base::; 992our @ISA = CFClient::UI::Base::;
729 993
730use List::Util qw(max sum); 994use List::Util qw(max sum);
731 995
732use SDL::OpenGL; 996use CFClient::OpenGL;
733 997
734sub new { 998sub new {
735 my $class = shift; 999 my $class = shift;
736 1000
737 $class->SUPER::new ( 1001 $class->SUPER::new (
… …
744 my ($self, $x, $y, $child) = @_; 1008 my ($self, $x, $y, $child) = @_;
745 1009
746 $child->set_parent ($self); 1010 $child->set_parent ($self);
747 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
748 1012
749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size; 1013 $child->check_size;
1014}
1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
752} 1018}
753 1019
754# 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?
755sub clear { 1021sub clear {
756 my ($self) = @_; 1022 my ($self) = @_;
757 1023
1024 my @children = $self->children;
758 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
759 $self->update; 1032 $self->update;
760} 1033}
761 1034
762sub get_wh { 1035sub get_wh {
763 my ($self) = @_; 1036 my ($self) = @_;
… …
769 or next; 1042 or next;
770 1043
771 for my $x (0 .. $#$row) { 1044 for my $x (0 .. $#$row) {
772 my $widget = $row->[$x] 1045 my $widget = $row->[$x]
773 or next; 1046 or next;
774 my ($w, $h) = $widget->size_request; 1047 my ($w, $h) = @$widget{qw(req_w req_h)};
775 1048
776 $w[$x] = max $w[$x], $w; 1049 $w[$x] = max $w[$x], $w;
777 $h[$y] = max $h[$y], $h; 1050 $h[$y] = max $h[$y], $h;
778 } 1051 }
779 } 1052 }
… …
884 1157
885 ($h, $w) = ($w, $h); 1158 ($h, $w) = ($w, $h);
886 1159
887 my $children = $self->{children}; 1160 my $children = $self->{children};
888 1161
889 my @h = map +($_->size_request)[0], @$children; 1162 my @h = map $_->{req_w}, @$children;
890 1163
891 my $req_h = List::Util::sum @h; 1164 my $req_h = List::Util::sum @h;
892 1165
893 if ($req_h > $h) { 1166 if ($req_h > $h) {
894 # ah well, not enough space 1167 # ah well, not enough space
… …
942sub size_allocate { 1215sub size_allocate {
943 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
944 1217
945 my $children = $self->{children}; 1218 my $children = $self->{children};
946 1219
947 my @h = map +($_->size_request)[1], @$children; 1220 my @h = map $_->{req_h}, @$children;
948 1221
949 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
950 1223
951 if ($req_h > $h) { 1224 if ($req_h > $h) {
952 # ah well, not enough space 1225 # ah well, not enough space
… …
980 1253
981package CFClient::UI::Label; 1254package CFClient::UI::Label;
982 1255
983our @ISA = CFClient::UI::Base::; 1256our @ISA = CFClient::UI::Base::;
984 1257
985use SDL::OpenGL; 1258use CFClient::OpenGL;
986 1259
987sub new { 1260sub new {
988 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
989 1262
990 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
991 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
992 fontsize => $::FONTSIZE, 1265 #font => default_font
1266 fontsize => 1,
993 text => "", 1267 text => "",
994 align => -1, 1268 align => -1,
995 valign => -1, 1269 valign => -1,
996 padding => 2, 1270 padding => 2,
997 layout => new CFClient::Layout, 1271 layout => new CFClient::Layout,
1272 can_events => 0,
998 %arg 1273 %arg
999 ); 1274 );
1000 1275
1001 $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 }
1002 1281
1003 $self->set_text (delete $self->{text}) if exists $self->{text}; 1282 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005 1284
1006 $self 1285 $self
1007} 1286}
1008 1287
1009sub escape_text { 1288sub escape {
1010 local $_ = $_[1]; 1289 local $_ = $_[1];
1011 1290
1012 s/&/&amp;/g; 1291 s/&/&amp;/g;
1013 s/>/&gt;/g; 1292 s/>/&gt;/g;
1014 s/</&lt;/g; 1293 s/</&lt;/g;
1015 1294
1016 $_[1] 1295 $_[1]
1017} 1296}
1018 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1019sub set_text { 1305sub set_text {
1020 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1021 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1022 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1023 1312
1024 delete $self->{texture};
1025 $self->update; 1313 $self->update;
1314 $self->check_size;
1026} 1315}
1027 1316
1028sub set_markup { 1317sub set_markup {
1029 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1030 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1031 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1032 1324
1033 delete $self->{texture};
1034 $self->update; 1325 $self->update;
1326 $self->check_size;
1035} 1327}
1036 1328
1037sub size_request { 1329sub size_request {
1038 my ($self) = @_; 1330 my ($self) = @_;
1039 1331
1040 $self->{layout}->set_width; 1332 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1);
1041 $self->{layout}->set_height ($self->{fontsize}); 1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042 1335
1043 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 }
1044 1347
1045 ( 1348 (
1046 $w + $self->{padding} * 2, 1349 $w + $self->{padding} * 2,
1047 $h + $self->{padding} * 2, 1350 $h + $self->{padding} * 2,
1048 ) 1351 )
… …
1052 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1053 1356
1054 delete $self->{texture}; 1357 delete $self->{texture};
1055} 1358}
1056 1359
1057sub update { 1360sub set_fontsize {
1058 my ($self) = @_; 1361 my ($self, $fontsize) = @_;
1059 1362
1363 $self->{fontsize} = $fontsize;
1060 delete $self->{texture}; 1364 delete $self->{texture};
1365
1061 $self->SUPER::update; 1366 $self->update;
1367 $self->check_size;
1062} 1368}
1063 1369
1064sub _draw { 1370sub _draw {
1065 my ($self) = @_; 1371 my ($self) = @_;
1066 1372
1067 my $tex = $self->{texture} ||= do { 1373 my $tex = $self->{texture} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font};
1068 $self->{layout}->set_width ($self->{w}); 1375 $self->{layout}->set_width ($self->{w});
1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070 new_from_layout CFClient::Texture $self->{layout} 1377 new_from_layout CFClient::Texture $self->{layout}
1071 }; 1378 };
1072 1379
1073 glEnable GL_BLEND; 1380 glEnable GL_BLEND;
1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1099 1406
1100package CFClient::UI::EntryBase; 1407package CFClient::UI::EntryBase;
1101 1408
1102our @ISA = CFClient::UI::Label::; 1409our @ISA = CFClient::UI::Label::;
1103 1410
1104use SDL; 1411use CFClient::OpenGL;
1105use SDL::OpenGL;
1106 1412
1107sub new { 1413sub new {
1108 my $class = shift; 1414 my $class = shift;
1109 1415
1110 $class->SUPER::new ( 1416 $class->SUPER::new (
1111 fg => [1, 1, 1], 1417 fg => [1, 1, 1],
1112 bg => [0, 0, 0, 0.2], 1418 bg => [0, 0, 0, 0.2],
1113 active_bg => [1, 1, 1, 0.5], 1419 active_bg => [1, 1, 1, 0.5],
1114 active_fg => [0, 0, 0], 1420 active_fg => [0, 0, 0],
1115 can_hover => 1, 1421 can_hover => 1,
1116 can_focus => 1, 1422 can_focus => 1,
1117 valign => 0, 1423 valign => 0,
1424 can_events => 1,
1118 @_ 1425 @_
1119 ) 1426 )
1120} 1427}
1121 1428
1122sub _set_text { 1429sub _set_text {
… …
1124 1431
1125 delete $self->{cur_h}; 1432 delete $self->{cur_h};
1126 1433
1127 return if $self->{text} eq $text; 1434 return if $self->{text} eq $text;
1128 1435
1436 delete $self->{texture};
1437
1129 $self->{last_activity} = $::NOW; 1438 $self->{last_activity} = $::NOW;
1130 $self->{text} = $text; 1439 $self->{text} = $text;
1131 1440
1132 $text =~ s/./*/g if $self->{hidden}; 1441 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text "); 1442 $self->{layout}->set_text ("$text ");
… …
1148} 1457}
1149 1458
1150sub size_allocate { 1459sub size_allocate {
1151 my ($self, $w, $h) = @_; 1460 my ($self, $w, $h) = @_;
1152 1461
1153 $self->_set_text ($self->{text}); 1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154} 1463}
1155 1464
1156sub set_text { 1465sub set_text {
1157 my ($self, $text) = @_; 1466 my ($self, $text) = @_;
1158 1467
… …
1162} 1471}
1163 1472
1164sub key_down { 1473sub key_down {
1165 my ($self, $ev) = @_; 1474 my ($self, $ev) = @_;
1166 1475
1167 my $mod = $ev->key_mod; 1476 my $mod = $ev->{mod};
1168 my $sym = $ev->key_sym; 1477 my $sym = $ev->{sym};
1169
1170 my $uni = $ev->key_unicode; 1478 my $uni = $ev->{unicode};
1171 1479
1172 my $text = $self->get_text; 1480 my $text = $self->get_text;
1173 1481
1174 if ($sym == SDLK_BACKSPACE) { 1482 if ($sym == 8) {
1175 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176 } elsif ($sym == SDLK_DELETE) { 1484 } elsif ($sym == 127) {
1177 substr $text, $self->{cursor}, 1, ""; 1485 substr $text, $self->{cursor}, 1, "";
1178 } elsif ($sym == SDLK_LEFT) { 1486 } elsif ($sym == CFClient::SDLK_LEFT) {
1179 --$self->{cursor} if $self->{cursor}; 1487 --$self->{cursor} if $self->{cursor};
1180 } elsif ($sym == SDLK_RIGHT) { 1488 } elsif ($sym == CFClient::SDLK_RIGHT) {
1181 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1489 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1182 } elsif ($sym == SDLK_HOME) { 1490 } elsif ($sym == CFClient::SDLK_HOME) {
1183 $self->{cursor} = 0; 1491 $self->{cursor} = 0;
1184 } elsif ($sym == SDLK_END) { 1492 } elsif ($sym == CFClient::SDLK_END) {
1185 $self->{cursor} = length $text; 1493 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) { 1494 } elsif ($sym == 27) {
1187 $self->emit ('escape'); 1495 $self->emit ('escape');
1188 } elsif ($uni) { 1496 } elsif ($uni) {
1189 substr $text, $self->{cursor}++, 0, chr $uni; 1497 substr $text, $self->{cursor}++, 0, chr $uni;
1190 } 1498 }
1191 1499
… …
1266 1574
1267package CFClient::UI::Entry; 1575package CFClient::UI::Entry;
1268 1576
1269our @ISA = CFClient::UI::EntryBase::; 1577our @ISA = CFClient::UI::EntryBase::;
1270 1578
1271use SDL; 1579use CFClient::OpenGL;
1272use SDL::OpenGL;
1273 1580
1274sub key_down { 1581sub key_down {
1275 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1276 1583
1277 my $sym = $ev->key_sym; 1584 my $sym = $ev->{sym};
1278 1585
1279 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} = '';
1280 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1281 $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 }
1282 1615
1283 } else { 1616 } else {
1284 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1285 } 1618 }
1286 1619
… …
1290 1623
1291package CFClient::UI::Button; 1624package CFClient::UI::Button;
1292 1625
1293our @ISA = CFClient::UI::Label::; 1626our @ISA = CFClient::UI::Label::;
1294 1627
1295use SDL; 1628use CFClient::OpenGL;
1296use SDL::OpenGL;
1297 1629
1298my @tex = 1630my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1631 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300 qw(b1_button_active.png); 1632 qw(b1_button_active.png);
1301 1633
1302sub new { 1634sub new {
1303 my $class = shift; 1635 my $class = shift;
1304 1636
1305 $class->SUPER::new ( 1637 $class->SUPER::new (
1306 padding => 4, 1638 padding => 4,
1307 fg => [1, 1, 1], 1639 fg => [1, 1, 1],
1308 bg => [1, 1, 1, 0.2], 1640 bg => [1, 1, 1, 0.2],
1309 active_fg => [0, 0, 1], 1641 active_fg => [0, 0, 1],
1310 can_hover => 1, 1642 can_hover => 1,
1311 align => 0, 1643 align => 0,
1312 valign => 0, 1644 valign => 0,
1645 can_events => 1,
1313 @_ 1646 @_
1314 ) 1647 )
1315} 1648}
1316 1649
1317sub button_up { 1650sub button_up {
… …
1351package CFClient::UI::CheckBox; 1684package CFClient::UI::CheckBox;
1352 1685
1353our @ISA = CFClient::UI::DrawBG::; 1686our @ISA = CFClient::UI::DrawBG::;
1354 1687
1355my @tex = 1688my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1690 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358 1691
1359use SDL; 1692use CFClient::OpenGL;
1360use SDL::OpenGL;
1361 1693
1362sub new { 1694sub new {
1363 my $class = shift; 1695 my $class = shift;
1364 1696
1365 $class->SUPER::new ( 1697 $class->SUPER::new (
… …
1411 glDisable GL_BLEND; 1743 glDisable GL_BLEND;
1412} 1744}
1413 1745
1414############################################################################# 1746#############################################################################
1415 1747
1416package CFClient::UI::VGauge; 1748package CFClient::UI::Image;
1417 1749
1418our @ISA = CFClient::UI::Base::; 1750our @ISA = CFClient::UI::Base::;
1419 1751
1420use SDL::OpenGL; 1752use CFClient::OpenGL;
1753use Carp qw/confess/;
1421 1754
1422my %tex = ( 1755our %loaded_images;
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440 1756
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new { 1757sub new {
1443 my $class = shift; 1758 my $class = shift;
1444 1759
1445 my $self = $class->SUPER::new (gauge => 'food', @_); 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};
1446 1772
1447 $self 1773 $self
1448} 1774}
1449 1775
1450sub size_request { 1776sub size_request {
1451 my ($self) = @_; 1777 my ($self) = @_;
1452 1778
1453 my $tex = $tex{$self->{gauge}}[0]; 1779 ($self->{tex}->{w}, $self->{tex}->{h})
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474} 1780}
1475 1781
1476sub _draw { 1782sub _draw {
1477 my ($self) = @_; 1783 my ($self) = @_;
1478 1784
1479 my $tex = $tex{$self->{gauge}}; 1785 my $tex = $self->{tex};
1480 1786
1481 my ($w, $h) = ($self->{w}, $self->{h}); 1787 my ($w, $h) = ($self->{w}, $self->{h});
1482 1788
1483 my $ycut = $self->{val} / ($self->{max_val} || 1); 1789 if ($self->{rot90}) {
1484 $ycut = 1 if $self->{val} > $self->{max_val}; 1790 glRotate 90, 0, 0, 1;
1791 glTranslate 0, -$self->{w}, 0;
1485 1792
1486 my $t1 = $tex->[0]; 1793 ($w, $h) = ($h, $w);
1487 my $t2 = $tex->[1]; 1794 }
1488 1795
1489 glEnable GL_BLEND; 1796 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493 1800
1494 my $h1 = $self->{h} - $ycut * $self->{h}; 1801 $tex->draw_quad (0, 0, $w, $h);
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516 1802
1517 glDisable GL_BLEND; 1803 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1519} 1805}
1520 1806
1521############################################################################# 1807#############################################################################
1522 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
1523package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
1524 1988
1525use strict; 1989use strict;
1526 1990
1527use SDL::OpenGL; 1991use CFClient::OpenGL;
1528 1992
1529our @ISA = CFClient::UI::DrawBG::; 1993our @ISA = CFClient::UI::DrawBG::;
1530 1994
1531my @tex = 1995my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1542 # TODO: calculations are off 2006 # TODO: calculations are off
1543 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1544 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1545 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1546 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1547 req_w => 40, 2011 req_w => $::WIDTH / 80,
1548 req_h => 13, 2012 req_h => $::WIDTH / 80,
1549 vertical => 0, 2013 vertical => 0,
1550 can_hover => 1, 2014 can_hover => 1,
1551 inner_pad => 5, 2015 inner_pad => 5,
1552 @_ 2016 @_
1553 ); 2017 );
… …
1657 2121
1658package CFClient::UI::TextView; 2122package CFClient::UI::TextView;
1659 2123
1660our @ISA = CFClient::UI::HBox::; 2124our @ISA = CFClient::UI::HBox::;
1661 2125
1662use SDL::OpenGL; 2126use CFClient::OpenGL;
1663 2127
1664sub new { 2128sub new {
1665 my $class = shift; 2129 my $class = shift;
1666 2130
1667 my $self = $class->SUPER::new ( 2131 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6, 2132 fontsize => 1,
1669 req_h => $::HEIGHT / 6, 2133 can_events => 0,
1670 fontsize => $::FONTSIZE, 2134 #font => default_font
1671 @_, 2135 @_,
1672 2136
1673 layout => (new CFClient::Layout), 2137 layout => (new CFClient::Layout),
1674 par => [], 2138 par => [],
1675 height => 0, 2139 height => 0,
1676 children => [ 2140 children => [
1677 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1678 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1679 ], 2143 ],
1680 ); 2144 );
1681 2145
1682 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1683 $self->update;
1684 });
1685 2147
1686 $self 2148 $self
1687} 2149}
1688 2150
1689sub set_fontsize { 2151sub set_fontsize {
… …
1696sub text_height { 2158sub text_height {
1697 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1698 2160
1699 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
1700 2162
1701 $layout->set_height ($self->{fontsize}); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
1703 $layout->set_text ($text); 2165 $layout->set_text ($text);
1704 2166
1705 ($layout->size)[1] 2167 ($layout->size)[1]
1706} 2168}
1707 2169
… …
1710 2172
1711 $self->{need_reflow}++; 2173 $self->{need_reflow}++;
1712 $self->update; 2174 $self->update;
1713} 2175}
1714 2176
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate { 2177sub size_allocate {
1722 my ($self, $w, $h) = @_; 2178 my ($self, $w, $h) = @_;
1723 2179
2180 $self->SUPER::size_allocate ($w, $h);
2181
2182 $self->{layout}->set_font ($self->{font}) if $self->{font};
1724 $self->{layout}->set_height ($self->{fontsize}); 2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $self->{layout}->set_width ($self->{w}); 2184 $self->{layout}->set_width ($self->{children}[0]{w});
1726 2185
1727 $self->reflow; 2186 $self->reflow;
1728 $self->update;
1729} 2187}
1730 2188
1731sub add_paragraph { 2189sub add_paragraph {
1732 my ($self, $color, $text) = @_; 2190 my ($self, $color, $text) = @_;
1733 2191
… …
1764 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1765 2223
1766 delete $self->{texture}; 2224 delete $self->{texture};
1767 } 2225 }
1768 2226
1769 $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 {
1770 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
1771 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
1772 2230
1773 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
1774 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1775 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
1782 2240
1783 my $y = 0; 2241 my $y = 0;
1784 2242
1785 my $layout = $self->{layout}; 2243 my $layout = $self->{layout};
1786 2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246
1787 for my $par (@{$self->{par}}) { 2247 for my $par (@{$self->{par}}) {
1788 my $h = $par->[0]; 2248 my $h = $par->[0];
1789 2249
1790 if ($y0 < $y + $h && $y < $y1) { 2250 if ($y0 < $y + $h && $y < $y1) {
1791 $layout->set_text ($par->[2]); 2251 $layout->set_text ($par->[2]);
… …
1805} 2265}
1806 2266
1807sub _draw { 2267sub _draw {
1808 my ($self) = @_; 2268 my ($self) = @_;
1809 2269
1810 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
1812 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;
1813 $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});
1814 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
1815 } 2277 glDisable GL_BLEND;
1816 2278
1817 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
1818 2280
1819} 2281}
1820 2282
1821############################################################################# 2283#############################################################################
1822 2284
1823package CFClient::UI::MapWidget;
1824
1825use strict;
1826
1827use List::Util qw(min max);
1828
1829use SDL;
1830use SDL::OpenGL;
1831
1832our @ISA = CFClient::UI::Base::;
1833
1834sub new {
1835 my $class = shift;
1836
1837 $class->SUPER::new (
1838 z => -1,
1839 can_focus => 1,
1840 list => (glGenLists 1),
1841 @_
1842 )
1843}
1844
1845sub key_down {
1846 print "MAPKEYDOWN\n";
1847}
1848
1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1886sub size_request {
1887 (
1888 1 + 32 * int $::WIDTH / 32,
1889 1 + 32 * int $::HEIGHT / 32,
1890 )
1891}
1892
1893sub update {
1894 my ($self) = @_;
1895
1896 $self->{need_update} = 1;
1897 $self->SUPER::update;
1898}
1899
1900sub draw {
1901 my ($self) = @_;
1902
1903 if (delete $self->{need_update}) {
1904 glNewList $self->{list}, GL_COMPILE;
1905
1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1977 }
1978
1979 glEndList;
1980 }
1981
1982 glPushMatrix;
1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1998}
1999
2000my %DIR = (
2001 SDLK_KP8, [1, "north"],
2002 SDLK_KP9, [2, "northeast"],
2003 SDLK_KP6, [3, "east"],
2004 SDLK_KP3, [4, "southeast"],
2005 SDLK_KP2, [5, "south"],
2006 SDLK_KP1, [6, "southwest"],
2007 SDLK_KP4, [7, "west"],
2008 SDLK_KP7, [8, "northwest"],
2009
2010 SDLK_UP, [1, "north"],
2011 SDLK_RIGHT, [3, "east"],
2012 SDLK_DOWN, [5, "south"],
2013 SDLK_LEFT, [7, "west"],
2014);
2015
2016sub key_down {
2017 my ($self, $ev) = @_;
2018
2019 my $mod = $ev->key_mod;
2020 my $sym = $ev->key_sym;
2021
2022 if ($sym == SDLK_KP5) {
2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
2030 } elsif (exists $DIR{$sym}) {
2031 if ($mod & KMOD_SHIFT) {
2032 $self->{shft}++;
2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
2034 } elsif ($mod & KMOD_CTRL) {
2035 $self->{ctrl}++;
2036 $::CONN->user_send ("run $DIR{$sym}[0]");
2037 } else {
2038 $::CONN->user_send ("$DIR{$sym}[1]");
2039 }
2040 }
2041}
2042
2043sub key_up {
2044 my ($self, $ev) = @_;
2045
2046 my $mod = $ev->key_mod;
2047 my $sym = $ev->key_sym;
2048
2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050 $::CONN->user_send ("fire_stop");
2051 }
2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053 $::CONN->user_send ("run_stop");
2054 }
2055}
2056
2057#############################################################################
2058
2059package CFClient::UI::Animator; 2285package CFClient::UI::Animator;
2060 2286
2061use SDL::OpenGL; 2287use CFClient::OpenGL;
2062 2288
2063our @ISA = CFClient::UI::Bin::; 2289our @ISA = CFClient::UI::Bin::;
2064 2290
2065sub moveto { 2291sub moveto {
2066 my ($self, $x, $y) = @_; 2292 my ($self, $x, $y) = @_;
… …
2104 2330
2105sub new { 2331sub new {
2106 my $class = shift; 2332 my $class = shift;
2107 2333
2108 my $self = $class->SUPER::new ( 2334 my $self = $class->SUPER::new (
2109 state => 0, 2335 state => 0,
2110 connect_activate => \&toggle_flopper, 2336 connect_activate => \&toggle_flopper,
2111 @_ 2337 @_
2112 ); 2338 );
2113 2339
2114 if ($self->{state}) { 2340 if ($self->{state}) {
… …
2135 $self->emit (changed => $self->{state}); 2361 $self->emit (changed => $self->{state});
2136} 2362}
2137 2363
2138############################################################################# 2364#############################################################################
2139 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 = $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 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2140package CFClient::UI::Root; 2654package CFClient::UI::Root;
2141 2655
2142our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2143 2657
2144use SDL::OpenGL; 2658use CFClient::OpenGL;
2145 2659
2146sub check_size { 2660sub new {
2147 my ($self) = @_; 2661 my $class = shift;
2148 2662
2149 $self->configure (0, 0, $::WITH, $::HEIGHT); 2663 $class->SUPER::new (
2150} 2664 @_,
2151 2665 )
2152sub size_request {
2153 ($::WIDTH, $::HEIGHT)
2154} 2666}
2155 2667
2156sub configure { 2668sub configure {
2157 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2158 2670
2159 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2160 2672 $self->{h} = $h;
2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2162 for @{$self->{children}};
2163} 2673}
2164 2674
2165sub _topleft { 2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2712 $child->configure ($X, $Y, $W, $H);
2713 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2166 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2167 2721
2168 ($x, $y) 2722 ($x, $y)
2169} 2723}
2170 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2171sub update { 2731sub update {
2172 my ($self) = @_; 2732 my ($self) = @_;
2173 2733
2174 $self->check_size; 2734 $self->check_size;
2175 ::refresh (); 2735 $::WANT_REFRESH++;
2176} 2736}
2177 2737
2178sub add { 2738sub add {
2179 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2180 2740
2741 # integerise window positions
2742 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y};
2744
2181 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2182} 2746}
2183 2747
2184sub on_refresh { 2748sub on_refresh {
2185 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2186 2750
2187 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2188} 2752}
2189 2753
2190sub draw { 2754sub draw {
2191 my ($self) = @_; 2755 my ($self) = @_;
2192 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2193 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2194 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2195 } 2799 }
2196 2800
2197 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2198 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2199 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;
… …
2210############################################################################# 2814#############################################################################
2211 2815
2212package CFClient::UI; 2816package CFClient::UI;
2213 2817
2214$ROOT = new CFClient::UI::Root; 2818$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip;
2215 2820
22161 28211
2217 2822

Diff Legend

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