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.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 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 = $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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->translate ($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 }
123}
124
125# convert position array to integers
126sub harmonize {
127 my ($vals) = @_;
128
129 my $rem = 0;
130
131 for (@$vals) {
132 my $i = int $_ + $rem;
133 $rem += $_ - $i;
134 $_ = $i;
135 }
71} 136}
72 137
73############################################################################# 138#############################################################################
74 139
75package CFClient::UI::Base; 140package CFClient::UI::Base;
76 141
77use strict; 142use strict;
78 143
79use SDL::OpenGL; 144use CFClient::OpenGL;
80 145
81sub new { 146sub new {
82 my $class = shift; 147 my $class = shift;
83 148
84 my $self = bless { 149 my $self = bless {
85 x => 0, 150 x => 0,
86 y => 0, 151 y => 0,
87 z => 0, 152 z => 0,
88 w => -1, 153 can_events => 1,
89 h => -1,
90 @_ 154 @_
91 }, $class; 155 }, $class;
92 156
93 for (keys %$self) { 157 for (keys %$self) {
94 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
97 } 161 }
98 162
99 $self 163 $self
100} 164}
101 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
102sub move { 191sub move {
103 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
193
104 $self->{x} = $x; 194 $self->{x} = int $x;
105 $self->{y} = $y; 195 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
107}
108 197
109sub needs_redraw { 198 $self->update;
110 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;
111} 208}
112 209
113sub size_request { 210sub size_request {
114 require Carp; 211 require Carp;
115 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
116} 213}
117 214
118sub _size_allocate { 215sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
120 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) {
121 $self->{x} = $x; 231 $self->{x} = $x;
122 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update;
234 }
123 235
124 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
125
126 $self->{w} = $w; 237 $self->{w} = $w;
127 $self->{h} = $h; 238 $self->{h} = $h;
128 239
240 $self->size_allocate ($w, $h);
241 $self->update;
129 1 242 }
130} 243}
131 244
132sub size_allocate { 245sub size_allocate {
246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
133 my ($self, $x, $y, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
134 264
135 $self->_size_allocate ($x, $y, $w, $h); 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 277}
137 278
138# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
139sub translate { 280sub coord2local {
140 my ($self, $x, $y) = @_; 281 my ($self, $x, $y) = @_;
141 282
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 283 my ($X, $Y) = $self->_topleft;
284 ($x - $X, $y - $Y)
285}
286
287# translate local coordinates to global coordinate system
288sub coord2global {
289 my ($self, $x, $y) = @_;
290
291 my ($X, $Y) = $self->_topleft;
292 ($x + $X, $y + $Y)
143} 293}
144 294
145sub focus_in { 295sub focus_in {
146 my ($self) = @_; 296 my ($self) = @_;
147 297
148 return if $FOCUS == $self; 298 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 299 return unless $self->{can_focus};
150 300
151 my $focus = $FOCUS; $FOCUS = $self; 301 my $focus = $FOCUS; $FOCUS = $self;
302
303 $self->emit (focus_in => $focus);
304
152 $focus->update if $focus; 305 $focus->update if $focus;
153 $FOCUS->update; 306 $FOCUS->update;
154} 307}
155 308
156sub focus_out { 309sub focus_out {
157 my ($self) = @_; 310 my ($self) = @_;
158 311
159 return unless $FOCUS == $self; 312 return unless $FOCUS == $self;
160 313
161 my $focus = $FOCUS; undef $FOCUS; 314 my $focus = $FOCUS; undef $FOCUS;
315
316 $self->emit (focus_out => $focus);
317
162 $focus->update if $focus; #? 318 $focus->update if $focus; #?
163} 319}
164 320
165sub mouse_motion { } 321sub mouse_motion { }
166sub button_up { } 322sub button_up { }
… …
190 glPopMatrix; 346 glPopMatrix;
191 347
192 if ($self == $HOVER && $self->{can_hover}) { 348 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 349 my ($x, $y) = @$self{qw(x y)};
194 350
195 glColor 0, 0, 1, 0.2; 351 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 352 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 354 glBegin GL_QUADS;
199 glVertex $x , $y; 355 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 356 glVertex $x + $self->{w}, $y;
201 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
202 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
203 glEnd; 359 glEnd;
204 glDisable GL_BLEND; 360 glDisable GL_BLEND;
205 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
206} 376}
207 377
208sub _draw { 378sub _draw {
209 my ($self) = @_; 379 my ($self) = @_;
210 380
211 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
212} 382}
213 383
214sub find_widget { 384sub find_widget {
215 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
216 388
217 return $self 389 return $self
218 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
219 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
220 392
221 () 393 ()
222} 394}
223 395
224sub set_parent { 396sub set_parent {
225 my ($self, $par) = @_; 397 my ($self, $parent) = @_;
226 398
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 399 Scalar::Util::weaken ($self->{parent} = $parent);
229} 400}
230 401
231sub get_parent { 402sub check_size {
403 my ($self) = @_;
404
232 $_[0]->{parent} 405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
233} 426}
234 427
235sub update { 428sub update {
236 my ($self) = @_; 429 my ($self) = @_;
237 430
… …
240} 433}
241 434
242sub connect { 435sub connect {
243 my ($self, $signal, $cb) = @_; 436 my ($self, $signal, $cb) = @_;
244 437
245 push @{ $self->{cb}{$signal} }, $cb; 438 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 439}
247 440
248sub emit { 441sub emit {
249 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
250 443
251 $_->($self, @args) 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
252 for @{$self->{cb}{$signal} || []};
253} 445}
254 446
255sub DESTROY { 447sub DESTROY {
256 my ($self) = @_; 448 my ($self) = @_;
257 449
… …
263package CFClient::UI::DrawBG; 455package CFClient::UI::DrawBG;
264 456
265our @ISA = CFClient::UI::Base::; 457our @ISA = CFClient::UI::Base::;
266 458
267use strict; 459use strict;
268use SDL::OpenGL; 460use CFClient::OpenGL;
269 461
270sub new { 462sub new {
271 my $class = shift; 463 my $class = shift;
272 464
273 # range [value, low, high, page] 465 # range [value, low, high, page]
… …
302 494
303package CFClient::UI::Empty; 495package CFClient::UI::Empty;
304 496
305our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
306 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
307sub size_request { 504sub size_request {
308 (0, 0) 505 (0, 0)
309} 506}
310 507
311sub draw { } 508sub draw { }
… …
319sub new { 516sub new {
320 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
321 518
322 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
323 520
324 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
325 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
326 527
327 $self 528 $self
328} 529}
329 530
330sub add { 531sub add {
331 my ($self, $chld) = @_; 532 my ($self, $child) = @_;
332 533
333 $chld->set_parent ($self); 534 $child->set_parent ($self);
535
536 use sort 'stable';
334 537
335 $self->{children} = [ 538 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 539 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 540 @{$self->{children}}, $child
338 ]; 541 ];
339 542
340 $self->{w} = $self->{h} = -1; 543 $child->check_size;
544}
545
546sub children {
547 @{ $_[0]{children} }
548}
549
550sub remove {
551 my ($self, $child) = @_;
552
553 delete $child->{parent};
554 $child->hide;
555
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557
558 $self->check_size;
341 $self->update; 559 $self->update;
342} 560}
343 561
344sub remove { 562sub clear {
345 my ($self, $widget) = @_; 563 my ($self) = @_;
346 564
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 565 my $children = delete $self->{children};
566 $self->{children} = [];
348 567
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
350} 572}
351 573
352sub find_widget { 574sub find_widget {
353 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
354 576
… …
384 606
385 $class->SUPER::new (children => [$child], %arg) 607 $class->SUPER::new (children => [$child], %arg)
386} 608}
387 609
388sub add { 610sub add {
389 my ($self, $widget) = @_; 611 my ($self, $child) = @_;
390 612
391 $self->{children} = []; 613 $self->{children} = [];
392 614
393 $self->SUPER::add ($widget); 615 $self->SUPER::add ($child);
394} 616}
395 617
396sub remove { 618sub remove {
397 my ($self, $widget) = @_; 619 my ($self, $widget) = @_;
398 620
… …
407sub size_request { 629sub size_request {
408 $_[0]{children}[0]->size_request 630 $_[0]{children}[0]->size_request
409} 631}
410 632
411sub size_allocate { 633sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 634 my ($self, $w, $h) = @_;
413 635
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 636 $self->{children}[0]->configure (0, 0, $w, $h);
417} 637}
418 638
419############################################################################# 639#############################################################################
420 640
421package CFClient::UI::Window; 641package CFClient::UI::Window;
422 642
423our @ISA = CFClient::UI::Bin::; 643our @ISA = CFClient::UI::Bin::;
424 644
425use SDL::OpenGL; 645use CFClient::OpenGL;
426 646
427sub new { 647sub new {
428 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
429 649
430 my $self = $class->SUPER::new (%arg); 650 my $self = $class->SUPER::new (%arg);
431} 651}
432 652
433sub update { 653sub update {
434 my ($self) = @_; 654 my ($self) = @_;
435 655
436 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
437 $self->render_chld;
438 $self->SUPER::update; 657 $self->SUPER::update;
439} 658}
440 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
441sub render_chld { 667sub render_child {
442 my ($self) = @_; 668 my ($self) = @_;
443 669
444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
446 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
447 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
448 }; 681 };
449}
450
451sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_;
453
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h);
457
458 $self->render_chld;
459} 682}
460 683
461sub _draw { 684sub _draw {
462 my ($self) = @_; 685 my ($self) = @_;
463 686
464 my ($w, $h) = ($self->w, $self->h); 687 my ($w, $h) = ($self->w, $self->h);
465 688
466 my $tex = $self->{texture} 689 my $tex = $self->{texture}
467 or return; 690 or return;
691
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
697
698 $tex->draw_quad (0, 0, $w, $h);
699
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D;
702}
703
704#############################################################################
705
706package CFClient::UI::ViewPort;
707
708our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735
736sub new {
737 my $class = shift;
738
739 my $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1],
741 border_bg => [1, 1, 1, 1],
742 border => 0.8,
743 @_
744 );
745
746 $self
747}
748
749sub _draw {
750 my ($self) = @_;
751
752 my ($w, $h) = ($self->{w}, $self->{h});
468 753
469 glEnable GL_BLEND; 754 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
471 glEnable GL_TEXTURE_2D; 756 glEnable GL_TEXTURE_2D;
472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
473 758
474 $tex->draw_quad (0, 0, $w, $h); 759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
475 766
767
768 $self->child->draw;
476 glDisable GL_BLEND; 769 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D; 770 glDisable GL_TEXTURE_2D;
478} 771}
479 772
480############################################################################# 773#############################################################################
481 774
482package CFClient::UI::Frame; 775package CFClient::UI::FancyFrame;
483 776
484our @ISA = CFClient::UI::Bin::; 777our @ISA = CFClient::UI::Bin::;
485 778
486use SDL::OpenGL; 779use CFClient::OpenGL;
487
488sub size_request {
489 my ($self) = @_;
490 my $chld = $self->child
491 or return (0, 0);
492
493 $chld->move (2, 2);
494
495 map { $_ + 4 } $chld->size_request;
496}
497
498sub size_allocate {
499 my ($self, $x, $y, $w, $h) = @_;
500
501 $self->_size_allocate ($x, $y, $w, $h) or return;
502
503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
504}
505
506sub _draw {
507 my ($self) = @_;
508
509 my $chld = $self->child;
510
511 my ($w, $h) = $chld->size_request;
512
513 glBegin GL_QUADS;
514 glColor 0, 0, 0;
515 glVertex 0 , 0;
516 glVertex 0 , $h + 4;
517 glVertex $w + 4 , $h + 4;
518 glVertex $w + 4 , 0;
519 glEnd;
520
521 $chld->draw;
522}
523
524#############################################################################
525
526package CFClient::UI::FancyFrame;
527
528our @ISA = CFClient::UI::Bin::;
529
530use SDL::OpenGL;
531 780
532my @tex = 781my @tex =
533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
535 784
536sub new { 785sub new {
537 my $class = shift; 786 my $class = shift;
538 787
539 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
540 789
541 $class->SUPER::new ( 790 my $self = $class->SUPER::new (
542 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 793 border => 0.6,
794 can_events => 1,
545 @_ 795 @_
796 );
797
798 $self->{title} &&= new CFClient::UI::Label
799 align => 0,
800 valign => 1,
801 text => $self->{title},
802 fontsize => $self->{border};
803
804 $self
805}
806
807sub border {
808 int $_[0]{border} * $::FONTSIZE
809}
810
811sub size_request {
812 my ($self) = @_;
813
814 my ($w, $h) = $self->SUPER::size_request;
815
816 (
817 $w + $self->border * 2,
818 $h + $self->border * 2,
546 ) 819 )
547} 820}
548 821
549sub size_request {
550 my ($self) = @_;
551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
554 my ($w, $h) = $self->SUPER::size_request;
555
556 (
557 $w + $self->{border} * 2,
558 $h + $self->{border} * 2,
559 )
560}
561
562sub size_allocate { 822sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
564 824
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2; 825 $h -= List::Util::max 0, $self->border * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 826 $w -= List::Util::max 0, $self->border * 2;
569 827
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 831 $self->child->configure ($self->border, $self->border, $w, $h);
571} 832}
572 833
573sub button_down { 834sub button_down {
574 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
575 836
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 837 my ($w, $h) = @$self{qw(w h)};
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 838 my $border = $self->border;
578 839
840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
847
848 my $mx = $x < $border;
849 my $my = $y < $border;
581 850
582 $self->{motion} = sub { 851 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
584 853
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
586 856
587 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
588 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
589 $self->update; 859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size;
590 }; 861 };
591 862
592 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
597 866
598 $self->{motion} = sub { 867 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
600 869
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 870 ($x, $y) = ($ev->{x}, $ev->{y});
602 871
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 872 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update; 873 $self->update;
605 }; 874 };
606 } 875 }
… …
627 glEnable GL_BLEND; 896 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 898 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 900
901 my $border = $self->border;
902
632 glColor @{ $self->{border_bg} }; 903 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 904 $tex[1]->draw_quad (0, 0, $w, $border);
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
637 908
638 my $bg = $tex[0]; 909 my $bg = $tex[0];
639 910
640 # TODO: repeat texture not scale 911 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w}; 912 my $rep_x = $cw / $bg->{w};
… …
644 glColor @{ $self->{bg} }; 915 glColor @{ $self->{bg} };
645 916
646 $bg->{s} = $rep_x; 917 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y; 918 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1; 919 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 920 $bg->draw_quad ($border, $border, $cw, $ch);
650 921
651 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND; 923 glDisable GL_BLEND;
653 924
925 $self->{title}->draw if $self->{title};
654 $self->child->draw; 926 $self->child->draw;
655} 927}
656 928
657############################################################################# 929#############################################################################
658 930
… …
660 932
661our @ISA = CFClient::UI::Base::; 933our @ISA = CFClient::UI::Base::;
662 934
663use List::Util qw(max sum); 935use List::Util qw(max sum);
664 936
665use SDL::OpenGL; 937use CFClient::OpenGL;
666 938
667sub new { 939sub new {
668 my $class = shift; 940 my $class = shift;
669 941
670 $class->SUPER::new ( 942 $class->SUPER::new (
… …
672 @_ 944 @_
673 ) 945 )
674} 946}
675 947
676sub add { 948sub add {
677 my ($self, $x, $y, $chld) = @_; 949 my ($self, $x, $y, $child) = @_;
678 950
951 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 952 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 953
682 $self->{w} = $self->{h} = -1; 954 $child->check_size;
955}
956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
961# TODO: move to container class maybe? send childs a signal on removal?
962sub clear {
963 my ($self) = @_;
964
965 my @children = $self->children;
966 delete $self->{children};
967
968 for (@children) {
969 delete $_->{parent};
970 $_->hide;
971 }
972
683 $self->update; 973 $self->update;
684} 974}
685 975
686sub get_wh { 976sub get_wh {
687 my ($self) = @_; 977 my ($self) = @_;
… …
693 or next; 983 or next;
694 984
695 for my $x (0 .. $#$row) { 985 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 986 my $widget = $row->[$x]
697 or next; 987 or next;
698 my ($w, $h) = $widget->size_request; 988 my ($w, $h) = @$widget{qw(req_w req_h)};
699 989
700 $w[$x] = max $w[$x], $w; 990 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 991 $h[$y] = max $h[$y], $h;
702 } 992 }
703 } 993 }
… …
715 (sum @$hs), 1005 (sum @$hs),
716 ) 1006 )
717} 1007}
718 1008
719sub size_allocate { 1009sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 1011
724 my ($ws, $hs) = $self->get_wh; 1012 my ($ws, $hs) = $self->get_wh;
725 1013
726 my $req_w = sum @$ws; 1014 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 1015 my $req_h = sum @$hs;
… …
732 my $col_expand = (sum @col_expand) || 1; 1020 my $col_expand = (sum @col_expand) || 1;
733 1021
734 # linearly scale sizes 1022 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1023 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1024 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1025
1026 CFClient::UI::harmonize $ws;
1027 CFClient::UI::harmonize $hs;
737 1028
738 my $y; 1029 my $y;
739 1030
740 for my $r (0 .. $#{$self->{children}}) { 1031 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 1032 my $row = $self->{children}[$r]
… …
746 1037
747 for my $c (0 .. $#$row) { 1038 for my $c (0 .. $#$row) {
748 my $col_w = $ws->[$c]; 1039 my $col_w = $ws->[$c];
749 1040
750 if (my $widget = $row->[$c]) { 1041 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h); 1042 $widget->configure ($x, $y, $col_w, $row_h);
752 } 1043 }
753 1044
754 $x += $col_w; 1045 $x += $col_w;
755 } 1046 }
756 1047
… …
801 (List::Util::max map $_->[1], @alloc), 1092 (List::Util::max map $_->[1], @alloc),
802 ) 1093 )
803} 1094}
804 1095
805sub size_allocate { 1096sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h);
809 1098
810 ($h, $w) = ($w, $h); 1099 ($h, $w) = ($w, $h);
811 1100
812 my $children = $self->{children}; 1101 my $children = $self->{children};
813 1102
814 my @h = map +($_->size_request)[0], @$children; 1103 my @h = map $_->{req_w}, @$children;
815 1104
816 my $req_h = List::Util::sum @h; 1105 my $req_h = List::Util::sum @h;
817 1106
818 if ($req_h > $h) { 1107 if ($req_h > $h) {
819 # ah well, not enough space 1108 # ah well, not enough space
… …
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1118 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h; 1119 $h[$_] = $alloc_h;
831 } 1120 }
832 } 1121 }
833 1122
1123 CFClient::UI::harmonize \@h;
1124
834 my $y = 0; 1125 my $y = 0;
835 for (0 .. $#$children) { 1126 for (0 .. $#$children) {
836 my $child = $children->[$_]; 1127 my $child = $children->[$_];
837 my $h = int $h[$_]; 1128 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w); 1129 $child->configure ($y, 0, $h, $w);
839 1130
840 $y += $h; 1131 $y += $h;
841 } 1132 }
1133
1134 1
842} 1135}
843 1136
844############################################################################# 1137#############################################################################
845 1138
846package CFClient::UI::VBox; 1139package CFClient::UI::VBox;
… …
859 (List::Util::sum map $_->[1], @alloc), 1152 (List::Util::sum map $_->[1], @alloc),
860 ) 1153 )
861} 1154}
862 1155
863sub size_allocate { 1156sub size_allocate {
864 my ($self, $x, $y, $w, $h) = @_; 1157 my ($self, $w, $h) = @_;
865
866 $self->_size_allocate ($x, $y, $w, $h);
867 1158
868 my $children = $self->{children}; 1159 my $children = $self->{children};
869 1160
870 my @h = map +($_->size_request)[1], @$children; 1161 my @h = map $_->{req_h}, @$children;
871 1162
872 my $req_h = List::Util::sum @h; 1163 my $req_h = List::Util::sum @h;
873 1164
874 if ($req_h > $h) { 1165 if ($req_h > $h) {
875 # ah well, not enough space 1166 # ah well, not enough space
… …
883 1174
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1175 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885 } 1176 }
886 } 1177 }
887 1178
1179 CFClient::UI::harmonize \@h;
1180
888 my $y = 0; 1181 my $y = 0;
889 for (0 .. $#$children) { 1182 for (0 .. $#$children) {
890 my $child = $children->[$_]; 1183 my $child = $children->[$_];
891 my $h = int $h[$_]; 1184 my $h = $h[$_];
892 $child->size_allocate (0, $y, $w, $h); 1185 $child->configure (0, $y, $w, $h);
893 1186
894 $y += $h; 1187 $y += $h;
895 } 1188 }
1189
1190 1
896} 1191}
897 1192
898############################################################################# 1193#############################################################################
899 1194
900package CFClient::UI::Label; 1195package CFClient::UI::Label;
901 1196
902our @ISA = CFClient::UI::Base::; 1197our @ISA = CFClient::UI::Base::;
903 1198
904use SDL::OpenGL; 1199use CFClient::OpenGL;
905 1200
906sub new { 1201sub new {
907 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
908 1203
909 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
910 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
911 fontsize => $::FONTSIZE, 1206 #font => default_font
1207 fontsize => 1,
912 text => "", 1208 text => "",
913 align => -1, 1209 align => -1,
1210 valign => -1,
914 padding => 2, 1211 padding => 2,
915 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1213 can_events => 0,
916 %arg 1214 %arg
917 ); 1215 );
918 1216
919 $self->set_text ($self->{text}); 1217 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout;
1221 }
1222
1223 $self->set_text (delete $self->{text}) if exists $self->{text};
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
920 1225
921 $self 1226 $self
922} 1227}
923 1228
924sub escape_text { 1229sub escape {
925 local $_ = $_[1]; 1230 local $_ = $_[1];
926 1231
927 s/&/&amp;/g; 1232 s/&/&amp;/g;
928 s/>/&gt;/g; 1233 s/>/&gt;/g;
929 s/</&lt;/g; 1234 s/</&lt;/g;
930 1235
931 $_[1] 1236 $_[1]
932} 1237}
933 1238
1239sub update {
1240 my ($self) = @_;
1241
1242 delete $self->{texture};
1243 $self->SUPER::update;
1244}
1245
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
934sub set_text { 1252sub set_text {
935 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
936 1254
1255 return if $self->{text} eq "T$text";
937 $self->{text} = $text; 1256 $self->{text} = "T$text";
1257
938 $self->{layout}->set_markup ($text); 1258 $self->{layout}->set_text ($text);
939 1259
940 delete $self->{texture}; 1260 delete $self->{texture};
941# $self->{w} = $self->{h} = -1;
942 $self->update; 1261 $self->update;
1262 $self->check_size;
943} 1263}
944 1264
945sub get_text { 1265sub set_markup {
946 my ($self, $text) = @_; 1266 my ($self, $markup) = @_;
947 1267
948 $self->{text} 1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1271 $self->{layout}->set_markup ($markup);
1272
1273 delete $self->{texture};
1274 $self->update;
1275 $self->check_size;
949} 1276}
950 1277
951sub size_request { 1278sub size_request {
952 my ($self) = @_; 1279 my ($self) = @_;
953 1280
954 $self->{layout}->set_width; 1281 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1);
955 $self->{layout}->set_height ($self->{fontsize}); 1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1284
956 my ($w, $h) = $self->{layout}->size; 1285 my ($w, $h) = $self->{layout}->size;
1286
1287 if (exists $self->{template}) {
1288 $self->{template}->set_font ($self->{font}) if $self->{font};
1289 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1290
1291 my ($w2, $h2) = $self->{template}->size;
1292
1293 $w = List::Util::max $w, $w2;
1294 $h = List::Util::max $h, $h2;
1295 }
957 1296
958 ( 1297 (
959 $w + $self->{padding} * 2, 1298 $w + $self->{padding} * 2,
960 $h + $self->{padding} * 2, 1299 $h + $self->{padding} * 2,
961 ) 1300 )
962} 1301}
963 1302
964sub size_allocate { 1303sub size_allocate {
965 my ($self, $x, $y, $w, $h) = @_; 1304 my ($self, $w, $h) = @_;
966
967 $self->_size_allocate ($x, $y, $w, $h) or return;
968 1305
969 delete $self->{texture}; 1306 delete $self->{texture};
970} 1307}
971 1308
972sub update { 1309sub set_fontsize {
973 my ($self) = @_; 1310 my ($self, $fontsize) = @_;
974 1311
1312 $self->{fontsize} = $fontsize;
975 delete $self->{texture}; 1313 delete $self->{texture};
1314 $self->check_size;
976 $self->SUPER::update; 1315 $self->update;
977} 1316}
978 1317
979sub _draw { 1318sub _draw {
980 my ($self) = @_; 1319 my ($self) = @_;
981 1320
982 my $tex = $self->{texture} ||= do { 1321 my $tex = $self->{texture} ||= do {
1322 $self->{layout}->set_font ($self->{font}) if $self->{font};
983 $self->{layout}->set_width ($self->{w}); 1323 $self->{layout}->set_width ($self->{w});
984 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
985 new_from_layout CFClient::Texture $self->{layout} 1325 new_from_layout CFClient::Texture $self->{layout}
986 }; 1326 };
987 1327
988 glEnable GL_BLEND; 1328 glEnable GL_BLEND;
989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glEnable GL_TEXTURE_2D; 1330 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992 1332
993 glColor @{$self->{fg}}; 1333 glColor @{$self->{fg}};
994 1334
995 my $x = 1335 $self->{ox} = int (
996 $self->{align} < 0 ? $self->{padding} 1336 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5; 1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
999 1340
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy});
1001 1348
1002 glDisable GL_TEXTURE_2D; 1349 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1350 glDisable GL_BLEND;
1004} 1351}
1005 1352
1006############################################################################# 1353#############################################################################
1007 1354
1008package CFClient::UI::Entry; 1355package CFClient::UI::EntryBase;
1009 1356
1010our @ISA = CFClient::UI::Label::; 1357our @ISA = CFClient::UI::Label::;
1011 1358
1012use SDL; 1359use CFClient::OpenGL;
1013use SDL::OpenGL;
1014 1360
1015sub new { 1361sub new {
1016 my $class = shift; 1362 my $class = shift;
1017 1363
1018 $class->SUPER::new ( 1364 $class->SUPER::new (
1019 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1367 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1023 can_hover => 1, 1369 can_hover => 1,
1024 can_focus => 1, 1370 can_focus => 1,
1371 valign => 0,
1372 can_events => 1,
1025 @_ 1373 @_
1026 ) 1374 )
1027} 1375}
1028 1376
1029sub _set_text { 1377sub _set_text {
1030 my ($self, $text) = @_; 1378 my ($self, $text) = @_;
1031 1379
1032 my $old_text = $self->{text}; 1380 delete $self->{cur_h};
1381
1382 return if $self->{text} eq $text;
1383
1384 delete $self->{texture};
1033 1385
1034 $self->{last_activity} = $::NOW; 1386 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1387 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039 1388
1040 $text =~ s/./*/g if $self->{hidden}; 1389 $text =~ s/./*/g if $self->{hidden};
1390 $self->{layout}->set_text ("$text ");
1041 1391
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1392 $self->emit (changed => $self->{text});
1393}
1043 1394
1044 $text = substr $text, 0, $self->{cursor}; 1395sub get_text {
1045 utf8::encode $text; 1396 $_[0]{text}
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051} 1397}
1052 1398
1053sub size_request { 1399sub size_request {
1054 my ($self) = @_; 1400 my ($self) = @_;
1055 1401
… …
1057 1403
1058 ($w + 1, $h) # add 1 for cursor 1404 ($w + 1, $h) # add 1 for cursor
1059} 1405}
1060 1406
1061sub size_allocate { 1407sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1408 my ($self, $w, $h) = @_;
1063 1409
1064 $self->SUPER::size_allocate ($x, $y, $w, $h); 1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1065
1066 $self->_set_text ($self->{text});
1067} 1411}
1068 1412
1069sub set_text { 1413sub set_text {
1070 my ($self, $text) = @_; 1414 my ($self, $text) = @_;
1071 1415
… …
1075} 1419}
1076 1420
1077sub key_down { 1421sub key_down {
1078 my ($self, $ev) = @_; 1422 my ($self, $ev) = @_;
1079 1423
1080 my $mod = $ev->key_mod; 1424 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1425 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1426 my $uni = $ev->{unicode};
1084 1427
1085 my $text = $self->get_text; 1428 my $text = $self->get_text;
1086 1429
1087 if ($sym == SDLK_BACKSPACE) { 1430 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1431 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1432 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1433 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1434 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1435 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1436 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1437 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1438 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1439 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1440 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1441 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) { 1442 } elsif ($sym == 27) {
1100 $self->emit ('escape'); 1443 $self->emit ('escape');
1101 } elsif ($uni) { 1444 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni; 1445 substr $text, $self->{cursor}++, 0, chr $uni;
1103 } 1446 }
1104 1447
… …
1159 1502
1160 $self->SUPER::_draw; 1503 $self->SUPER::_draw;
1161 1504
1162 #TODO: force update every cursor change :( 1505 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1506 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1507
1508 unless (exists $self->{cur_h}) {
1509 my $text = substr $self->{text}, 0, $self->{cursor};
1510 utf8::encode $text;
1511
1512 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1513 }
1514
1164 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1516 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1517 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1518 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168 glEnd; 1519 glEnd;
1169 } 1520 }
1170} 1521}
1171 1522
1172package CFClient::UI::LineEntry; 1523package CFClient::UI::Entry;
1173 1524
1174our @ISA = CFClient::UI::Entry::; 1525our @ISA = CFClient::UI::EntryBase::;
1175 1526
1176use SDL; 1527use CFClient::OpenGL;
1177use SDL::OpenGL;
1178 1528
1179sub key_down { 1529sub key_down {
1180 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1181 1531
1182 my $sym = $ev->key_sym; 1532 my $sym = $ev->{sym};
1183 1533
1184 if ($sym == SDLK_RETURN) { 1534 if ($sym == 13) {
1535 unshift @{$self->{history}},
1536 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = '';
1185 $self->emit (activate => $self->get_text); 1539 $self->emit (activate => $txt);
1186 $self->update; 1540 $self->update;
1541
1542 } elsif ($sym == CFClient::SDLK_UP) {
1543 if ($self->{history_pointer} < 0) {
1544 $self->{history_saveback} = $self->get_text;
1545 }
1546 if (@{$self->{history} || []} > 0) {
1547 $self->{history_pointer}++;
1548 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1549 $self->{history_pointer} = @{$self->{history} || []} - 1;
1550 }
1551 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1552 }
1553
1554 } elsif ($sym == CFClient::SDLK_DOWN) {
1555 $self->{history_pointer}--;
1556 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1557
1558 if ($self->{history_pointer} >= 0) {
1559 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1560 } else {
1561 $self->set_text ($self->{history_saveback});
1562 }
1187 1563
1188 } else { 1564 } else {
1189 $self->SUPER::key_down ($ev); 1565 $self->SUPER::key_down ($ev);
1190 } 1566 }
1191 1567
… …
1195 1571
1196package CFClient::UI::Button; 1572package CFClient::UI::Button;
1197 1573
1198our @ISA = CFClient::UI::Label::; 1574our @ISA = CFClient::UI::Label::;
1199 1575
1200use SDL; 1576use CFClient::OpenGL;
1201use SDL::OpenGL;
1202 1577
1203my @tex = 1578my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1579 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1205 qw(b1_button_active.png); 1580 qw(b1_button_active.png);
1206 1581
1207sub new { 1582sub new {
1208 my $class = shift; 1583 my $class = shift;
1209 1584
1210 $class->SUPER::new ( 1585 $class->SUPER::new (
1211 padding => 4, 1586 padding => 4,
1212 fg => [1, 1, 1], 1587 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1588 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1589 active_fg => [0, 0, 1],
1215 can_hover => 1, 1590 can_hover => 1,
1591 align => 0,
1592 valign => 0,
1593 can_events => 1,
1216 @_ 1594 @_
1217 ) 1595 )
1218} 1596}
1219 1597
1220sub button_up { 1598sub button_up {
… …
1228 1606
1229sub _draw { 1607sub _draw {
1230 my ($self) = @_; 1608 my ($self) = @_;
1231 1609
1232 local $self->{fg} = $self->{fg}; 1610 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238 1611
1239 if ($GRAB == $self) { 1612 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1613 $self->{fg} = $self->{active_fg};
1241 } 1614 }
1242 1615
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1;
1245 1621
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1623
1248 glDisable GL_TEXTURE_2D; 1624 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1625 glDisable GL_BLEND;
1250 1626
1251 $self->SUPER::_draw; 1627 $self->SUPER::_draw;
… …
1256package CFClient::UI::CheckBox; 1632package CFClient::UI::CheckBox;
1257 1633
1258our @ISA = CFClient::UI::DrawBG::; 1634our @ISA = CFClient::UI::DrawBG::;
1259 1635
1260my @tex = 1636my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1638 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263 1639
1264use SDL; 1640use CFClient::OpenGL;
1265use SDL::OpenGL;
1266 1641
1267sub new { 1642sub new {
1268 my $class = shift; 1643 my $class = shift;
1269 1644
1270 $class->SUPER::new ( 1645 $class->SUPER::new (
… …
1281 my ($self) = @_; 1656 my ($self) = @_;
1282 1657
1283 ($self->{padding} * 2 + 6) x 2 1658 ($self->{padding} * 2 + 6) x 2
1284} 1659}
1285 1660
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down { 1661sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1662 my ($self, $ev, $x, $y) = @_;
1294 1663
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1664 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1665 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1322 glDisable GL_BLEND; 1691 glDisable GL_BLEND;
1323} 1692}
1324 1693
1325############################################################################# 1694#############################################################################
1326 1695
1696package CFClient::UI::Image;
1697
1698our @ISA = CFClient::UI::Base::;
1699
1700use CFClient::OpenGL;
1701use Carp qw/confess/;
1702
1703our %loaded_images;
1704
1705sub new {
1706 my $class = shift;
1707
1708 my $self = $class->SUPER::new (can_events => 0, @_);
1709
1710 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1711
1712 $loaded_images{$self->{image}} ||=
1713 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1714
1715 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1716
1717 Scalar::Util::weaken $loaded_images{$self->{image}};
1718
1719 $self->{aspect} = $tex->{w} / $tex->{h};
1720
1721 $self
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 ($self->{tex}->{w}, $self->{tex}->{h})
1728}
1729
1730sub _draw {
1731 my ($self) = @_;
1732
1733 my $tex = $self->{tex};
1734
1735 my ($w, $h) = ($self->{w}, $self->{h});
1736
1737 if ($self->{rot90}) {
1738 glRotate 90, 0, 0, 1;
1739 glTranslate 0, -$self->{w}, 0;
1740
1741 ($w, $h) = ($h, $w);
1742 }
1743
1744 glEnable GL_BLEND;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746 glEnable GL_TEXTURE_2D;
1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748
1749 $tex->draw_quad (0, 0, $w, $h);
1750
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D;
1753}
1754
1755#############################################################################
1756
1757package CFClient::UI::VGauge;
1758
1759our @ISA = CFClient::UI::Base::;
1760
1761use List::Util qw(min max);
1762
1763use CFClient::OpenGL;
1764
1765my %tex = (
1766 food => [
1767 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1768 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1769 ],
1770 grace => [
1771 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1772 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1773 ],
1774 hp => [
1775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1776 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1777 ],
1778 mana => [
1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1780 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1781 ],
1782);
1783
1784# eg. VGauge->new (gauge => 'food'), default gauge: food
1785sub new {
1786 my $class = shift;
1787
1788 my $self = $class->SUPER::new (
1789 type => 'food',
1790 @_
1791 );
1792
1793 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1794
1795 $self
1796}
1797
1798sub size_request {
1799 my ($self) = @_;
1800
1801 #my $tex = $tex{$self->{type}}[0];
1802 #@$tex{qw(w h)}
1803 (0, 0)
1804}
1805
1806sub set_max {
1807 my ($self, $max) = @_;
1808
1809 return if $self->{max_val} == $max;
1810
1811 $self->{max_val} = $max;
1812 $self->update;
1813}
1814
1815sub set_value {
1816 my ($self, $val, $max) = @_;
1817
1818 $self->set_max ($max)
1819 if defined $max;
1820
1821 return if $self->{val} == $val;
1822
1823 $self->{val} = $val;
1824 $self->update;
1825}
1826
1827sub _draw {
1828 my ($self) = @_;
1829
1830 my $tex = $tex{$self->{type}};
1831 my ($t1, $t2, $t3) = @$tex;
1832
1833 my ($w, $h) = ($self->{w}, $self->{h});
1834
1835 if ($self->{vertical}) {
1836 glRotate 90, 0, 0, 1;
1837 glTranslate 0, -$self->{w}, 0;
1838
1839 ($w, $h) = ($h, $w);
1840 }
1841
1842 my $ycut = $self->{val} / ($self->{max_val} || 1);
1843
1844 my $ycut1 = max 0, min 1, $ycut;
1845 my $ycut2 = max 0, min 1, $ycut - 1;
1846
1847 my $h1 = $self->{h} * (1 - $ycut1);
1848 my $h2 = $self->{h} * (1 - $ycut2);
1849
1850 glEnable GL_BLEND;
1851 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1852 glEnable GL_TEXTURE_2D;
1853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1854
1855 glBindTexture GL_TEXTURE_2D, $t1->{name};
1856 glBegin GL_QUADS;
1857 glTexCoord 0 , 0; glVertex 0 , 0;
1858 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1859 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1860 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1861 glEnd;
1862
1863 my $ycut1 = List::Util::min 1, $ycut;
1864 glBindTexture GL_TEXTURE_2D, $t2->{name};
1865 glBegin GL_QUADS;
1866 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1867 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1868 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1869 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1870 glEnd;
1871
1872 if ($t3) {
1873 glBindTexture GL_TEXTURE_2D, $t3->{name};
1874 glBegin GL_QUADS;
1875 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1876 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1877 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1878 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1879 glEnd;
1880 }
1881
1882 glDisable GL_BLEND;
1883 glDisable GL_TEXTURE_2D;
1884}
1885
1886#############################################################################
1887
1888package CFClient::UI::Gauge;
1889
1890our @ISA = CFClient::UI::VBox::;
1891
1892sub new {
1893 my ($class, %arg) = @_;
1894
1895 my $self = $class->SUPER::new (
1896 tooltip => $arg{type},
1897 can_hover => 1,
1898 can_events => 1,
1899 %arg,
1900 );
1901
1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1904 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1905
1906 $self
1907}
1908
1909sub set_fontsize {
1910 my ($self, $fsize) = @_;
1911
1912 $self->{value}->set_fontsize ($fsize);
1913 $self->{max} ->set_fontsize ($fsize);
1914}
1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1923sub set_value {
1924 my ($self, $val, $max) = @_;
1925
1926 $self->set_max ($max)
1927 if defined $max;
1928
1929 $self->{gauge}->set_value ($val, $max);
1930 $self->{value}->set_text ($val);
1931}
1932
1933#############################################################################
1934
1327package CFClient::UI::Slider; 1935package CFClient::UI::Slider;
1328 1936
1329use strict; 1937use strict;
1330 1938
1331use SDL::OpenGL; 1939use CFClient::OpenGL;
1332 1940
1333our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFClient::UI::DrawBG::;
1334 1942
1335my @tex = 1943my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1944 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1346 # TODO: calculations are off 1954 # TODO: calculations are off
1347 my $self = $class->SUPER::new ( 1955 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0], 1957 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10], 1958 range => [0, 0, 100, 10],
1351 req_w => 40, 1959 req_w => 20,
1352 req_h => 13, 1960 req_h => 20,
1353 vertical => 0, 1961 vertical => 0,
1354 can_hover => 1, 1962 can_hover => 1,
1355 inner_pad => 5, 1963 inner_pad => 5,
1356 @_ 1964 @_
1357 ); 1965 );
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2032 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2033 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 2034
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2035 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 2036
2037 $hi = $value + 1 if $lo == $hi;
2038
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2039 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2040 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 2041
1432 $page = int $page * $inner_w / ($hi - $lo); 2042 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 2043 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1459 2069
1460package CFClient::UI::TextView; 2070package CFClient::UI::TextView;
1461 2071
1462our @ISA = CFClient::UI::HBox::; 2072our @ISA = CFClient::UI::HBox::;
1463 2073
1464use SDL::OpenGL; 2074use CFClient::OpenGL;
1465 2075
1466sub new { 2076sub new {
1467 my $class = shift; 2077 my $class = shift;
1468 2078
1469 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1470 req_w => $::WIDTH / 6, 2080 fontsize => 1,
1471 req_h => $::HEIGHT / 6, 2081 can_events => 0,
1472 fontsize => $::FONTSIZE, 2082 #font => default_font
1473 @_, 2083 @_,
1474 2084
1475 layout => (new CFClient::Layout), 2085 layout => (new CFClient::Layout),
1476 par => [], 2086 par => [],
1477 height => 0, 2087 height => 0,
1478 children => [ 2088 children => [
1479 (new CFClient::UI::Empty expand => 1), 2089 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1), 2090 (new CFClient::UI::Slider vertical => 1),
1481 ], 2091 ],
1482 ); 2092 );
1483 2093
2094 $self->{children}[1]->connect (changed => sub { $self->update });
2095
1484 $self 2096 $self
2097}
2098
2099sub set_fontsize {
2100 my ($self, $fontsize) = @_;
2101
2102 $self->{fontsize} = $fontsize;
2103 $self->reflow;
1485} 2104}
1486 2105
1487sub text_height { 2106sub text_height {
1488 my ($self, $text) = @_; 2107 my ($self, $text) = @_;
1489 2108
1490 my $layout = $self->{layout}; 2109 my $layout = $self->{layout};
1491 2110
1492 $layout->set_height ($self->{fontsize}); 2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1493 $layout->set_width ($self->{w}); 2112 $layout->set_width ($self->{children}[0]{w});
1494 $layout->set_text ($text); 2113 $layout->set_text ($text);
1495 2114
1496 ($layout->size)[1] 2115 ($layout->size)[1]
1497} 2116}
1498 2117
1499sub reflow { 2118sub reflow {
1500 my ($self) = @_; 2119 my ($self) = @_;
1501 2120
1502 my $height = 0; 2121 $self->{need_reflow}++;
1503 2122 $self->update;
1504 for (@{$self->{par}}) {
1505 $height += $_->[0] = $self->text_height ($_->[2]);
1506 }
1507
1508 $self->{height} = $height;
1509
1510 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 ($self->{req_w}, $self->{req_h})
1517} 2123}
1518 2124
1519sub size_allocate { 2125sub size_allocate {
1520 my ($self, $x, $y, $w, $h) = @_; 2126 my ($self, $w, $h) = @_;
1521 2127
1522 $self->SUPER::size_allocate ($x, $y, $w, $h); 2128 $self->SUPER::size_allocate ($w, $h);
1523 2129
2130 $self->{layout}->set_font ($self->{font}) if $self->{font};
1524 $self->{layout}->set_height ($self->{fontsize}); 2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 $self->{layout}->set_width ($self->{w}); 2132 $self->{layout}->set_width ($self->{children}[0]{w});
1526 2133
1527 $self->reflow; 2134 $self->reflow;
1528 $self->update;
1529} 2135}
1530 2136
1531sub add_paragraph { 2137sub add_paragraph {
1532 my ($self, $color, $text) = @_; 2138 my ($self, $color, $text) = @_;
1533 2139
… …
1548 2154
1549 $self->SUPER::update; 2155 $self->SUPER::update;
1550 2156
1551 return unless $self->{h} > 0; 2157 return unless $self->{h} > 0;
1552 2158
2159 delete $self->{texture};
2160
2161 $ROOT->on_refresh ($self, sub {
2162 if (delete $self->{need_reflow}) {
2163 my $height = 0;
2164
2165 $height += $_->[0] = $self->text_height ($_->[2])
2166 for @{$self->{par}};
2167
2168 $self->{height} = $height;
2169
2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2171
2172 delete $self->{texture};
2173 }
2174
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1554 glClearColor 0, 0, 0, 1; 2176 glClearColor 0, 0, 0, 0;
1555 glClear GL_COLOR_BUFFER_BIT; 2177 glClear GL_COLOR_BUFFER_BIT;
1556 2178
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D; 2181 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 2183
2184 my $top = int $self->{children}[1]{range}[0];
2185
2186 my $y0 = $top;
2187 my $y1 = $top + $self->{h};
2188
1565 my $y = 0; 2189 my $y = 0;
1566 2190
1567 my $layout = $self->{layout}; 2191 my $layout = $self->{layout};
1568 2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
1569 for my $par (@{$self->{par}}) { 2195 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0]; 2196 my $h = $par->[0];
1571 2197
1572 if ($y0 < $y + $h && $y < $y1) { 2198 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]); 2199 $layout->set_text ($par->[2]);
1574 2200
1575 glColor @{ $par->[1] }; 2201 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size; 2202 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2204 }
2205
2206 $y += $h;
1578 } 2207 }
1579 2208
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND; 2210 glDisable GL_BLEND;
2211 };
1585 }; 2212 });
1586} 2213}
1587 2214
1588sub _draw { 2215sub _draw {
1589 my ($self) = @_; 2216 my ($self) = @_;
1590 2217
1591 if ($self->{texture}) { 2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1592 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1595 glDisable GL_TEXTURE_2D; 2224 glDisable GL_TEXTURE_2D;
1596 }
1597
1598}
1599
1600#############################################################################
1601
1602package CFClient::UI::MapWidget;
1603
1604use strict;
1605
1606use List::Util qw(min max);
1607
1608use SDL;
1609use SDL::OpenGL;
1610
1611our @ISA = CFClient::UI::Base::;
1612
1613sub new {
1614 my $class = shift;
1615
1616 $class->SUPER::new (
1617 z => -1,
1618 can_focus => 1,
1619 list => (glGenLists 1),
1620 @_
1621 )
1622}
1623
1624sub key_down {
1625 print "MAPKEYDOWN\n";
1626}
1627
1628sub key_up {
1629}
1630
1631sub size_request {
1632 (
1633 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32,
1635 )
1636}
1637
1638sub update {
1639 my ($self) = @_;
1640
1641 $self->{need_update} = 1;
1642 $self->SUPER::update;
1643}
1644
1645sub draw {
1646 my ($self) = @_;
1647
1648 $self->{need_update}++;#d#
1649 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE;
1651
1652 my $sw = int $::WIDTH / 32;
1653 my $sh = int $::HEIGHT / 32;
1654
1655 if ($::MAP) {
1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1657
1658 if ($::CFG->{fow_enable}) {
1659 if ($::CFG->{fow_smooth}) { # smooth fog of war
1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661 glConvolutionFilter2D
1662 GL_CONVOLUTION_2D,
1663 GL_ALPHA,
1664 3, 3,
1665 GL_ALPHA, GL_FLOAT,
1666 pack "f*",
1667 0.1, 0.1, 0.1,
1668 0.1, 0.2, 0.1,
1669 0.1, 0.1, 0.1,
1670 ;
1671 glEnable GL_CONVOLUTION_2D;
1672 }
1673
1674 my $tex = new CFClient::Texture
1675 w => $w,
1676 h => $h,
1677 data => $data,
1678 internalformat => GL_ALPHA,
1679 format => GL_ALPHA;
1680
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682
1683 glEnable GL_BLEND;
1684 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686
1687 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND; 2225 glDisable GL_BLEND;
1692 }
1693 }
1694 2226
1695 glEndList; 2227 $self->{children}[1]->draw;
1696 }
1697 2228
1698 glCallList $self->{list};
1699
1700 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP;
1704 glBegin GL_QUADS;
1705 glVertex 0, 0;
1706 glVertex 0, $::HEIGHT;
1707 glVertex $::WIDTH, $::HEIGHT;
1708 glVertex $::WIDTH, 0;
1709 glEnd;
1710 glDisable GL_COLOR_LOGIC_OP;
1711 }
1712}
1713
1714my %DIR = (
1715 SDLK_KP8, [1, "north"],
1716 SDLK_KP9, [2, "northeast"],
1717 SDLK_KP6, [3, "east"],
1718 SDLK_KP3, [4, "southeast"],
1719 SDLK_KP2, [5, "south"],
1720 SDLK_KP1, [6, "southwest"],
1721 SDLK_KP4, [7, "west"],
1722 SDLK_KP7, [8, "northwest"],
1723
1724 SDLK_UP, [1, "north"],
1725 SDLK_RIGHT, [3, "east"],
1726 SDLK_DOWN, [5, "south"],
1727 SDLK_LEFT, [7, "west"],
1728);
1729
1730sub key_down {
1731 my ($self, $ev) = @_;
1732
1733 my $mod = $ev->key_mod;
1734 my $sym = $ev->key_sym;
1735
1736 if ($sym == SDLK_KP5) {
1737 $::CONN->user_send ("command stay fire");
1738 } elsif ($sym == SDLK_a) {
1739 $::CONN->user_send ("command apply");
1740 } elsif ($sym == SDLK_QUOTE) {
1741 $self->emit ('activate_console');
1742 } elsif ($sym == SDLK_SLASH) {
1743 $self->emit ('activate_console' => '/');
1744 } elsif (exists $DIR{$sym}) {
1745 if ($mod & KMOD_SHIFT) {
1746 $self->{shft}++;
1747 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1748 } elsif ($mod & KMOD_CTRL) {
1749 $self->{ctrl}++;
1750 $::CONN->user_send ("command run $DIR{$sym}[0]");
1751 } else {
1752 $::CONN->user_send ("command $DIR{$sym}[1]");
1753 }
1754 }
1755}
1756
1757sub key_up {
1758 my ($self, $ev) = @_;
1759
1760 my $mod = $ev->key_mod;
1761 my $sym = $ev->key_sym;
1762
1763 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764 $::CONN->user_send ("command fire_stop");
1765 }
1766 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767 $::CONN->user_send ("command run_stop");
1768 }
1769} 2229}
1770 2230
1771############################################################################# 2231#############################################################################
1772 2232
1773package CFClient::UI::Animator; 2233package CFClient::UI::Animator;
1774 2234
1775use SDL::OpenGL; 2235use CFClient::OpenGL;
1776 2236
1777our @ISA = CFClient::UI::Bin::; 2237our @ISA = CFClient::UI::Bin::;
1778 2238
1779sub moveto { 2239sub moveto {
1780 my ($self, $x, $y) = @_; 2240 my ($self, $x, $y) = @_;
… …
1818 2278
1819sub new { 2279sub new {
1820 my $class = shift; 2280 my $class = shift;
1821 2281
1822 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
1823 state => 0, 2283 state => 0,
1824 connect_activate => \&toggle_flopper, 2284 connect_activate => \&toggle_flopper,
1825 @_ 2285 @_
1826 ); 2286 );
1827 2287
1828 if ($self->{state}) { 2288 if ($self->{state}) {
… …
1836sub toggle_flopper { 2296sub toggle_flopper {
1837 my ($self) = @_; 2297 my ($self) = @_;
1838 2298
1839 # TODO: use animation 2299 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) { 2300 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2301 $CFClient::UI::ROOT->add ($self->{other});
1842 $self->{other}->move ( 2302 $self->{other}->move ($self->coord2global (0, $self->{h}));
1843 ($::WIDTH - $self->{other}{w}) * 0.5, 2303 $self->emit ("open");
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else { 2304 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2305 $CFClient::UI::ROOT->remove ($self->{other});
2306 $self->emit ("close");
2307 }
2308
2309 $self->emit (changed => $self->{state});
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Tooltip;
2315
2316our @ISA = CFClient::UI::Bin::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 @_,
2325 can_events => 0,
2326 )
2327}
2328
2329sub set_markup {
2330 my ($self, $text) = @_;
2331
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2333 $self->{label}->set_markup ($text);
2334 $self->add ($self->{label});
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343
2344 ($w + 4, $h + 4)
2345}
2346
2347sub size_allocate {
2348 my ($self, $w, $h) = @_;
2349
2350 $self->SUPER::size_allocate ($w - 4, $h - 4);
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375;
2358
2359 my ($w, $h) = @$self{qw(w h)};
2360
2361 glColor 1, 0.8, 0.4;
2362 glBegin GL_QUADS;
2363 glVertex 0 , 0;
2364 glVertex 0 , $h;
2365 glVertex $w, $h;
2366 glVertex $w, 0;
2367 glEnd;
1848 } 2368
1849} 2369 glColor 0, 0, 0;
2370 glBegin GL_LINE_LOOP;
2371 glVertex 0 , 0;
2372 glVertex 0 , $h;
2373 glVertex $w, $h;
2374 glVertex $w, 0;
2375 glEnd;
2376
2377 glPopMatrix;
1850 2378
1851############################################################################# 2379 glTranslate 2, 2;
2380 $self->SUPER::_draw;
2381}
1852 2382
2383#############################################################################
2384
1853package CFClient::UI::Toplevel; 2385package CFClient::UI::Face;
2386
2387our @ISA = CFClient::UI::Base::;
2388
2389use CFClient::OpenGL;
2390
2391sub new {
2392 my $class = shift;
2393
2394 $class->SUPER::new (
2395 aspect => 1,
2396 @_,
2397 )
2398}
2399
2400sub size_request {
2401 (32, 8)
2402}
2403
2404sub draw {
2405 my ($self) = @_;
2406
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408
2409 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 }
2419}
2420
2421#############################################################################
2422
2423package CFClient::UI::Root;
1854 2424
1855our @ISA = CFClient::UI::Container::; 2425our @ISA = CFClient::UI::Container::;
2426
2427use CFClient::OpenGL;
2428
2429sub check_size {
2430 my ($self) = @_;
2431
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2433}
1856 2434
1857sub size_request { 2435sub size_request {
1858 ($::WIDTH, $::HEIGHT) 2436 ($::WIDTH, $::HEIGHT)
1859} 2437}
1860 2438
1861sub size_allocate { 2439sub configure {
1862 my ($self, $x, $y, $w, $h) = @_; 2440 my ($self, $x, $y, $w, $h) = @_;
1863 2441
1864 $self->_size_allocate ($x, $y, $w, $h); 2442 $self->SUPER::configure ($x, $y, $w, $h);
1865 2443
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}}; 2444 for my $child (@{$self->{children}}) {
1868} 2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1869 2446
1870sub translate { 2447 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H);
2450 }
2451}
2452
2453sub _topleft {
1871 my ($self, $x, $y) = @_; 2454 my ($self, $x, $y) = @_;
1872 2455
1873 ($x, $y) 2456 ($x, $y)
1874} 2457}
1875 2458
1876sub update { 2459sub update {
1877 my ($self) = @_; 2460 my ($self) = @_;
1878 2461
1879 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2462 $self->check_size;
1880 ::refresh (); 2463 ::refresh ();
1881} 2464}
1882 2465
1883sub add { 2466sub add {
1884 my ($self, $widget) = @_; 2467 my ($self, $child) = @_;
1885 2468
2469 # integerize window positions
2470 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y};
2472
1886 $self->SUPER::add ($widget); 2473 $self->SUPER::add ($child);
2474}
1887 2475
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2476sub on_refresh {
2477 my ($self, $id, $cb) = @_;
2478
2479 $self->{refresh_hook}{$id} = $cb;
1889} 2480}
1890 2481
1891sub draw { 2482sub draw {
1892 my ($self) = @_; 2483 my ($self) = @_;
1893 2484
2485 while (my $rcb = delete $self->{refresh_hook}) {
2486 $_->() for values %$rcb;
2487 }
2488
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT;
2492
2493 glMatrixMode GL_PROJECTION;
2494 glLoadIdentity;
2495 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2496 glMatrixMode GL_MODELVIEW;
2497 glLoadIdentity;
2498
1894 $self->_draw; 2499 $self->_draw;
1895} 2500}
1896 2501
1897############################################################################# 2502#############################################################################
1898 2503
1899package CFClient::UI; 2504package CFClient::UI;
1900 2505
2506$ROOT = new CFClient::UI::Root;
1901$TOPLEVEL = new CFClient::UI::Toplevel; 2507$TOOLTIP = new CFClient::UI::Tooltip;
1902 2508
19031 25091
1904 2510

Diff Legend

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