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.79 by root, Wed Apr 12 00:26:50 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; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $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;
136} 267}
137 268
138# translate global koordinates to local coordinate system 269# return top left coordinates
139sub translate { 270sub _topleft {
140 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
141 272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277}
278
279# translate global coordinates to local coordinate system
280sub coord2local {
281 my ($self, $x, $y) = @_;
282
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;
299 return unless $self->{can_focus};
149 300
150 my $focus = $FOCUS; $FOCUS = $self; 301 my $focus = $FOCUS; $FOCUS = $self;
302
303 $self->emit (focus_in => $focus);
304
151 $focus->update if $focus; 305 $focus->update if $focus;
152 $FOCUS->update; 306 $FOCUS->update;
153} 307}
154 308
155sub focus_out { 309sub focus_out {
156 my ($self) = @_; 310 my ($self) = @_;
157 311
158 return unless $FOCUS == $self; 312 return unless $FOCUS == $self;
159 313
160 my $focus = $FOCUS; undef $FOCUS; 314 my $focus = $FOCUS; undef $FOCUS;
315
316 $self->emit (focus_out => $focus);
317
161 $focus->update if $focus; #? 318 $focus->update if $focus; #?
162} 319}
163 320
164sub mouse_motion { } 321sub mouse_motion { }
165sub button_up { } 322sub button_up { }
186 glPushMatrix; 343 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 344 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 345 $self->_draw;
189 glPopMatrix; 346 glPopMatrix;
190 347
191 if ($self == $HOVER) { 348 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 349 my ($x, $y) = @$self{qw(x y)};
193 350
194 glColor 0, 0, 1, 0.2; 351 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 352 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 354 glBegin GL_QUADS;
198 glVertex $x , $y; 355 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 356 glVertex $x + $self->{w}, $y;
200 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
201 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
202 glEnd; 359 glEnd;
203 glDisable GL_BLEND; 360 glDisable GL_BLEND;
204 } 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 }
205} 376}
206 377
207sub _draw { 378sub _draw {
208 my ($self) = @_; 379 my ($self) = @_;
209 380
210 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
211} 382}
212 383
213sub find_widget { 384sub find_widget {
214 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
215 388
216 return $self 389 return $self
217 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
218 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
219 392
220 () 393 ()
221} 394}
222 395
223sub set_parent { 396sub set_parent {
224 my ($self, $par) = @_; 397 my ($self, $parent) = @_;
225 398
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 399 Scalar::Util::weaken ($self->{parent} = $parent);
228} 400}
229 401
230sub get_parent { 402sub check_size {
403 my ($self) = @_;
404
231 $_[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 }
232} 426}
233 427
234sub update { 428sub update {
235 my ($self) = @_; 429 my ($self) = @_;
236 430
239} 433}
240 434
241sub connect { 435sub connect {
242 my ($self, $signal, $cb) = @_; 436 my ($self, $signal, $cb) = @_;
243 437
244 push @{ $self->{cb}{$signal} }, $cb; 438 push @{ $self->{signal_cb}{$signal} }, $cb;
245} 439}
246 440
247sub emit { 441sub emit {
248 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
249 443
250 $_->($self, @args) 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
251 for @{$self->{cb}{$signal} || []};
252} 445}
253 446
254sub DESTROY { 447sub DESTROY {
255 my ($self) = @_; 448 my ($self) = @_;
256 449
262package CFClient::UI::DrawBG; 455package CFClient::UI::DrawBG;
263 456
264our @ISA = CFClient::UI::Base::; 457our @ISA = CFClient::UI::Base::;
265 458
266use strict; 459use strict;
267use SDL::OpenGL; 460use CFClient::OpenGL;
268 461
269sub new { 462sub new {
270 my $class = shift; 463 my $class = shift;
271 464
272 # range [value, low, high, page] 465 # range [value, low, high, page]
301 494
302package CFClient::UI::Empty; 495package CFClient::UI::Empty;
303 496
304our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
305 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
306sub size_request { 504sub size_request {
307 (0, 0) 505 (0, 0)
308} 506}
309 507
310sub draw { } 508sub draw { }
318sub new { 516sub new {
319 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
320 518
321 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
322 520
323 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
324 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
325 527
326 $self 528 $self
327} 529}
328 530
329sub add { 531sub add {
330 my ($self, $chld) = @_; 532 my ($self, $child) = @_;
331 533
332 $chld->set_parent ($self); 534 $child->set_parent ($self);
535
536 use sort 'stable';
333 537
334 $self->{children} = [ 538 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 539 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 540 @{$self->{children}}, $child
337 ]; 541 ];
338 542
339 $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;
340 $self->update; 559 $self->update;
341} 560}
342 561
343sub remove { 562sub clear {
344 my ($self, $widget) = @_; 563 my ($self) = @_;
345 564
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 565 my $children = delete $self->{children};
566 $self->{children} = [];
347 567
348 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
349} 572}
350 573
351sub find_widget { 574sub find_widget {
352 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
353 576
383 606
384 $class->SUPER::new (children => [$child], %arg) 607 $class->SUPER::new (children => [$child], %arg)
385} 608}
386 609
387sub add { 610sub add {
388 my ($self, $widget) = @_; 611 my ($self, $child) = @_;
389 612
390 $self->{children} = []; 613 $self->{children} = [];
391 614
392 $self->SUPER::add ($widget); 615 $self->SUPER::add ($child);
393} 616}
394 617
395sub remove { 618sub remove {
396 my ($self, $widget) = @_; 619 my ($self, $widget) = @_;
397 620
406sub size_request { 629sub size_request {
407 $_[0]{children}[0]->size_request 630 $_[0]{children}[0]->size_request
408} 631}
409 632
410sub size_allocate { 633sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_; 634 my ($self, $w, $h) = @_;
412 635
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h); 636 $self->{children}[0]->configure (0, 0, $w, $h);
416} 637}
417 638
418############################################################################# 639#############################################################################
419 640
420package CFClient::UI::Window; 641package CFClient::UI::Window;
421 642
422our @ISA = CFClient::UI::Bin::; 643our @ISA = CFClient::UI::Bin::;
423 644
424use SDL::OpenGL; 645use CFClient::OpenGL;
425 646
426sub new { 647sub new {
427 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
428 649
429 my $self = $class->SUPER::new (%arg); 650 my $self = $class->SUPER::new (%arg);
430} 651}
431 652
432sub update { 653sub update {
433 my ($self) = @_; 654 my ($self) = @_;
434 655
435 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
436 $self->render_chld;
437 $self->SUPER::update; 657 $self->SUPER::update;
438} 658}
439 659
440sub render_chld {
441 my ($self) = @_;
442
443 $self->{texture} =
444 CFClient::Texture->new_from_opengl (
445 $self->{w}, $self->{h}, sub { $self->child->draw }
446 );
447}
448
449sub size_allocate { 660sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 661 my ($self, $w, $h) = @_;
451 662
452 $self->_size_allocate ($x, $y, $w, $h) or return;
453
454 $self->child->size_allocate (0, 0, $w, $h); 663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
455 666
456 $self->render_chld; 667sub render_child {
668 my ($self) = @_;
669
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT;
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;
681 };
457} 682}
458 683
459sub _draw { 684sub _draw {
460 my ($self) = @_; 685 my ($self) = @_;
461 686
462 my ($w, $h) = ($self->w, $self->h); 687 my ($w, $h) = ($self->w, $self->h);
463 688
464 my $tex = $self->{texture} 689 my $tex = $self->{texture}
465 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});
466 753
467 glEnable GL_BLEND; 754 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469 glEnable GL_TEXTURE_2D; 756 glEnable GL_TEXTURE_2D;
470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
471 758
472 $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;
473 766
767
768 $self->child->draw;
474 glDisable GL_BLEND; 769 glDisable GL_BLEND;
475 glDisable GL_TEXTURE_2D; 770 glDisable GL_TEXTURE_2D;
476} 771}
477 772
478############################################################################# 773#############################################################################
479 774
480package CFClient::UI::Frame; 775package CFClient::UI::FancyFrame;
481 776
482our @ISA = CFClient::UI::Bin::; 777our @ISA = CFClient::UI::Bin::;
483 778
484use SDL::OpenGL; 779use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784
785sub new {
786 my $class = shift;
787
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1],
793 border => 0.6,
794 can_events => 1,
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}
485 810
486sub size_request { 811sub size_request {
487 my ($self) = @_; 812 my ($self) = @_;
488 my $chld = $self->child
489 or return (0, 0);
490 813
491 $chld->move (2, 2); 814 my ($w, $h) = $self->SUPER::size_request;
492 815
493 map { $_ + 4 } $chld->size_request; 816 (
817 $w + $self->border * 2,
818 $h + $self->border * 2,
819 )
494} 820}
495 821
496sub size_allocate { 822sub size_allocate {
497 my ($self, $x, $y, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
498
499 $self->_size_allocate ($x, $y, $w, $h) or return;
500 824
501 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 825 $h -= List::Util::max 0, $self->border * 2;
502} 826 $w -= List::Util::max 0, $self->border * 2;
503 827
504sub _draw { 828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
505 my ($self) = @_; 829 if $self->{title};
506 830
507 my $chld = $self->child; 831 $self->child->configure ($self->border, $self->border, $w, $h);
508
509 my ($w, $h) = $chld->size_request;
510
511 glBegin GL_QUADS;
512 glColor 0, 0, 0;
513 glVertex 0 , 0;
514 glVertex 0 , $h + 4;
515 glVertex $w + 4 , $h + 4;
516 glVertex $w + 4 , 0;
517 glEnd;
518
519 $chld->draw;
520}
521
522#############################################################################
523
524package CFClient::UI::FancyFrame;
525
526our @ISA = CFClient::UI::Bin::;
527
528use SDL::OpenGL;
529
530my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533
534sub size_request {
535 my ($self) = @_;
536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
539 my ($w, $h) = $self->SUPER::size_request;
540
541 $h += $tex[1]->{h};
542 $h += $tex[4]->{h};
543 $w += $tex[2]->{w};
544 $w += $tex[3]->{w};
545
546 ($w, $h)
547}
548
549sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_;
551
552 $self->_size_allocate ($x, $y, $w, $h) or return;
553
554 $h -= $tex[1]{h};
555 $h -= $tex[4]{h};
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558
559 $h = $h < 0 ? 0 : $h;
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 832}
566 833
567sub button_down { 834sub button_down {
568 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
569 836
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 837 my ($w, $h) = @$self{qw(w h)};
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 838 my $border = $self->border;
572 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});
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
574 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;
575 850
576 $self->{motion} = sub { 851 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
578 853
579 ($x, $y) = ($ev->motion_x, $ev->motion_y); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
580 856
581 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
582 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
583 $self->update; 859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size;
584 }; 861 };
585 862
586 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
590 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
591 866
592 $self->{motion} = sub { 867 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
594 869
595 ($x, $y) = ($ev->motion_x, $ev->motion_y); 870 ($x, $y) = ($ev->{x}, $ev->{y});
596 871
597 $self->move ($bx + $x - $ox, $by + $y - $oy); 872 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update; 873 $self->update;
599 }; 874 };
600 } 875 }
613} 888}
614 889
615sub _draw { 890sub _draw {
616 my ($self) = @_; 891 my ($self) = @_;
617 892
618 my ($w, $h) = ($self->{w}, $self->{h}); 893 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 895
621 glEnable GL_BLEND; 896 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 898 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 900
626 my $top = $tex[1]; 901 my $border = $self->border;
902
903 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 904 $tex[1]->draw_quad (0, 0, $w, $border);
628 905 $tex[3]->draw_quad (0, $border, $border, $ch);
629 my $left = $tex[3]; 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 908
638 my $bg = $tex[0]; 909 my $bg = $tex[0];
639 910
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 911 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644
645 my $rep_x = $cw / $bg->{w}; 912 my $rep_x = $cw / $bg->{w};
646 my $rep_y = $ch / $bg->{h}; 913 my $rep_y = $ch / $bg->{h};
647 914
648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 915 glColor @{ $self->{bg} };
916
917 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch);
649 921
650 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 923 glDisable GL_BLEND;
652 924
925 $self->{title}->draw if $self->{title};
653 $self->child->draw; 926 $self->child->draw;
654
655} 927}
656 928
657############################################################################# 929#############################################################################
658 930
659package CFClient::UI::Table; 931package CFClient::UI::Table;
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;
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;
737 1025
1026 CFClient::UI::harmonize $ws;
1027 CFClient::UI::harmonize $hs;
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]
742 or next; 1033 or next;
743 1034
744 my $x = 0; 1035 my $x = 0;
745 my $row_h = $hs->[$r]; 1036 my $row_h = $hs->[$r];
746 1037
747 for my $c (0 .. $#$row) { 1038 for my $c (0 .. $#$row) {
748 my $widget = $row->[$c]
749 or next;
750
751 my $col_w = $ws->[$c]; 1039 my $col_w = $ws->[$c];
752 1040
1041 if (my $widget = $row->[$c]) {
753 $widget->size_allocate ($x, $y, $col_w, $row_h); 1042 $widget->configure ($x, $y, $col_w, $row_h);
1043 }
754 1044
755 $x += $col_w; 1045 $x += $col_w;
756 } 1046 }
757 1047
758 $y += $row_h; 1048 $y += $row_h;
802 (List::Util::max map $_->[1], @alloc), 1092 (List::Util::max map $_->[1], @alloc),
803 ) 1093 )
804} 1094}
805 1095
806sub size_allocate { 1096sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
808
809 $self->_size_allocate ($x, $y, $w, $h) or return;
810
811 return unless $self->{w};
812 1098
813 ($h, $w) = ($w, $h); 1099 ($h, $w) = ($w, $h);
814 1100
815 my $children = $self->{children}; 1101 my $children = $self->{children};
816 1102
817 my @h = map +($_->size_request)[0], @$children; 1103 my @h = map $_->{req_w}, @$children;
818 1104
819 my $req_h = List::Util::sum @h; 1105 my $req_h = List::Util::sum @h;
820 1106
821 if ($req_h > $h) { 1107 if ($req_h > $h) {
822 # ah well, not enough space 1108 # ah well, not enough space
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1118 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 1119 $h[$_] = $alloc_h;
834 } 1120 }
835 } 1121 }
836 1122
1123 CFClient::UI::harmonize \@h;
1124
837 my $y = 0; 1125 my $y = 0;
838 for (0 .. $#$children) { 1126 for (0 .. $#$children) {
839 my $child = $children->[$_]; 1127 my $child = $children->[$_];
840 my $h = $h[$_]; 1128 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 1129 $child->configure ($y, 0, $h, $w);
842 1130
843 $y += $h; 1131 $y += $h;
844 } 1132 }
1133
1134 1
845} 1135}
846 1136
847############################################################################# 1137#############################################################################
848 1138
849package CFClient::UI::VBox; 1139package CFClient::UI::VBox;
862 (List::Util::sum map $_->[1], @alloc), 1152 (List::Util::sum map $_->[1], @alloc),
863 ) 1153 )
864} 1154}
865 1155
866sub size_allocate { 1156sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 1157 my ($self, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h) or return;
870
871 return unless $self->{h};
872 1158
873 my $children = $self->{children}; 1159 my $children = $self->{children};
874 1160
875 my @h = map +($_->size_request)[1], @$children; 1161 my @h = map $_->{req_h}, @$children;
876 1162
877 my $req_h = List::Util::sum @h; 1163 my $req_h = List::Util::sum @h;
878 1164
879 if ($req_h > $h) { 1165 if ($req_h > $h) {
880 # ah well, not enough space 1166 # ah well, not enough space
888 1174
889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1175 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
890 } 1176 }
891 } 1177 }
892 1178
1179 CFClient::UI::harmonize \@h;
1180
893 my $y = 0; 1181 my $y = 0;
894 for (0 .. $#$children) { 1182 for (0 .. $#$children) {
895 my $child = $children->[$_]; 1183 my $child = $children->[$_];
896 my $h = $h[$_]; 1184 my $h = $h[$_];
897 $child->size_allocate (0, $y, $w, $h); 1185 $child->configure (0, $y, $w, $h);
898 1186
899 $y += $h; 1187 $y += $h;
900 } 1188 }
1189
1190 1
901} 1191}
902 1192
903############################################################################# 1193#############################################################################
904 1194
905package CFClient::UI::Label; 1195package CFClient::UI::Label;
906 1196
907our @ISA = CFClient::UI::Base::; 1197our @ISA = CFClient::UI::Base::;
908 1198
909use SDL::OpenGL; 1199use CFClient::OpenGL;
910 1200
911sub new { 1201sub new {
912 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
913 1203
914 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
915 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
916 height => $::FONTSIZE, 1206 #font => default_font
1207 fontsize => 1,
917 text => "", 1208 text => "",
918 align => -1, 1209 align => -1,
1210 valign => -1,
919 padding => 2, 1211 padding => 2,
920 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1213 can_events => 0,
921 %arg 1214 %arg
922 ); 1215 );
923 1216
924 $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};
925 1225
926 $self 1226 $self
927} 1227}
928 1228
929sub escape_text { 1229sub escape {
930 local $_ = $_[1]; 1230 local $_ = $_[1];
931 1231
932 s/&/&amp;/g; 1232 s/&/&amp;/g;
933 s/>/&gt;/g; 1233 s/>/&gt;/g;
934 s/</&lt;/g; 1234 s/</&lt;/g;
935 1235
936 $_[1] 1236 $_[1]
937} 1237}
938 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
939sub set_text { 1252sub set_text {
940 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
941 1254
1255 return if $self->{text} eq "T$text";
942 $self->{text} = $text; 1256 $self->{text} = "T$text";
1257
943 $self->{layout}->set_markup ($text); 1258 $self->{layout}->set_text ($text);
944 1259
945 delete $self->{texture}; 1260 delete $self->{texture};
946 $self->update; 1261 $self->update;
1262 $self->check_size;
947} 1263}
948 1264
949sub get_text { 1265sub set_markup {
950 my ($self, $text) = @_; 1266 my ($self, $markup) = @_;
951 1267
952 $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;
953} 1276}
954 1277
955sub size_request { 1278sub size_request {
956 my ($self) = @_; 1279 my ($self) = @_;
957 1280
958 $self->{layout}->set_width; 1281 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1);
959 $self->{layout}->set_height ($self->{height}); 1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1284
960 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 }
961 1296
962 ( 1297 (
963 $w + $self->{padding} * 2, 1298 $w + $self->{padding} * 2,
964 $h + $self->{padding} * 2, 1299 $h + $self->{padding} * 2,
965 ) 1300 )
966} 1301}
967 1302
968sub size_allocate { 1303sub size_allocate {
969 my ($self, $x, $y, $w, $h) = @_; 1304 my ($self, $w, $h) = @_;
970
971 $self->_size_allocate ($x, $y, $w, $h) or return;
972 1305
973 delete $self->{texture}; 1306 delete $self->{texture};
974} 1307}
975 1308
976sub update { 1309sub set_fontsize {
977 my ($self) = @_; 1310 my ($self, $fontsize) = @_;
978 1311
1312 $self->{fontsize} = $fontsize;
979 delete $self->{texture}; 1313 delete $self->{texture};
1314 $self->check_size;
980 $self->SUPER::update; 1315 $self->update;
981} 1316}
982 1317
983sub _draw { 1318sub _draw {
984 my ($self) = @_; 1319 my ($self) = @_;
985 1320
986 my $tex = $self->{texture} ||= do { 1321 my $tex = $self->{texture} ||= do {
1322 $self->{layout}->set_font ($self->{font}) if $self->{font};
987 $self->{layout}->set_width ($self->{w}); 1323 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
989 new_from_layout CFClient::Texture $self->{layout} 1325 new_from_layout CFClient::Texture $self->{layout}
990 }; 1326 };
991 1327
992 glEnable GL_BLEND; 1328 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
994 glEnable GL_TEXTURE_2D; 1330 glEnable GL_TEXTURE_2D;
995 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
996 1332
997 glColor @{$self->{fg}}; 1333 glColor @{$self->{fg}};
998 1334
999 my $x = 1335 $self->{ox} = int (
1000 $self->{align} < 0 ? $self->{padding} 1336 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5; 1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
1003 1340
1004 $tex->draw_quad ($x, $self->{padding}); 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});
1005 1348
1006 glDisable GL_TEXTURE_2D; 1349 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1350 glDisable GL_BLEND;
1008} 1351}
1009 1352
1010############################################################################# 1353#############################################################################
1011 1354
1012package CFClient::UI::Entry; 1355package CFClient::UI::EntryBase;
1013 1356
1014our @ISA = CFClient::UI::Label::; 1357our @ISA = CFClient::UI::Label::;
1015 1358
1016use SDL; 1359use CFClient::OpenGL;
1017use SDL::OpenGL;
1018 1360
1019sub new { 1361sub new {
1020 my $class = shift; 1362 my $class = shift;
1021 1363
1022 $class->SUPER::new ( 1364 $class->SUPER::new (
1023 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5], 1367 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1369 can_hover => 1,
1370 can_focus => 1,
1371 valign => 0,
1372 can_events => 1,
1027 @_ 1373 @_
1028 ) 1374 )
1029} 1375}
1030 1376
1031sub _set_text { 1377sub _set_text {
1032 my ($self, $text) = @_; 1378 my ($self, $text) = @_;
1033 1379
1380 delete $self->{cur_h};
1381
1382 return if $self->{text} eq $text;
1383
1384 delete $self->{texture};
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 1388
1039 $text =~ s/./*/g if $self->{hidden}; 1389 $text =~ s/./*/g if $self->{hidden};
1390 $self->{layout}->set_text ("$text ");
1040 1391
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1392 $self->emit (changed => $self->{text});
1393}
1042 1394
1043 $text = substr $text, 0, $self->{cursor}; 1395sub get_text {
1044 utf8::encode $text; 1396 $_[0]{text}
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047} 1397}
1048 1398
1049sub size_request { 1399sub size_request {
1050 my ($self) = @_; 1400 my ($self) = @_;
1051 1401
1053 1403
1054 ($w + 1, $h) # add 1 for cursor 1404 ($w + 1, $h) # add 1 for cursor
1055} 1405}
1056 1406
1057sub size_allocate { 1407sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_; 1408 my ($self, $w, $h) = @_;
1059 1409
1060 $self->SUPER::size_allocate ($x, $y, $w, $h); 1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1061
1062 $self->_set_text ($self->{text});
1063} 1411}
1064 1412
1065sub set_text { 1413sub set_text {
1066 my ($self, $text) = @_; 1414 my ($self, $text) = @_;
1067 1415
1071} 1419}
1072 1420
1073sub key_down { 1421sub key_down {
1074 my ($self, $ev) = @_; 1422 my ($self, $ev) = @_;
1075 1423
1076 my $mod = $ev->key_mod; 1424 my $mod = $ev->{mod};
1077 my $sym = $ev->key_sym; 1425 my $sym = $ev->{sym};
1078
1079 my $uni = $ev->key_unicode; 1426 my $uni = $ev->{unicode};
1080 1427
1081 my $text = $self->get_text; 1428 my $text = $self->get_text;
1082 1429
1083 if ($sym == SDLK_BACKSPACE) { 1430 if ($sym == 8) {
1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1431 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) { 1432 } elsif ($sym == 127) {
1086 substr $text, $self->{cursor}, 1, ""; 1433 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) { 1434 } elsif ($sym == CFClient::SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor}; 1435 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) { 1436 } elsif ($sym == CFClient::SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1437 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) { 1438 } elsif ($sym == CFClient::SDLK_HOME) {
1092 $self->{cursor} = 0; 1439 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) { 1440 } elsif ($sym == CFClient::SDLK_END) {
1094 $self->{cursor} = length $text; 1441 $self->{cursor} = length $text;
1442 } elsif ($sym == 27) {
1443 $self->emit ('escape');
1095 } elsif ($uni) { 1444 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni; 1445 substr $text, $self->{cursor}++, 0, chr $uni;
1097 } 1446 }
1098 1447
1099 $self->_set_text ($text); 1448 $self->_set_text ($text);
1153 1502
1154 $self->SUPER::_draw; 1503 $self->SUPER::_draw;
1155 1504
1156 #TODO: force update every cursor change :( 1505 #TODO: force update every cursor change :(
1157 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
1158 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1159 glBegin GL_LINES; 1516 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 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};
1162 glEnd; 1519 glEnd;
1163 } 1520 }
1164} 1521}
1165 1522
1523package CFClient::UI::Entry;
1524
1525our @ISA = CFClient::UI::EntryBase::;
1526
1527use CFClient::OpenGL;
1528
1529sub key_down {
1530 my ($self, $ev) = @_;
1531
1532 my $sym = $ev->{sym};
1533
1534 if ($sym == 13) {
1535 unshift @{$self->{history}},
1536 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = '';
1539 $self->emit (activate => $txt);
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 }
1563
1564 } else {
1565 $self->SUPER::key_down ($ev);
1566 }
1567
1568}
1569
1166############################################################################# 1570#############################################################################
1167 1571
1168package CFClient::UI::Button; 1572package CFClient::UI::Button;
1169 1573
1170our @ISA = CFClient::UI::Label::; 1574our @ISA = CFClient::UI::Label::;
1171 1575
1172use SDL; 1576use CFClient::OpenGL;
1173use SDL::OpenGL; 1577
1578my @tex =
1579 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1580 qw(b1_button_active.png);
1174 1581
1175sub new { 1582sub new {
1176 my $class = shift; 1583 my $class = shift;
1177 1584
1178 $class->SUPER::new ( 1585 $class->SUPER::new (
1179 padding => 4, 1586 padding => 4,
1180 fg => [1, 1, 1], 1587 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1588 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5], 1589 active_fg => [0, 0, 1],
1183 active_fg => [1, 1, 0], 1590 can_hover => 1,
1184 border_fg => [1, 1, 0], 1591 align => 0,
1592 valign => 0,
1593 can_events => 1,
1185 @_ 1594 @_
1186 ) 1595 )
1187} 1596}
1188 1597
1189sub button_up { 1598sub button_up {
1198sub _draw { 1607sub _draw {
1199 my ($self) = @_; 1608 my ($self) = @_;
1200 1609
1201 local $self->{fg} = $self->{fg}; 1610 local $self->{fg} = $self->{fg};
1202 1611
1612 if ($GRAB == $self) {
1613 $self->{fg} = $self->{active_fg};
1614 }
1615
1203 glEnable GL_BLEND; 1616 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1;
1205 1621
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly 1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1207 1623
1208 glBegin GL_LINE_LOOP; 1624 glDisable GL_TEXTURE_2D;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 }
1222
1223 glBegin GL_QUADS;
1224 glVertex 2 , 2;
1225 glVertex 2 , $self->{h} - 2;
1226 glVertex $self->{w} - 2, $self->{h} - 2;
1227 glVertex $self->{w} - 2, 2;
1228 glEnd;
1229 glDisable GL_BLEND; 1625 glDisable GL_BLEND;
1230 1626
1231 $self->SUPER::_draw; 1627 $self->SUPER::_draw;
1232} 1628}
1233 1629
1234############################################################################# 1630#############################################################################
1235 1631
1236package CFClient::UI::Slider; 1632package CFClient::UI::CheckBox;
1237
1238use strict;
1239
1240use SDL::OpenGL;
1241 1633
1242our @ISA = CFClient::UI::DrawBG::; 1634our @ISA = CFClient::UI::DrawBG::;
1635
1636my @tex =
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1639
1640use CFClient::OpenGL;
1243 1641
1244sub new { 1642sub new {
1245 my $class = shift; 1643 my $class = shift;
1246 1644
1645 $class->SUPER::new (
1646 padding => 2,
1647 fg => [1, 1, 1],
1648 active_fg => [1, 1, 0],
1649 state => 0,
1650 can_hover => 1,
1651 @_
1652 )
1653}
1654
1655sub size_request {
1656 my ($self) = @_;
1657
1658 ($self->{padding} * 2 + 6) x 2
1659}
1660
1661sub button_down {
1662 my ($self, $ev, $x, $y) = @_;
1663
1664 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1665 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1666 $self->{state} = !$self->{state};
1667 $self->emit (changed => $self->{state});
1668 }
1669}
1670
1671sub _draw {
1672 my ($self) = @_;
1673
1674 $self->SUPER::_draw;
1675
1676 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1677
1678 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1679
1680 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681
1682 glEnable GL_BLEND;
1683 glEnable GL_TEXTURE_2D;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685
1686 my $tex = $self->{state} ? $tex[1] : $tex[0];
1687
1688 $tex->draw_quad (0, 0, $s, $s);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692}
1693
1694#############################################################################
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
1935package CFClient::UI::Slider;
1936
1937use strict;
1938
1939use CFClient::OpenGL;
1940
1941our @ISA = CFClient::UI::DrawBG::;
1942
1943my @tex =
1944 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1945 qw(s1_slider.png s1_slider_bg.png);
1946
1947sub new {
1948 my $class = shift;
1949
1247 # range [value, low, high, page] 1950 # range [value, low, high, page]
1248 1951
1952 # TODO: 0-width page
1953 # TODO: req_w/h are wrong with vertical
1954 # TODO: calculations are off
1249 my $self = $class->SUPER::new ( 1955 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0], 1957 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10], 1958 range => [0, 0, 100, 10],
1253 req_w => 40, 1959 req_w => 20,
1254 req_h => 10, 1960 req_h => 20,
1255 vertical => 0, 1961 vertical => 0,
1962 can_hover => 1,
1963 inner_pad => 5,
1256 @_ 1964 @_
1257 ); 1965 );
1258 1966
1259 $self 1967 $self
1260} 1968}
1281 if ($GRAB == $self) { 1989 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1990 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283 1991
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1992 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285 1993
1994 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1995 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1996
1997 $x -= $inner_pad_px; # substract the padding
1286 $x = $x * ($hi - $lo) / $w + $lo; 1998 $x = $x * ($hi - $lo) / $inner_w + $lo;
1287 $x = $lo if $x < $lo; 1999 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page; 2000 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x; 2001 $self->{range}[0] = $x;
1290 2002
1291 $self->emit (changed => $x); 2003 $self->emit (changed => $x);
1292 $self->update; 2004 $self->update;
1293 } 2005 }
2006}
2007
2008# the inner_* stuff is for generating a padding for the slider handle,
2009# so that the handle doesn't leave the texture. This calculation isn't 100%
2010# correct propably, but it does the job for now
2011sub _calc_inner_pad_px {
2012 my ($self, $w) = @_;
2013 ($w / 100) * $self->{inner_pad} # % to pixels
1294} 2014}
1295 2015
1296sub _draw { 2016sub _draw {
1297 my ($self) = @_; 2017 my ($self) = @_;
1298 2018
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2032 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2033 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314 2034
1315 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2035 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316 2036
2037 $hi = $value + 1 if $lo == $hi;
2038
2039 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2040 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2041
1317 $page = int $page * $w / ($hi - $lo); 2042 $page = int $page * $inner_w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo); 2043 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319 2044
1320 $w -= $page; 2045 $w -= $page;
1321 $page &= ~1; 2046 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0; 2047 glTranslate $page * 0.5, 0, 0;
2048 $page ||= 2;
1323 2049
1324 glColor @$fg;
1325 glBegin GL_LINES;
1326 glVertex 0, 0; glVertex 0, $h;
1327 glVertex $w - 1, 0; glVertex $w - 1, $h;
1328 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1329 glEnd;
1330
1331 my $knob_a = $value - $page * 0.5; 2050 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1332 my $knob_b = $value + $page * 0.5; 2051 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1333 2052
1334 glBegin GL_QUADS; 2053 glEnable GL_BLEND;
1335 glColor @$fg; 2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1336 glVertex $knob_a, 0; 2055 glEnable GL_TEXTURE_2D;
1337 glVertex $knob_a, $h; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1338 glVertex $knob_b, $h;
1339 glVertex $knob_b, 0;
1340 2057
1341 if ($knob_a < $knob_b - 2) { 2058 # draw background
1342 glColor @$bg; 2059 $tex[1]->draw_quad (0, 0, $w, $h);
1343 glVertex $knob_a + 1, 1;
1344 glVertex $knob_a + 1, $h - 1;
1345 glVertex $knob_b - 1, $h - 1;
1346 glVertex $knob_b - 1, 1;
1347 }
1348 glEnd;
1349}
1350 2060
1351############################################################################# 2061 # draw handle
2062 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1352 2063
2064 glDisable GL_BLEND;
2065 glDisable GL_TEXTURE_2D;
2066}
2067
2068#############################################################################
2069
1353package CFClient::UI::MapWidget; 2070package CFClient::UI::TextView;
1354 2071
1355use strict;
1356
1357use List::Util qw(min max);
1358
1359use SDL;
1360use SDL::OpenGL;
1361
1362our @ISA = CFClient::UI::Base::; 2072our @ISA = CFClient::UI::HBox::;
2073
2074use CFClient::OpenGL;
1363 2075
1364sub new { 2076sub new {
1365 my $class = shift; 2077 my $class = shift;
1366 2078
1367 $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1368 z => -1, 2080 fontsize => 1,
1369 list => (glGenLists 1), 2081 can_events => 0,
2082 #font => default_font
1370 @_ 2083 @_,
2084
2085 layout => (new CFClient::Layout),
2086 par => [],
2087 height => 0,
2088 children => [
2089 (new CFClient::UI::Empty expand => 1),
2090 (new CFClient::UI::Slider vertical => 1),
2091 ],
1371 ) 2092 );
1372}
1373 2093
1374sub key_down { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
1375 print "MAPKEYDOWN\n";
1376}
1377 2095
1378sub key_up { 2096 $self
1379} 2097}
1380 2098
1381sub size_request { 2099sub set_fontsize {
2100 my ($self, $fontsize) = @_;
2101
2102 $self->{fontsize} = $fontsize;
2103 $self->reflow;
2104}
2105
2106sub text_height {
2107 my ($self, $text) = @_;
2108
2109 my $layout = $self->{layout};
2110
2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112 $layout->set_width ($self->{children}[0]{w});
2113 $layout->set_text ($text);
1382 ( 2114
1383 1 + 32 * int $::WIDTH / 32, 2115 ($layout->size)[1]
1384 1 + 32 * int $::HEIGHT / 32, 2116}
1385 ) 2117
2118sub reflow {
2119 my ($self) = @_;
2120
2121 $self->{need_reflow}++;
2122 $self->update;
2123}
2124
2125sub size_allocate {
2126 my ($self, $w, $h) = @_;
2127
2128 $self->SUPER::size_allocate ($w, $h);
2129
2130 $self->{layout}->set_font ($self->{font}) if $self->{font};
2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2132 $self->{layout}->set_width ($self->{children}[0]{w});
2133
2134 $self->reflow;
2135}
2136
2137sub add_paragraph {
2138 my ($self, $color, $text) = @_;
2139
2140 #TODO: intelligently "reformat" paragraph
2141
2142 my $height = $self->text_height ($text);
2143
2144 $self->{height} += $height;
2145
2146 push @{$self->{par}}, [$height, $color, $text];
2147
2148 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2149 $self->{children}[1]->update;
1386} 2150}
1387 2151
1388sub update { 2152sub update {
1389 my ($self) = @_; 2153 my ($self) = @_;
1390 2154
1391 $self->{need_update} = 1;
1392 $self->SUPER::update; 2155 $self->SUPER::update;
1393}
1394 2156
1395sub draw { 2157 return unless $self->{h} > 0;
1396 my ($self) = @_;
1397 2158
2159 delete $self->{texture};
2160
2161 $ROOT->on_refresh ($self, sub {
1398 if (delete $self->{need_update}) { 2162 if (delete $self->{need_reflow}) {
1399 glNewList $self->{list}, GL_COMPILE; 2163 my $height = 0;
1400 2164
1401 my $mx = $::CONN->{mapx}; 2165 $height += $_->[0] = $self->text_height ($_->[2])
1402 my $my = $::CONN->{mapy}; 2166 for @{$self->{par}};
1403 2167
1404 my $map = $::CONN->{map}; 2168 $self->{height} = $height;
1405 2169
1406 my ($xofs, $yofs); 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1407 2171
1408 my $sw = 1 + int $::WIDTH / 32; 2172 delete $self->{texture};
1409 my $sh = 1 + int $::HEIGHT / 32;
1410
1411 if ($::CONN->{mapw} > $sw) {
1412 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1413 } else {
1414 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1415 } 2173 }
1416 2174
1417 if ($::CONN->{maph} > $sh) { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1418 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 2176 glClearColor 0, 0, 0, 0;
1419 } else { 2177 glClear GL_COLOR_BUFFER_BIT;
1420 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1421 }
1422 2178
1423 glEnable GL_TEXTURE_2D;
1424 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2181 glEnable GL_TEXTURE_2D;
1426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1427 2183
1428 my $sw4 = ($sw + 3) & ~3; 2184 my $top = int $self->{children}[1]{range}[0];
1429 my $darkness = "\x00" x ($sw4 * $sh);
1430 2185
1431 for my $x (0 .. $sw - 1) { 2186 my $y0 = $top;
1432 my $row = $map->[$x + $xofs]; 2187 my $y1 = $top + $self->{h};
1433 for my $y (0 .. $sh - 1) {
1434 2188
1435 my $cell = $row->[$y + $yofs] 2189 my $y = 0;
1436 or next;
1437 2190
2191 my $layout = $self->{layout};
2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
2195 for my $par (@{$self->{par}}) {
1438 my $dark = $cell->[0]; 2196 my $h = $par->[0];
1439 if ($dark < 0) { 2197
1440 substr $darkness, $y * $sw4 + $x, 1, chr 224; 2198 if ($y0 < $y + $h && $y < $y1) {
1441 } else { 2199 $layout->set_text ($par->[2]);
1442 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 2200
2201 glColor @{ $par->[1] };
2202 my ($W, $H) = $layout->size;
2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1443 } 2204 }
1444 2205
1445 for my $num (grep $_, @$cell[1,2,3]) { 2206 $y += $h;
1446 my $tex = $::CONN->{face}[$num]{texture} || next;
1447
1448 my ($w, $h) = @$tex{qw(w h)};
1449
1450 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1451 }
1452 } 2207 }
1453 }
1454 2208
1455# if (1) { # higher quality darkness
1456# $lighting =~ s/(.)/$1$1$1/gs;
1457# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1458#
1459# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1460#
1461# $lighting = $pb->get_pixels;
1462# $lighting =~ s/(.)../$1/gs;
1463# }
1464
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466
1467 $darkness = new CFClient::Texture
1468 w => $sw4,
1469 h => $sh,
1470 data => $darkness,
1471 internalformat => GL_ALPHA,
1472 format => GL_ALPHA;
1473
1474 glColor 0.45, 0.45, 0.45, 1;
1475 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1476
1477 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
1478 glDisable GL_BLEND; 2210 glDisable GL_BLEND;
1479
1480 glEndList;
1481 }
1482
1483 glCallList $self->{list};
1484}
1485
1486my %DIR = (
1487 SDLK_KP8, [1, "north"],
1488 SDLK_KP9, [2, "northeast"],
1489 SDLK_KP6, [3, "east"],
1490 SDLK_KP3, [4, "southeast"],
1491 SDLK_KP2, [5, "south"],
1492 SDLK_KP1, [6, "southwest"],
1493 SDLK_KP4, [7, "west"],
1494 SDLK_KP7, [8, "northwest"],
1495
1496 SDLK_UP, [1, "north"],
1497 SDLK_RIGHT, [3, "east"],
1498 SDLK_DOWN, [5, "south"],
1499 SDLK_LEFT, [7, "west"],
1500);
1501
1502sub key_down {
1503 my ($self, $ev) = @_;
1504
1505 my $mod = $ev->key_mod;
1506 my $sym = $ev->key_sym;
1507
1508 if ($sym == SDLK_KP5) {
1509 $::CONN->send ("command stay fire");
1510 } elsif (exists $DIR{$sym}) {
1511 if ($mod & KMOD_SHIFT) {
1512 $self->{shft}++;
1513 $::CONN->send ("command fire $DIR{$sym}[0]");
1514 } elsif ($mod & KMOD_CTRL) {
1515 $self->{ctrl}++;
1516 $::CONN->send ("command run $DIR{$sym}[0]");
1517 } else {
1518 $::CONN->send ("command $DIR{$sym}[1]");
1519 } 2211 };
1520 } 2212 });
1521} 2213}
1522 2214
1523sub key_up { 2215sub _draw {
1524 my ($self, $ev) = @_; 2216 my ($self) = @_;
1525 2217
1526 my $mod = $ev->key_mod; 2218 glEnable GL_BLEND;
1527 my $sym = $ev->key_sym; 2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224 glDisable GL_TEXTURE_2D;
2225 glDisable GL_BLEND;
1528 2226
1529 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2227 $self->{children}[1]->draw;
1530 $::CONN->send ("command fire_stop"); 2228
1531 }
1532 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1533 $::CONN->send ("command run_stop");
1534 }
1535} 2229}
1536 2230
1537############################################################################# 2231#############################################################################
1538 2232
1539package CFClient::UI::Animator; 2233package CFClient::UI::Animator;
1540 2234
1541use SDL::OpenGL; 2235use CFClient::OpenGL;
1542 2236
1543our @ISA = CFClient::UI::Bin::; 2237our @ISA = CFClient::UI::Bin::;
1544 2238
1545sub moveto { 2239sub moveto {
1546 my ($self, $x, $y) = @_; 2240 my ($self, $x, $y) = @_;
1576 glPopMatrix; 2270 glPopMatrix;
1577} 2271}
1578 2272
1579############################################################################# 2273#############################################################################
1580 2274
1581package CFClient::UI::Toplevel; 2275package CFClient::UI::Flopper;
2276
2277our @ISA = CFClient::UI::Button::;
2278
2279sub new {
2280 my $class = shift;
2281
2282 my $self = $class->SUPER::new (
2283 state => 0,
2284 connect_activate => \&toggle_flopper,
2285 @_
2286 );
2287
2288 if ($self->{state}) {
2289 $self->{state} = 0;
2290 $self->toggle_flopper;
2291 }
2292
2293 $self
2294}
2295
2296sub toggle_flopper {
2297 my ($self) = @_;
2298
2299 # TODO: use animation
2300 if ($self->{state} = !$self->{state}) {
2301 $CFClient::UI::ROOT->add ($self->{other});
2302 $self->{other}->move ($self->coord2global (0, $self->{h}));
2303 $self->emit ("open");
2304 } else {
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;
2368
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;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw;
2381}
2382
2383#############################################################################
2384
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;
1582 2424
1583our @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}
1584 2434
1585sub size_request { 2435sub size_request {
1586 ($::WIDTH, $::HEIGHT) 2436 ($::WIDTH, $::HEIGHT)
1587} 2437}
1588 2438
1589sub size_allocate { 2439sub configure {
1590 my ($self, $x, $y, $w, $h) = @_; 2440 my ($self, $x, $y, $w, $h) = @_;
1591 2441
1592 $self->_size_allocate ($x, $y, $w, $h); 2442 $self->SUPER::configure ($x, $y, $w, $h);
1593 2443
1594 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1595 for @{$self->{children}}; 2444 for my $child (@{$self->{children}}) {
1596} 2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1597 2446
1598sub 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 {
1599 my ($self, $x, $y) = @_; 2454 my ($self, $x, $y) = @_;
1600 2455
1601 ($x, $y) 2456 ($x, $y)
1602} 2457}
1603 2458
1604sub update { 2459sub update {
1605 my ($self) = @_; 2460 my ($self) = @_;
1606 2461
1607 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2462 $self->check_size;
1608 ::refresh (); 2463 ::refresh ();
1609} 2464}
1610 2465
1611sub add { 2466sub add {
1612 my ($self, $widget) = @_; 2467 my ($self, $child) = @_;
1613 2468
2469 # integerize window positions
2470 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y};
2472
1614 $self->SUPER::add ($widget); 2473 $self->SUPER::add ($child);
2474}
1615 2475
1616 $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;
1617} 2480}
1618 2481
1619sub draw { 2482sub draw {
1620 my ($self) = @_; 2483 my ($self) = @_;
1621 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
1622 $self->_draw; 2499 $self->_draw;
1623} 2500}
1624 2501
1625############################################################################# 2502#############################################################################
1626 2503
1627package CFClient::UI; 2504package CFClient::UI;
1628 2505
2506$ROOT = new CFClient::UI::Root;
1629$TOPLEVEL = new CFClient::UI::Toplevel; 2507$TOOLTIP = new CFClient::UI::Tooltip;
1630 2508
16311 25091
1632 2510

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines