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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 $TOOLTIP->set_tooltip_from ($widget);
36 $TOOLTIP->show;
37 }
38
39 return;
40 }
41 }
42 }
43
44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
46 delete $TOOLTIP->{owner};
47});
20 48
21sub get_layout { 49sub get_layout {
22 my $layout; 50 my $layout;
23 51
24 for (grep { $_->{name} } values %WIDGET) { 52 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 67 my ($layout) = @_;
40 68
41 $LAYOUT = $layout; 69 $LAYOUT = $layout;
42} 70}
43 71
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 72# class methods for events
73sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 75 if $FOCUS;
76} 76}
… …
78sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 80 if $FOCUS;
81} 81}
82 82
83sub check_hover {
84 my ($widget) = @_;
85
86 if ($widget != $HOVER) {
87 my $hover = $HOVER; $HOVER = $widget;
88
89 $hover->update if $hover && $hover->{can_hover};
90 $HOVER->update if $HOVER && $HOVER->{can_hover};
91
92 $TOOLTIP_WATCHER->start;
93 }
94}
95
83sub feed_sdl_button_down_event { 96sub feed_sdl_button_down_event {
84 my ($ev) = @_; 97 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
86 99
87 if (!$BUTTON_STATE) { 100 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
101
102 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 103 my $widget = $ROOT->find_widget ($x, $y);
89 104
90 $GRAB = $widget; 105 $GRAB = $widget;
91 $GRAB->update if $GRAB; 106 $GRAB->update if $GRAB;
92 107
93 check_tooltip; 108 $TOOLTIP_WATCHER->cb->();
94 } 109 }
95 110
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 111 if ($GRAB) {
112 if ($ev->{button} == 4 || $ev->{button} == 5) {
113 # mousewheel
114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 116
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { "\fw" => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
328 358
329 $self->{force_w} = $w; 359 $self->{force_w} = $w;
330 $self->{force_h} = $h; 360 $self->{force_h} = $h;
331 361
332 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
333} 373}
334 374
335sub size_request { 375sub size_request {
336 require Carp; 376 require Carp;
337 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
338} 378}
339 379
380sub baseline_shift {
381 0
382}
383
340sub configure { 384sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 385 my ($self, $x, $y, $w, $h) = @_;
342 386
343 if ($self->{aspect}) { 387 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 388 my ($ow, $oh) = ($w, $h);
345 389
346 $w = List::Util::min $w, int $h * $self->{aspect}; 390 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 391 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 392
349 # use alignment to adjust x, y 393 # use alignment to adjust x, y
350 394
351 $x += int 0.5 * ($ow - $w); 395 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 396 $y += int 0.5 * ($oh - $h);
… …
366 410
367 $self->{root}{size_alloc}{$self+0} = $self; 411 $self->{root}{size_alloc}{$self+0} = $self;
368 } 412 }
369} 413}
370 414
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 415sub children {
376 # nop 416 # nop
377} 417}
378 418
379sub visible_children { 419sub visible_children {
… …
381} 421}
382 422
383sub set_max_size { 423sub set_max_size {
384 my ($self, $w, $h) = @_; 424 my ($self, $w, $h) = @_;
385 425
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 426 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 427 $self->{max_h} = int $h if defined $h;
428
429 $self->realloc;
388} 430}
389 431
390sub set_tooltip { 432sub set_tooltip {
391 my ($self, $tooltip) = @_; 433 my ($self, $tooltip) = @_;
392 434
… …
395 437
396 return if $self->{tooltip} eq $tooltip; 438 return if $self->{tooltip} eq $tooltip;
397 439
398 $self->{tooltip} = $tooltip; 440 $self->{tooltip} = $tooltip;
399 441
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 442 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 443 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 444 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 445 }
404} 446}
405 447
406# translate global coordinates to local coordinate system 448# translate global coordinates to local coordinate system
407sub coord2local { 449sub coord2local {
408 my ($self, $x, $y) = @_; 450 my ($self, $x, $y) = @_;
409 451
452 Carp::confess unless $self->{parent};#d#
453
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 454 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 455}
412 456
413# translate local coordinates to global coordinate system 457# translate local coordinates to global coordinate system
414sub coord2global { 458sub coord2global {
415 my ($self, $x, $y) = @_; 459 my ($self, $x, $y) = @_;
416 460
461 Carp::confess unless $self->{parent};#d#
462
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 463 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 464}
419 465
420sub focus_in { 466sub invoke_focus_in {
421 my ($self) = @_; 467 my ($self) = @_;
422 468
423 return if $FOCUS == $self; 469 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 470 return unless $self->{can_focus};
425 471
426 my $focus = $FOCUS; $FOCUS = $self; 472 $FOCUS = $self;
427 473
428 $self->_emit (focus_in => $focus); 474 $self->update;
429 475
430 $focus->update if $focus; 476 0
431 $FOCUS->update;
432} 477}
433 478
434sub focus_out { 479sub invoke_focus_out {
435 my ($self) = @_; 480 my ($self) = @_;
436 481
437 return unless $FOCUS == $self; 482 return unless $FOCUS == $self;
438 483
439 my $focus = $FOCUS; undef $FOCUS; 484 undef $FOCUS;
440 485
441 $self->_emit (focus_out => $focus); 486 $self->update;
442 487
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 488 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 489 unless $FOCUS;
447}
448 490
491 0
492}
493
494sub grab_focus {
495 my ($self) = @_;
496
497 $FOCUS->emit ("focus_out") if $FOCUS;
498 $self->emit ("focus_in");
499}
500
449sub mouse_motion { 0 } 501sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 502sub invoke_button_up { 0 }
451sub key_down { 0 } 503sub invoke_key_down { 0 }
452sub key_up { 0 } 504sub invoke_key_up { 0 }
505sub invoke_mouse_wheel { 0 }
453 506
454sub button_down { 507sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 508 my ($self, $ev, $x, $y) = @_;
456 509
457 $self->focus_in; 510 $self->grab_focus;
458 511
459 0 512 0
460} 513}
461 514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519
520 defined wantarray and CFPlus::guard {
521 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
522 @{ $self->{signal_cb}{$signal} };
523 }
524}
525
526sub disconnect_all {
527 my ($self, $signal) = @_;
528
529 delete $self->{signal_cb}{$signal};
530}
531
532my %has_coords = (
533 button_down => 1,
534 button_up => 1,
535 mouse_motion => 1,
536 mouse_wheel => 1,
537);
538
539sub emit {
540 my ($self, $signal, @args) = @_;
541
542 # I do not really like this solution, but I do not like duplication
543 # and needlessly verbose code, either.
544 my @append
545 = $has_coords{$signal}
546 ? $args[0]->xy ($self)
547 : ();
548
549 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
550
551 for my $cb (
552 @{$self->{signal_cb}{$signal} || []}, # before
553 ($self->can ("invoke_$signal") || sub { 1 }), # closure
554 ) {
555 return $cb->($self, @args, @append) || next;
556 }
557
558 # parent
559 $self->{parent} && $self->{parent}->emit ($signal, @args)
560}
561
462sub find_widget { 562#sub find_widget {
463 my ($self, $x, $y) = @_; 563# in .xs
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473 564
474sub set_parent { 565sub set_parent {
475 my ($self, $parent) = @_; 566 my ($self, $parent) = @_;
476 567
477 Scalar::Util::weaken ($self->{parent} = $parent); 568 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 569 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 570}
503 571
504sub realloc { 572sub realloc {
505 my ($self) = @_; 573 my ($self) = @_;
506 574
… …
531 599
532# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 601# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 603
536sub draw { 604#sub draw {
537 my ($self) = @_; 605#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 606
585sub _draw { 607sub _draw {
586 my ($self) = @_; 608 my ($self) = @_;
587 609
588 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
589} 611}
590 612
591sub DESTROY { 613sub DESTROY {
592 my ($self) = @_; 614 my ($self) = @_;
593 615
616 return if CFPlus::in_destruct;
617
618 local $@;
619 eval { $self->destroy };
620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
621
594 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
595 #$self->deactivate;
596} 623}
597 624
598############################################################################# 625#############################################################################
599 626
600package CFClient::UI::DrawBG; 627package CFPlus::UI::DrawBG;
601 628
602our @ISA = CFClient::UI::Base::; 629our @ISA = CFPlus::UI::Base::;
603 630
604use strict; 631use strict;
605use CFClient::OpenGL; 632use CFPlus::OpenGL;
606 633
607sub new { 634sub new {
608 my $class = shift; 635 my $class = shift;
609
610 # range [value, low, high, page]
611 636
612 $class->SUPER::new ( 637 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
615 @_ 640 @_
… …
627 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
628 653
629 glEnable GL_BLEND; 654 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 656 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 658 glDisable GL_BLEND;
641 } 659 }
642} 660}
643 661
644############################################################################# 662#############################################################################
645 663
646package CFClient::UI::Empty; 664package CFPlus::UI::Empty;
647 665
648our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
649 667
650sub new { 668sub new {
651 my ($class, %arg) = @_; 669 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 670 $class->SUPER::new (can_events => 0, %arg);
653} 671}
… …
660 678
661sub draw { } 679sub draw { }
662 680
663############################################################################# 681#############################################################################
664 682
665package CFClient::UI::Container; 683package CFPlus::UI::Container;
666 684
667our @ISA = CFClient::UI::Base::; 685our @ISA = CFPlus::UI::Base::;
668 686
669sub new { 687sub new {
670 my ($class, %arg) = @_; 688 my ($class, %arg) = @_;
671 689
672 my $children = delete $arg{children}; 690 my $children = delete $arg{children};
… …
676 can_events => 0, 694 can_events => 0,
677 %arg, 695 %arg,
678 ); 696 );
679 697
680 $self->add (@$children) 698 $self->add (@$children)
681 if $children; 699 if $children && @$children;
682 700
683 $self 701 $self
702}
703
704sub realloc {
705 my ($self) = @_;
706
707 $self->{force_realloc} = 1;
708 $self->{force_size_alloc} = 1;
709 $self->SUPER::realloc;
684} 710}
685 711
686sub add { 712sub add {
687 my ($self, @widgets) = @_; 713 my ($self, @widgets) = @_;
688 714
689 $_->set_parent ($self) 715 $_->set_parent ($self)
690 for @widgets; 716 for @widgets;
691 717
718 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 719 use sort 'stable';
693 720
694 $self->{children} = [ 721 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
697 ]; 724 ];
698 725
699 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
700} 731}
701 732
702sub children { 733sub children {
703 @{ $_[0]{children} } 734 @{ $_[0]{children} }
704} 735}
705 736
706sub remove { 737sub remove {
707 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
708 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
709 delete $child->{parent}; 743 delete $child->{parent};
710 $child->hide; 744 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
713 747
714 $self->realloc; 748 $self->realloc;
715} 749}
716 750
717sub clear { 751sub clear {
718 my ($self) = @_; 752 my ($self) = @_;
719 753
720 my $children = delete $self->{children}; 754 my $children = $self->{children};
721 $self->{children} = []; 755 $self->{children} = [];
722 756
723 for (@$children) { 757 for (@$children) {
724 delete $_->{parent}; 758 delete $_->{parent};
725 $_->hide; 759 $_->hide;
… …
745} 779}
746 780
747sub _draw { 781sub _draw {
748 my ($self) = @_; 782 my ($self) = @_;
749 783
750 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
751} 785}
752 786
753############################################################################# 787#############################################################################
754 788
755package CFClient::UI::Bin; 789package CFPlus::UI::Bin;
756 790
757our @ISA = CFClient::UI::Container::; 791our @ISA = CFPlus::UI::Container::;
758 792
759sub new { 793sub new {
760 my ($class, %arg) = @_; 794 my ($class, %arg) = @_;
761 795
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 796 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 797
764 $class->SUPER::new (children => [$child], %arg) 798 $class->SUPER::new (children => [$child], %arg)
765} 799}
766 800
767sub add { 801sub add {
768 my ($self, $child) = @_; 802 my ($self, $child) = @_;
769 803
770 $self->{children} = []; 804 $self->clear;
771
772 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
773} 806}
774 807
775sub remove { 808sub remove {
776 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
777 810
778 $self->SUPER::remove ($widget); 811 $self->SUPER::remove ($widget);
779 812
780 $self->{children} = [new CFClient::UI::Empty] 813 $self->{children} = [new CFPlus::UI::Empty]
781 unless @{$self->{children}}; 814 unless @{$self->{children}};
782} 815}
783 816
784sub child { $_[0]->{children}[0] } 817sub child { $_[0]->{children}[0] }
785 818
786sub size_request { 819sub size_request {
787 $_[0]{children}[0]->size_request 820 $_[0]{children}[0]->size_request
788} 821}
789 822
790sub size_allocate { 823sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 824 my ($self, $w, $h) = @_;
792 825
793 $self->{children}[0]->configure (0, 0, $w, $h); 826 $self->{children}[0]->configure (0, 0, $w, $h);
827
828 1
794} 829}
795 830
796############################################################################# 831#############################################################################
797
798# back-buffered drawing area 832# back-buffered drawing area
799 833
800package CFClient::UI::Window; 834package CFPlus::UI::Window;
801 835
802our @ISA = CFClient::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
803 837
804use CFClient::OpenGL; 838use CFPlus::OpenGL;
805 839
806sub new { 840sub new {
807 my ($class, %arg) = @_; 841 my ($class, %arg) = @_;
808 842
809 my $self = $class->SUPER::new (%arg); 843 my $self = $class->SUPER::new (%arg);
… …
814 848
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 849 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 850 $self->SUPER::update;
817} 851}
818 852
819sub size_allocate { 853sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 854 my ($self, $w, $h) = @_;
821 855
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 856 $self->update;
857
858 $self->SUPER::invoke_size_allocate ($w, $h)
824} 859}
825 860
826sub _render { 861sub _render {
827 my ($self) = @_; 862 my ($self) = @_;
828 863
… …
830} 865}
831 866
832sub render_child { 867sub render_child {
833 my ($self) = @_; 868 my ($self) = @_;
834 869
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 870 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 871 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 872 glClear GL_COLOR_BUFFER_BIT;
838 873
839 { 874 {
840 package CFClient::UI::Base; 875 package CFPlus::UI::Base;
841 876
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 877 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 878 (0, 0, $self->{w}, $self->{h});
879
880 $self->_render;
844 } 881 }
845
846 $self->_render;
847 }; 882 };
848} 883}
849 884
850sub _draw { 885sub _draw {
851 my ($self) = @_; 886 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 887
855 my $tex = $self->{texture} 888 my $tex = $self->{texture}
856 or return; 889 or return;
857 890
858 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 893 glColor 0, 0, 0, 1;
861 894
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 895 $tex->draw_quad_alpha_premultiplied (0, 0);
863 896
864 glDisable GL_TEXTURE_2D; 897 glDisable GL_TEXTURE_2D;
865} 898}
866 899
867############################################################################# 900#############################################################################
868 901
869package CFClient::UI::ViewPort; 902package CFPlus::UI::ViewPort;
870 903
904use List::Util qw(min max);
905
871our @ISA = CFClient::UI::Window::; 906our @ISA = CFPlus::UI::Window::;
872 907
873sub new { 908sub new {
874 my $class = shift; 909 my $class = shift;
875 910
876 $class->SUPER::new ( 911 $class->SUPER::new (
… …
883sub size_request { 918sub size_request {
884 my ($self) = @_; 919 my ($self) = @_;
885 920
886 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887 922
888 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
890 925
891 ($w, $h) 926 ($w, $h)
892} 927}
893 928
894sub size_allocate { 929sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
896 931
897 my $child = $self->child; 932 my $child = $self->child;
898 933
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 934 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 935 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 936
902 $self->child->configure (0, 0, $w, $h); 937 $self->child->configure (0, 0, $w, $h);
903 $self->update; 938 $self->update;
939
940 1
904} 941}
905 942
906sub set_offset { 943sub set_offset {
907 my ($self, $x, $y) = @_; 944 my ($self, $x, $y) = @_;
908 945
946 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
947 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
948
949 if ($x != $self->{view_x} or $y != $self->{view_y}) {
909 $self->{view_x} = int $x; 950 $self->{view_x} = $x;
910 $self->{view_y} = int $y; 951 $self->{view_y} = $y;
911 952
953 $self->emit (changed => $x, $y);
912 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
973 }
913} 974}
914 975
915# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
916sub coord2local { 977sub coord2local {
917 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
… …
932 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
933 994
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) { 997 ) {
937 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
938 } else { 999 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
940 } 1001 }
941} 1002}
942 1003
943sub _render { 1004sub _render {
944 my ($self) = @_; 1005 my ($self) = @_;
945 1006
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
948 1009
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950 1011
951 $self->SUPER::_render; 1012 $self->SUPER::_render;
952} 1013}
953 1014
954############################################################################# 1015#############################################################################
955 1016
956package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
957 1018
958our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::Table::;
959 1020
960sub new { 1021sub new {
961 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
962 1023
963 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
964 1025
965 my $self; 1026 my $self;
966 1027
967 my $slider = new CFClient::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1031 vertical => 0,
1032 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub {
1034 $self->{hpos} = $_[1];
1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 },
1037 ;
1038
1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
1041 c_row => 0,
968 vertical => 1, 1042 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub { 1044 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vpos} = $_[1];
1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
972 }, 1047 },
973 ; 1048 ;
974 1049
975 $self = $class->SUPER::new ( 1050 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1051 scroll_x => 0,
1052 scroll_y => 1,
1053 can_events => 1,
977 slider => $slider, 1054 hslider => $hslider,
1055 vslider => $vslider,
1056 col_expand => [1, 0],
1057 row_expand => [1, 0],
978 %arg, 1058 %arg,
979 ); 1059 );
980 1060
1061 $self->{vp} = new CFPlus::UI::ViewPort
1062 c_col => 0,
1063 c_row => 0,
1064 expand => 1,
1065 scroll_x => $self->{scroll_x},
1066 scroll_y => $self->{scroll_y},
1067 on_changed => sub {
1068 my ($vp, $x, $y) = @_;
1069
1070 $vp->{parent}{hslider}->set_value ($x);
1071 $vp->{parent}{vslider}->set_value ($y);
1072
1073 0
1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1080 ;
1081
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add ($self->{vp});
1083
982 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
983 1085
984 $self 1086 $self
985} 1087}
986 1088
… …
988 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
989 1091
990 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
991} 1093}
992 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
993sub update { 1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 if ($self->{scroll_x}) {
1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107
1108 my $visible = $w1 > $w2;
1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1111 $visible ? $self->SUPER::add ($self->{hslider})
1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1114 }
1115
1116 if ($self->{scroll_y}) {
1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1119
1120 my $visible = $h1 > $h2;
1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->SUPER::remove ($self->{vslider});
1125 }
1126 }
1127}
1128
1129sub start_dragging {
994 my ($self) = @_; 1130 my ($self, $ev) = @_;
995 1131
996 $self->SUPER::update; 1132 $self->grab_focus;
997 1133
998 # todo: overwrite size_allocate of child 1134 my $ox = $self->{vp}{view_x};
999 my $child = $self->{vp}->child; 1135 my $oy = $self->{vp}{view_y};
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1136
1001} 1137 $self->{motion} = sub {
1138 my ($ev, $x, $y) = @_;
1002 1139
1140 $ox -= $ev->{xrel};
1141 $oy -= $ev->{yrel};
1142
1143 $self->{vp}->set_offset ($ox, $oy);
1144 };
1145}
1146
1147sub invoke_mouse_wheel {
1148 my ($self, $ev) = @_;
1149
1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1152
1153 1
1154}
1155
1156sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_;
1158
1159 if ($ev->{button} == 2) {
1160 $self->start_dragging ($ev);
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1003sub size_allocate { 1188sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1005 1190
1191 $self->update_slider;
1006 $self->SUPER::size_allocate ($w, $h); 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1193}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1194
1015############################################################################# 1195#############################################################################
1016 1196
1017package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1018 1198
1019our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1020 1200
1021use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1022 1202
1023sub new { 1203sub new {
1024 my $class = shift; 1204 my $class = shift;
1025 1205
1026 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1036 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1037 1217
1038 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1040 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1041
1042 glBegin GL_QUADS;
1043 glVertex 0 , 0;
1044 glVertex 0 , $h;
1045 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1046 glVertex $w, 0;
1047 glEnd;
1048
1049 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1050 } 1223 }
1051 1224
1052 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1053} 1226}
1054 1227
1055############################################################################# 1228#############################################################################
1056 1229
1057package CFClient::UI::FancyFrame; 1230package CFPlus::UI::FancyFrame;
1058 1231
1059our @ISA = CFClient::UI::Bin::; 1232our @ISA = CFPlus::UI::Bin::;
1060 1233
1061use CFClient::OpenGL; 1234use CFPlus::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1235
1071sub new { 1236sub new {
1072 my ($class, %arg) = @_; 1237 my ($class, %arg) = @_;
1073 1238
1074 my $title = delete $arg{title}; 1239 if ((exists $arg{label}) && !ref $arg{label}) {
1240 $arg{label} = new CFPlus::UI::Label
1241 align => 1,
1242 valign => 0,
1243 text => $arg{label},
1244 fontsize => ($arg{border} || 0.8) * 0.75;
1245 }
1246
1247 my $self = $class->SUPER::new (
1248 # label => "",
1249 fg => [0.6, 0.3, 0.1],
1250 border => 0.8,
1251 style => 'single',
1252 %arg,
1253 );
1254
1255 $self
1256}
1257
1258sub add {
1259 my ($self, @widgets) = @_;
1260
1261 $self->SUPER::add (@widgets);
1262 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1263}
1264
1265sub border {
1266 int $_[0]{border} * $::FONTSIZE
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 ($self->{label_w}, undef) = $self->{label}->size_request
1273 if $self->{label};
1274
1275 my ($w, $h) = $self->SUPER::size_request;
1276
1277 (
1278 $w + $self->border * 2,
1279 $h + $self->border * 2,
1280 )
1281}
1282
1283sub invoke_size_allocate {
1284 my ($self, $w, $h) = @_;
1285
1286 my $border = $self->border;
1287
1288 $w -= List::Util::max 0, $border * 2;
1289 $h -= List::Util::max 0, $border * 2;
1290
1291 if (my $label = $self->{label}) {
1292 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1293 $label->{h} = List::Util::min $h, $border;
1294 $label->invoke_size_allocate ($label->{w}, $label->{h});
1295 }
1296
1297 $self->child->configure ($border, $border, $w, $h);
1298
1299 1
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 my $child = $self->{children}[0];
1306
1307 my $border = $self->border;
1308 my ($w, $h) = ($self->{w}, $self->{h});
1309
1310 $child->draw;
1311
1312 glColor @{$self->{fg}};
1313 glBegin GL_LINE_STRIP;
1314 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1315 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1317 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1319 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1320 glEnd;
1321
1322 if ($self->{label}) {
1323 glTranslate $border * 2, 0;
1324 $self->{label}->_draw;
1325 }
1326}
1327
1328#############################################################################
1329
1330package CFPlus::UI::Toplevel;
1331
1332our @ISA = CFPlus::UI::Bin::;
1333
1334use CFPlus::OpenGL;
1335
1336my $bg =
1337 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1338 mipmap => 1, wrap => 1;
1339
1340my @border =
1341 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1342 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1343
1344my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png);
1347
1348sub new {
1349 my ($class, %arg) = @_;
1075 1350
1076 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1352 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1353 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1354 border => 0.6,
1080 can_events => 1, 1355 can_events => 1,
1081 min_w => 16, 1356 min_w => 64,
1082 min_h => 16, 1357 min_h => 32,
1083 %arg, 1358 %arg,
1084 ); 1359 );
1085 1360
1086 $self->{title} = new CFClient::UI::Label 1361 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1362 align => 0,
1088 valign => 1, 1363 valign => 1,
1089 text => $title, 1364 text => $self->{title},
1090 fontsize => $self->{border} 1365 fontsize => $self->{border},
1091 if defined $title; 1366 if exists $self->{title};
1367
1368 if ($self->{has_close_button}) {
1369 $self->{close_button} =
1370 new CFPlus::UI::ImageButton
1371 path => 'x1_close.png',
1372 on_activate => sub { $self->emit ("delete") };
1373
1374 $self->CFPlus::UI::Container::add ($self->{close_button});
1375 }
1092 1376
1093 $self 1377 $self
1094} 1378}
1095 1379
1096sub add { 1380sub add {
1097 my ($self, @widgets) = @_; 1381 my ($self, @widgets) = @_;
1098 1382
1099 $self->SUPER::add (@widgets); 1383 $self->SUPER::add (@widgets);
1384 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1385 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1386}
1102 1387
1103sub border { 1388sub border {
1104 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1105} 1390}
1106 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1107sub size_request { 1401sub size_request {
1108 my ($self) = @_; 1402 my ($self) = @_;
1109 1403
1110 $self->{title}->size_request 1404 $self->{title_widget}->size_request
1111 if $self->{title}; 1405 if $self->{title_widget};
1406
1407 $self->{close_button}->size_request
1408 if $self->{close_button};
1112 1409
1113 my ($w, $h) = $self->SUPER::size_request; 1410 my ($w, $h) = $self->SUPER::size_request;
1114 1411
1115 ( 1412 (
1116 $w + $self->border * 2, 1413 $w + $self->border * 2,
1117 $h + $self->border * 2, 1414 $h + $self->border * 2,
1118 ) 1415 )
1119} 1416}
1120 1417
1121sub size_allocate { 1418sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1419 my ($self, $w, $h) = @_;
1123 1420
1124 if ($self->{title}) { 1421 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1422 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1423 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1424 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1425 }
1129 1426
1130 my $border = $self->border; 1427 my $border = $self->border;
1131 1428
1132 $h -= List::Util::max 0, $border * 2; 1429 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1430 $w -= List::Util::max 0, $border * 2;
1431
1432 $self->child->configure ($border, $border, $w, $h);
1433
1434 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1435 if $self->{close_button};
1436
1437 1
1438}
1439
1440sub invoke_delete {
1441 my ($self) = @_;
1442
1443 $self->hide;
1134 1444
1135 $self->child->configure ($border, $border, $w, $h); 1445 1
1136} 1446}
1137 1447
1138sub button_down { 1448sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1140 1450
1141 my ($w, $h) = @$self{qw(w h)}; 1451 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1452 my $border = $self->border;
1143 1453
… …
1174 1484
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1485 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1486
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1487 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1488 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1489 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1490 };
1181 } else { 1491 } else {
1182 return 0; 1492 return 0;
1183 } 1493 }
1184 1494
1185 1 1495 1
1186} 1496}
1187 1497
1188sub button_up { 1498sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
1190 1500
1191 !!delete $self->{motion} 1501 ! ! delete $self->{motion}
1192} 1502}
1193 1503
1194sub mouse_motion { 1504sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1505 my ($self, $ev, $x, $y) = @_;
1196 1506
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1507 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1508
1199 !!$self->{motion} 1509 ! ! $self->{motion}
1510}
1511
1512sub invoke_visibility_change {
1513 my ($self, $visible) = @_;
1514
1515 delete $self->{motion} unless $visible;
1516
1517 0
1200} 1518}
1201 1519
1202sub _draw { 1520sub _draw {
1203 my ($self) = @_; 1521 my ($self) = @_;
1204 1522
… …
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1212 1530
1213 my $border = $self->border; 1531 my $border = $self->border;
1214 1532
1215 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1216 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1537 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1538
1539 # move
1540 my $w2 = ($w - $border) * .5;
1541 my $h2 = ($h - $border) * .5;
1542 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1543 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1545
1546 # resize
1547 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1548 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1549 unless $self->{has_close_button};
1550 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1551 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1220 1552
1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1223 1555
1224 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1230 1562
1231 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1232 1564
1233 $child->draw; 1565 $child->draw;
1234 1566
1235 if ($self->{title}) { 1567 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1568 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1569 $self->{title_widget}->_draw;
1570
1571 glTranslate 0, - ($border - $self->{h});
1238 } 1572 }
1573
1574 $self->{close_button}->draw
1575 if $self->{close_button};
1239} 1576}
1240 1577
1241############################################################################# 1578#############################################################################
1242 1579
1243package CFClient::UI::Table; 1580package CFPlus::UI::Table;
1244 1581
1245our @ISA = CFClient::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1246 1583
1247use List::Util qw(max sum); 1584use List::Util qw(max sum);
1248 1585
1249use CFClient::OpenGL; 1586use CFPlus::OpenGL;
1250 1587
1251sub new { 1588sub new {
1252 my $class = shift; 1589 my $class = shift;
1253 1590
1254 $class->SUPER::new ( 1591 $class->SUPER::new (
1255 col_expand => [], 1592 col_expand => [],
1593 row_expand => [],
1256 @_, 1594 @_,
1257 ) 1595 )
1258} 1596}
1259 1597
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262}
1263
1264sub add { 1598sub add {
1265 my ($self, $x, $y, $child) = @_;
1266
1267 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child;
1269
1270 $self->realloc;
1271}
1272
1273# TODO: move to container class maybe? send children a signal on removal?
1274sub clear {
1275 my ($self) = @_; 1599 my ($self, @widgets) = @_;
1600
1601 for my $child (@widgets) {
1602 $child->{c_rowspan} ||= 1;
1603 $child->{c_colspan} ||= 1;
1604 }
1605
1606 $self->SUPER::add (@widgets);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 my @widgets;
1613
1614 while (@_) {
1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1616
1617 $child->{c_row} = $row;
1618 $child->{c_col} = $col;
1619
1620 push @widgets, $child;
1621 }
1622
1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1276 1630
1277 my @children = $self->children; 1631 my @children = $self->children;
1278 delete $self->{children}; 1632
1633 # first pass, columns
1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636
1637 my $sw = sum @w[$c .. $c + $cs - 1];
1638
1639 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1641 }
1279 1642 }
1280 for (@children) {
1281 delete $_->{parent};
1282 $_->hide;
1283 }
1284 1643
1285 $self->realloc; 1644 # second pass, rows
1286} 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1287
1288sub get_wh {
1289 my ($self) = @_;
1290
1291 my (@w, @h);
1292
1293 for my $y (0 .. $#{$self->{children}}) {
1294 my $row = $self->{children}[$y]
1295 or next;
1296
1297 for my $x (0 .. $#$row) {
1298 my $widget = $row->[$x]
1299 or next;
1300 my ($w, $h) = @$widget{qw(req_w req_h)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1301 1647
1302 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1303 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1304 } 1652 }
1305 } 1653 }
1306 1654
1307 (\@w, \@h) 1655 (\@w, \@h)
1308} 1656}
… …
1316 (sum @$ws), 1664 (sum @$ws),
1317 (sum @$hs), 1665 (sum @$hs),
1318 ) 1666 )
1319} 1667}
1320 1668
1321sub size_allocate { 1669sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1670 my ($self, $w, $h) = @_;
1323 1671
1324 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1325 1673
1326 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1327 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1328 1676
1329 # TODO: nicer code && do row_expand 1677 # now linearly scale the rows/columns to the allocated size
1330 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1331 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1332 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1333 1681
1334 # linearly scale sizes
1335 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337 1683
1338 CFClient::UI::harmonize $ws; 1684 CFPlus::UI::harmonize $ws;
1685
1686 my @row_expand = @{$self->{row_expand}};
1687 @row_expand = (1) x @$ws unless @row_expand;
1688 my $row_expand = (sum @row_expand) || 1;
1689
1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1691
1339 CFClient::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1340 1693
1341 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1342 1696
1343 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1344 my $row = $self->{children}[$r] 1698 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1345 or next;
1346 1699
1347 my $x = 0; 1700 $widget->configure (
1348 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1349 1703 );
1350 for my $c (0 .. $#$row) { 1704 }
1351 my $col_w = $ws->[$c];
1352 1705
1353 if (my $widget = $row->[$c]) { 1706 1
1354 $widget->configure ($x, $y, $col_w, $row_h); 1707}
1355 }
1356 1708
1357 $x += $col_w; 1709#############################################################################
1710
1711package CFPlus::UI::Fixed;
1712
1713use List::Util qw(min max);
1714
1715our @ISA = CFPlus::UI::Container::;
1716
1717sub _scale($$$) {
1718 my ($rel, $val, $max) = @_;
1719
1720 $rel ? $val * $max : $val
1721}
1722
1723sub size_request {
1724 my ($self) = @_;
1725
1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1727
1728 # determine overall size by querying abs widgets
1729 for my $child ($self->visible_children) {
1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1358 } 1736 }
1359
1360 $y += $row_h;
1361 } 1737 }
1362 1738
1363} 1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1364 1741
1365sub find_widget { 1742 # now layout remaining widgets
1743 for my $child ($self->visible_children) {
1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1750 }
1751 }
1752
1753 my $W = $x2 - $x1;
1754 my $H = $y2 - $y1;
1755
1756 ($W, $H)
1757}
1758
1759sub invoke_size_allocate {
1366 my ($self, $x, $y) = @_; 1760 my ($self, $W, $H) = @_;
1367 1761
1368 $x -= $self->{x}; 1762 for my $child ($self->visible_children) {
1369 $y -= $self->{y}; 1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1370 1765
1371 my $res; 1766 $x += $child->{c_halign} * $child->{req_w};
1767 $y += $child->{c_valign} * $child->{req_h};
1372 1768
1373 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1374 $res = $_->find_widget ($x, $y) 1770 }
1375 and return $res; 1771
1376 } 1772 1
1377
1378 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1379}
1380
1381sub _draw {
1382 my ($self) = @_;
1383
1384 for (grep $_, @{$self->{children}}) {
1385 $_->draw for grep $_, @$_;
1386 }
1387} 1773}
1388 1774
1389############################################################################# 1775#############################################################################
1390 1776
1391package CFClient::UI::Box; 1777package CFPlus::UI::Box;
1392 1778
1393our @ISA = CFClient::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1394 1780
1395sub size_request { 1781sub size_request {
1396 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1397 1785
1398 $self->{vertical} 1786 $self->{vertical}
1399 ? ( 1787 ? (
1400 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1402 ) 1790 )
1403 : ( 1791 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1406 ) 1794 )
1407} 1795}
1408 1796
1409sub size_allocate { 1797sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
1411 1799
1412 my $space = $self->{vertical} ? $h : $w; 1800 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1801 my @children = $self->visible_children;
1414 1802
1415 my @req; 1803 my @req;
1416 1804
1417 if ($self->{homogeneous}) { 1805 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1806 @req = ($space / (@children || 1)) x @children;
1419 } else { 1807 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1808 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1809 my $req = List::Util::sum @req;
1422 1810
1423 if ($req > $space) { 1811 if ($req > $space) {
1424 # ah well, not enough space 1812 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1813 $_ *= $space / $req for @req;
1426 } else { 1814 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1815 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1816
1429 $space = ($space - $req) / $expand; # remaining space to give away 1817 $space = ($space - $req) / $expand; # remaining space to give away
1430 1818
1431 $req[$_] += $space * $children->[$_]{expand} 1819 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1820 for 0 .. $#children;
1433 } 1821 }
1434 } 1822 }
1435 1823
1436 CFClient::UI::harmonize \@req; 1824 CFPlus::UI::harmonize \@req;
1437 1825
1438 my $pos = 0; 1826 my $pos = 0;
1439 for (0 .. $#$children) { 1827 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1828 my $alloc = $req[$_];
1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1829 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1442 1830
1443 $pos += $alloc; 1831 $pos += $alloc;
1444 } 1832 }
1445 1833
1446 1 1834 1
1447} 1835}
1448 1836
1449############################################################################# 1837#############################################################################
1450 1838
1451package CFClient::UI::HBox; 1839package CFPlus::UI::HBox;
1452 1840
1453our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1454 1842
1455sub new { 1843sub new {
1456 my $class = shift; 1844 my $class = shift;
1457 1845
1458 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1461 ) 1849 )
1462} 1850}
1463 1851
1464############################################################################# 1852#############################################################################
1465 1853
1466package CFClient::UI::VBox; 1854package CFPlus::UI::VBox;
1467 1855
1468our @ISA = CFClient::UI::Box::; 1856our @ISA = CFPlus::UI::Box::;
1469 1857
1470sub new { 1858sub new {
1471 my $class = shift; 1859 my $class = shift;
1472 1860
1473 $class->SUPER::new ( 1861 $class->SUPER::new (
… …
1476 ) 1864 )
1477} 1865}
1478 1866
1479############################################################################# 1867#############################################################################
1480 1868
1481package CFClient::UI::Label; 1869package CFPlus::UI::Label;
1482 1870
1483our @ISA = CFClient::UI::DrawBG::; 1871our @ISA = CFPlus::UI::DrawBG::;
1484 1872
1485use CFClient::OpenGL; 1873use CFPlus::OpenGL;
1486 1874
1487sub new { 1875sub new {
1488 my ($class, %arg) = @_; 1876 my ($class, %arg) = @_;
1489 1877
1490 my $self = $class->SUPER::new ( 1878 my $self = $class->SUPER::new (
… …
1493 #active_bg => none 1881 #active_bg => none
1494 #font => default_font 1882 #font => default_font
1495 #text => initial text 1883 #text => initial text
1496 #markup => initial narkup 1884 #markup => initial narkup
1497 #max_w => maximum pixel width 1885 #max_w => maximum pixel width
1886 #style => 0, # render flags
1498 ellipsise => 3, # end 1887 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1888 layout => (new CFPlus::Layout),
1500 fontsize => 1, 1889 fontsize => 1,
1501 align => -1, 1890 align => -1,
1502 valign => -1, 1891 valign => -1,
1503 padding_x => 2, 1892 padding_x => 2,
1504 padding_y => 2, 1893 padding_y => 2,
1505 can_events => 0, 1894 can_events => 0,
1506 %arg 1895 %arg
1507 ); 1896 );
1508 1897
1509 if (exists $self->{template}) { 1898 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1899 my $layout = new CFPlus::Layout;
1511 $layout->set_text (delete $self->{template}); 1900 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1901 $self->{template} = $layout;
1513 } 1902 }
1514 1903
1515 if (exists $self->{markup}) { 1904 if (exists $self->{markup}) {
… …
1519 } 1908 }
1520 1909
1521 $self 1910 $self
1522} 1911}
1523 1912
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1913sub update {
1535 my ($self) = @_; 1914 my ($self) = @_;
1536 1915
1537 delete $self->{texture}; 1916 delete $self->{texture};
1538 $self->SUPER::update; 1917 $self->SUPER::update;
1539} 1918}
1540 1919
1920sub realloc {
1921 my ($self) = @_;
1922
1923 delete $self->{ox};
1924 $self->SUPER::realloc;
1925}
1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1541sub set_text { 1933sub set_text {
1542 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1543 1935
1544 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
1546 1938
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1939 $self->{layout}->set_text ($text);
1549 1940
1941 delete $self->{size_req};
1550 $self->realloc; 1942 $self->realloc;
1551 $self->update; 1943 $self->update;
1552} 1944}
1553 1945
1554sub set_markup { 1946sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1949 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1950 $self->{text} = "M$markup";
1559 1951
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1952 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1953
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1954 $self->{layout}->set_markup ($markup);
1564 1955
1956 delete $self->{size_req};
1565 $self->realloc; 1957 $self->realloc;
1566 $self->update; 1958 $self->update;
1567} 1959}
1568 1960
1569sub size_request { 1961sub size_request {
1570 my ($self) = @_; 1962 my ($self) = @_;
1571 1963
1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1972
1578 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
1579 1974
1580 if (exists $self->{template}) { 1975 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1976 $self->{template}->set_font ($self->{font}) if $self->{font};
1977 $self->{template}->set_width ($self->{max_w} || -1);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1978 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1979
1584 my ($w2, $h2) = $self->{template}->size; 1980 my ($w2, $h2) = $self->{template}->size;
1585 1981
1586 $w = List::Util::max $w, $w2; 1982 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1983 $h = List::Util::max $h, $h2;
1984 }
1985
1986 [$w, $h]
1588 } 1987 };
1589 1988
1590 ($w, $h) 1989 @{ $self->{size_req} }
1591} 1990}
1592 1991
1992sub baseline_shift {
1993 $_[0]{layout}->descent
1994}
1995
1593sub size_allocate { 1996sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1997 my ($self, $w, $h) = @_;
1595 1998
1596 delete $self->{ox}; 1999 delete $self->{ox};
1597 2000
1598 delete $self->{texture} 2001 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2002 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2003
2004 1
1600} 2005}
1601 2006
1602sub set_fontsize { 2007sub set_fontsize {
1603 my ($self, $fontsize) = @_; 2008 my ($self, $fontsize) = @_;
1604 2009
1605 $self->{fontsize} = $fontsize; 2010 $self->{fontsize} = $fontsize;
2011 delete $self->{size_req};
1606 delete $self->{texture}; 2012 delete $self->{texture};
1607 2013
1608 $self->realloc; 2014 $self->realloc;
1609} 2015}
1610 2016
2017sub reconfigure {
2018 my ($self) = @_;
2019
2020 delete $self->{size_req};
2021 delete $self->{texture};
2022
2023 $self->SUPER::reconfigure;
2024}
2025
1611sub _draw { 2026sub _draw {
1612 my ($self) = @_; 2027 my ($self) = @_;
1613 2028
1614 $self->SUPER::_draw; # draw background, if applicable 2029 $self->SUPER::_draw; # draw background, if applicable
1615 2030
1616 my $tex = $self->{texture} ||= do { 2031 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 2032 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2033 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 2034 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2035 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2036 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2037 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 2038
1624 new_from_layout CFClient::Texture $self->{layout} 2039 [$self->{layout}->size]
1625 }; 2040 };
1626 2041
1627 unless (exists $self->{ox}) { 2042 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2043 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2044 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
1631 2046
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1635 }; 2052 };
1636 2053
1637 glEnable GL_TEXTURE_2D; 2054# unless ($self->{list}) {
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2056# CFPlus::OpenGL::glNewList $self->{list};
2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList;
2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
1639 2062
1640 glColor_premultiply @{$self->{fg}} 2063 $self->{layout}->draw;
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
1647 2073
1648############################################################################# 2074#############################################################################
1649 2075
1650package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1651 2077
1652our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1653 2079
1654use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1655 2081
1656sub new { 2082sub new {
1657 my $class = shift; 2083 my $class = shift;
1658 2084
1659 $class->SUPER::new ( 2085 $class->SUPER::new (
1660 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
1661 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
1662 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
1663 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
1664 can_hover => 1, 2092 can_hover => 1,
1665 can_focus => 1, 2093 can_focus => 1,
1666 valign => 0, 2094 valign => 0,
1667 can_events => 1, 2095 can_events => 1,
2096 ellipsise => 0,
1668 #text => ... 2097 #text => ...
2098 #hidden => "*",
1669 @_ 2099 @_
1670 ) 2100 )
1671} 2101}
1672 2102
1673sub _set_text { 2103sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 2110 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 2111 $self->{text} = $text;
1682 2112
1683 $text =~ s/./*/g if $self->{hidden}; 2113 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 2114 $self->{layout}->set_text ("$text ");
2115 delete $self->{size_req};
1685 2116
1686 $self->_emit (changed => $self->{text}); 2117 $self->emit (changed => $self->{text});
2118
2119 $self->realloc;
1687 $self->update; 2120 $self->update;
1688} 2121}
1689 2122
1690sub set_text { 2123sub set_text {
1691 my ($self, $text) = @_; 2124 my ($self, $text) = @_;
1692 2125
1693 $self->{cursor} = length $text; 2126 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2127 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2128}
1698 2129
1699sub get_text { 2130sub get_text {
1700 $_[0]{text} 2131 $_[0]{text}
1701} 2132}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2137 my ($w, $h) = $self->SUPER::size_request;
1707 2138
1708 ($w + 1, $h) # add 1 for cursor 2139 ($w + 1, $h) # add 1 for cursor
1709} 2140}
1710 2141
1711sub key_down { 2142sub invoke_key_down {
1712 my ($self, $ev) = @_; 2143 my ($self, $ev) = @_;
1713 2144
1714 my $mod = $ev->{mod}; 2145 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2146 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2147 my $uni = $ev->{unicode};
1717 2148
1718 my $text = $self->get_text; 2149 my $text = $self->get_text;
2150
2151 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1719 2152
1720 if ($uni == 8) { 2153 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2154 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2155 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2156 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2157 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2158 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2159 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2160 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } elsif ($sym == CFClient::SDLK_HOME) { 2161 } elsif ($sym == CFPlus::SDLK_HOME) {
2162 # what a hack
2163 $self->{cursor} =
2164 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2165 ? length $1
2166 : 0;
2167 } elsif ($sym == CFPlus::SDLK_END) {
2168 # uh, again
2169 $self->{cursor} =
2170 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2171 ? $self->{cursor} + length $1
2172 : length $self->{text};
2173 } elsif ($uni == 21) { # ctrl-u
2174 $text = "";
1729 $self->{cursor} = 0; 2175 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2176 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2177 $self->emit ('escape');
1734 } elsif ($uni) { 2178 } elsif ($uni == 0x0d) {
2179 substr $text, $self->{cursor}++, 0, "\012";
2180 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2181 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2182 } else {
1737 return 0; 2183 return 0;
1738 } 2184 }
1739 2185
1740 $self->_set_text ($text); 2186 $self->_set_text ($text);
1741 2187
1742 $self->realloc; 2188 $self->realloc;
2189 $self->update;
1743 2190
1744 1 2191 1
1745} 2192}
1746 2193
1747sub focus_in { 2194sub invoke_focus_in {
1748 my ($self) = @_; 2195 my ($self) = @_;
1749 2196
1750 $self->{last_activity} = $::NOW; 2197 $self->{last_activity} = $::NOW;
1751 2198
1752 $self->SUPER::focus_in; 2199 $self->SUPER::invoke_focus_in
1753} 2200}
1754 2201
1755sub button_down { 2202sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2203 my ($self, $ev, $x, $y) = @_;
1757 2204
1758 $self->SUPER::button_down ($ev, $x, $y); 2205 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2206
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2207 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2208
1762 # byte-index to char-index 2209 # byte-index to char-index
1763 my $text = $self->{text}; 2210 my $text = $self->{text};
1764 utf8::encode $text; 2211 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2212 $self->{cursor} = length $text;
1766 2213
1767 $self->_set_text ($self->{text}); 2214 $self->_set_text ($self->{text});
1768 $self->update; 2215 $self->update;
1769 2216
1770 1 2217 1
1771} 2218}
1772 2219
1773sub mouse_motion { 2220sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2222# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 2223
1777 0 2224 1
1778} 2225}
1779 2226
1780sub _draw { 2227sub _draw {
1781 my ($self) = @_; 2228 my ($self) = @_;
1782 2229
… …
1789 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
1790 } 2237 }
1791 2238
1792 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS;
1795 glVertex 0 , 0;
1796 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0;
1799 glEnd;
1800 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
1801 2243
1802 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
1803 2245
1804 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
1806 2248
1807 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
1808 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
1809 utf8::encode $text; 2251 utf8::encode $text;
1810 2252
1811 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1812 } 2254 }
1813 2255
1814 glColor @{$self->{fg}}; 2256 glColor_premultiply @{$self->{active_fg}};
1815 glBegin GL_LINES; 2257 glBegin GL_LINES;
1816 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1818 glEnd; 2260 glEnd;
1819 }
1820}
1821 2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2274 glEnd;
2275 }
2276}
2277
2278#############################################################################
2279
1822package CFClient::UI::Entry; 2280package CFPlus::UI::Entry;
1823 2281
1824our @ISA = CFClient::UI::EntryBase::; 2282our @ISA = CFPlus::UI::EntryBase::;
1825 2283
1826use CFClient::OpenGL; 2284use CFPlus::OpenGL;
1827 2285
1828sub key_down { 2286sub invoke_key_down {
1829 my ($self, $ev) = @_; 2287 my ($self, $ev) = @_;
1830 2288
1831 my $sym = $ev->{sym}; 2289 my $sym = $ev->{sym};
1832 2290
1833 if ($sym == 13) { 2291 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2292 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2293 my $txt = $self->get_text;
2294
1836 $self->{history_pointer} = -1; 2295 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2296 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2297 $self->emit (activate => $txt);
1839 $self->update; 2298 $self->update;
1840 2299
1841 } elsif ($sym == CFClient::SDLK_UP) { 2300 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2301 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2302 $self->{history_saveback} = $self->get_text;
1844 } 2303 }
1845 if (@{$self->{history} || []} > 0) { 2304 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2305 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2307 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2308 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2309 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2310 }
1852 2311
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2312 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2313 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2314 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2315
1857 if ($self->{history_pointer} >= 0) { 2316 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2318 } else {
1860 $self->set_text ($self->{history_saveback}); 2319 $self->set_text ($self->{history_saveback});
1861 } 2320 }
1862 2321
1863 } else { 2322 } else {
1864 return $self->SUPER::key_down ($ev) 2323 return $self->SUPER::invoke_key_down ($ev)
1865 } 2324 }
1866 2325
1867 1 2326 1
1868} 2327}
1869 2328
1870############################################################################# 2329#############################################################################
1871 2330
2331package CFPlus::UI::TextEdit;
2332
2333our @ISA = CFPlus::UI::EntryBase::;
2334
2335use CFPlus::OpenGL;
2336
2337sub move_cursor_ver {
2338 my ($self, $dy) = @_;
2339
2340 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2341
2342 $y += $dy;
2343
2344 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2345 $self->{cursor} = $index;
2346 delete $self->{cur_h};
2347 $self->update;
2348 return;
2349 }
2350}
2351
2352sub invoke_key_down {
2353 my ($self, $ev) = @_;
2354
2355 my $sym = $ev->{sym};
2356
2357 if ($sym == CFPlus::SDLK_UP) {
2358 $self->move_cursor_ver (-1);
2359 } elsif ($sym == CFPlus::SDLK_DOWN) {
2360 $self->move_cursor_ver (+1);
2361 } else {
2362 return $self->SUPER::invoke_key_down ($ev)
2363 }
2364
2365 1
2366}
2367
2368#############################################################################
2369
1872package CFClient::UI::Button; 2370package CFPlus::UI::ButtonBin;
1873 2371
1874our @ISA = CFClient::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
1875 2373
1876use CFClient::OpenGL; 2374use CFPlus::OpenGL;
1877 2375
1878my @tex = 2376my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
1881 2379
1882sub new { 2380sub new {
1883 my $class = shift; 2381 my $class = shift;
1884 2382
1885 $class->SUPER::new ( 2383 $class->SUPER::new (
1886 padding_x => 4,
1887 padding_y => 4,
1888 fg => [1, 1, 1],
1889 active_fg => [0, 0, 1],
1890 can_hover => 1, 2384 can_hover => 1,
1891 align => 0, 2385 align => 0,
1892 valign => 0, 2386 valign => 0,
1893 can_events => 1, 2387 can_events => 1,
1894 @_ 2388 @_
1895 ) 2389 )
1896} 2390}
1897 2391
1898sub activate { }
1899
1900sub button_up { 2392sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2393 my ($self, $ev, $x, $y) = @_;
1902 2394
1903 $self->emit ("activate") 2395 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2396 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2397 && $y >= 0 && $y < $self->{h};
… …
1908} 2400}
1909 2401
1910sub _draw { 2402sub _draw {
1911 my ($self) = @_; 2403 my ($self) = @_;
1912 2404
1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1917 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
1918 2408
2409 my $tex = $tex[$GRAB == $self];
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2411
1921 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
1922 2413
1923 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
1924} 2415}
1925 2416
1926############################################################################# 2417#############################################################################
1927 2418
1928package CFClient::UI::CheckBox; 2419package CFPlus::UI::Button;
1929 2420
1930our @ISA = CFClient::UI::DrawBG::; 2421our @ISA = CFPlus::UI::Label::;
2422
2423use CFPlus::OpenGL;
1931 2424
1932my @tex = 2425my @tex =
1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2427 qw(b1_button_inactive.png b1_button_active.png);
2428
2429sub new {
2430 my $class = shift;
2431
2432 $class->SUPER::new (
2433 padding_x => 4,
2434 padding_y => 4,
2435 fg => [1.0, 1.0, 1.0],
2436 active_fg => [0.8, 0.8, 0.8],
2437 can_hover => 1,
2438 align => 0,
2439 valign => 0,
2440 can_events => 1,
2441 @_
2442 )
2443}
2444
2445sub invoke_button_up {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 $self->emit ("activate")
2449 if $x >= 0 && $x < $self->{w}
2450 && $y >= 0 && $y < $self->{h};
2451
2452 1
2453}
2454
2455sub _draw {
2456 my ($self) = @_;
2457
2458 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2459
2460 glEnable GL_TEXTURE_2D;
2461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2462 glColor 0, 0, 0, 1;
2463
2464 my $tex = $tex[$GRAB == $self];
2465 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2466
2467 glDisable GL_TEXTURE_2D;
2468
2469 $self->SUPER::_draw;
2470}
2471
2472#############################################################################
2473
2474package CFPlus::UI::CheckBox;
2475
2476our @ISA = CFPlus::UI::DrawBG::;
2477
2478my @tex =
2479 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2480 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935 2481
1936use CFClient::OpenGL; 2482use CFPlus::OpenGL;
1937 2483
1938sub new { 2484sub new {
1939 my $class = shift; 2485 my $class = shift;
1940 2486
1941 $class->SUPER::new ( 2487 $class->SUPER::new (
… …
1955 my ($self) = @_; 2501 my ($self) = @_;
1956 2502
1957 (6) x 2 2503 (6) x 2
1958} 2504}
1959 2505
2506sub toggle {
2507 my ($self) = @_;
2508
2509 $self->{state} = !$self->{state};
2510 $self->emit (changed => $self->{state});
2511 $self->update;
2512}
2513
1960sub button_down { 2514sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
1962 2516
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2517 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2518 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2519 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2520 } else {
1968 return 0 2521 return 0
1969 } 2522 }
1970 2523
1971 1 2524 1
… …
1974sub _draw { 2527sub _draw {
1975 my ($self) = @_; 2528 my ($self) = @_;
1976 2529
1977 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
1978 2531
1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1980 2533
1981 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
1982 2535
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1984 2537
… …
1991 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
1992} 2545}
1993 2546
1994############################################################################# 2547#############################################################################
1995 2548
1996package CFClient::UI::Image; 2549package CFPlus::UI::Image;
1997 2550
1998our @ISA = CFClient::UI::Base::; 2551our @ISA = CFPlus::UI::Base::;
1999 2552
2000use CFClient::OpenGL; 2553use CFPlus::OpenGL;
2001use Carp qw/confess/;
2002 2554
2003our %loaded_images; 2555our %texture_cache;
2004 2556
2005sub new { 2557sub new {
2006 my $class = shift; 2558 my $class = shift;
2007 2559
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2560 my $self = $class->SUPER::new (
2561 can_events => 0,
2562 scale => 1,
2563 @_,
2564 );
2009 2565
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2566 $self->{path} || $self->{tex}
2567 or Carp::croak "'path' or 'tex' attributes required";
2011 2568
2012 $loaded_images{$self->{image}} ||= 2569 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2570 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2014 2571
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2572 CFPlus::weaken $texture_cache{$self->{path}};
2016 2573
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2574 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2575
2021 $self 2576 $self
2022} 2577}
2023 2578
2579sub STORABLE_freeze {
2580 my ($self, $cloning) = @_;
2581
2582 $self->{path}
2583 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2584
2585 $self->{path}
2586}
2587
2588sub STORABLE_attach {
2589 my ($self, $cloning, $path) = @_;
2590
2591 $self->new (path => $path)
2592}
2593
2024sub size_request { 2594sub size_request {
2025 my ($self) = @_; 2595 my ($self) = @_;
2026 2596
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2028} 2598}
2029 2599
2030sub _draw { 2600sub _draw {
2031 my ($self) = @_; 2601 my ($self) = @_;
2032 2602
… …
2049 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2050} 2620}
2051 2621
2052############################################################################# 2622#############################################################################
2053 2623
2624package CFPlus::UI::ImageButton;
2625
2626our @ISA = CFPlus::UI::Image::;
2627
2628use CFPlus::OpenGL;
2629
2630my %textures;
2631
2632sub new {
2633 my $class = shift;
2634
2635 my $self = $class->SUPER::new (
2636 padding_x => 4,
2637 padding_y => 4,
2638 fg => [1, 1, 1],
2639 active_fg => [0, 0, 1],
2640 can_hover => 1,
2641 align => 0,
2642 valign => 0,
2643 can_events => 1,
2644 @_
2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2652}
2653
2654sub invoke_button_up {
2655 my ($self, $ev, $x, $y) = @_;
2656
2657 $self->emit ("activate")
2658 if $x >= 0 && $x < $self->{w}
2659 && $y >= 0 && $y < $self->{h};
2660
2661 1
2662}
2663
2664#############################################################################
2665
2054package CFClient::UI::VGauge; 2666package CFPlus::UI::VGauge;
2055 2667
2056our @ISA = CFClient::UI::Base::; 2668our @ISA = CFPlus::UI::Base::;
2057 2669
2058use List::Util qw(min max); 2670use List::Util qw(min max);
2059 2671
2060use CFClient::OpenGL; 2672use CFPlus::OpenGL;
2061 2673
2062my %tex = ( 2674my %tex = (
2063 food => [ 2675 food => [
2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2677 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066 ], 2678 ],
2067 grace => [ 2679 grace => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2681 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2070 ], 2682 ],
2071 hp => [ 2683 hp => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2685 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074 ], 2686 ],
2075 mana => [ 2687 mana => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2689 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2078 ], 2690 ],
2079); 2691);
2080 2692
2081# eg. VGauge->new (gauge => 'food'), default gauge: food 2693# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2753 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2754 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2755
2144 my $h1 = $self->{h} * (1 - $ycut1); 2756 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2); 2757 my $h2 = $self->{h} * (1 - $ycut2);
2758 my $h3 = $self->{h};
2759
2760 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146 2761
2147 glEnable GL_BLEND; 2762 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2763 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2764 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2765 glEnable GL_TEXTURE_2D;
… …
2169 2784
2170 if ($t3) { 2785 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2786 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2787 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2788 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2789 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2790 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2791 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2792 glEnd;
2178 } 2793 }
2179 2794
2180 glDisable GL_BLEND; 2795 glDisable GL_BLEND;
2181 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2182} 2797}
2183 2798
2184############################################################################# 2799#############################################################################
2185 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2186package CFClient::UI::Gauge; 2939package CFPlus::UI::Gauge;
2187 2940
2188our @ISA = CFClient::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2189 2942
2190sub new { 2943sub new {
2191 my ($class, %arg) = @_; 2944 my ($class, %arg) = @_;
2192 2945
2193 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2195 can_hover => 1, 2948 can_hover => 1,
2196 can_events => 1, 2949 can_events => 1,
2197 %arg, 2950 %arg,
2198 ); 2951 );
2199 2952
2200 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2953 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2201 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2954 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2202 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2955 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2203 2956
2204 $self 2957 $self
2205} 2958}
2206 2959
2207sub set_fontsize { 2960sub set_fontsize {
… …
2228 $self->{value}->set_text ($val); 2981 $self->{value}->set_text ($val);
2229} 2982}
2230 2983
2231############################################################################# 2984#############################################################################
2232 2985
2233package CFClient::UI::Slider; 2986package CFPlus::UI::Slider;
2234 2987
2235use strict; 2988use strict;
2236 2989
2237use CFClient::OpenGL; 2990use CFPlus::OpenGL;
2238 2991
2239our @ISA = CFClient::UI::DrawBG::; 2992our @ISA = CFPlus::UI::DrawBG::;
2240 2993
2241my @tex = 2994my @tex =
2242 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2995 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243 qw(s1_slider.png s1_slider_bg.png); 2996 qw(s1_slider.png s1_slider_bg.png);
2244 2997
2245sub new { 2998sub new {
2246 my $class = shift; 2999 my $class = shift;
2247 3000
… …
2268 $self->update; 3021 $self->update;
2269 3022
2270 $self 3023 $self
2271} 3024}
2272 3025
2273sub changed { }
2274
2275sub set_range { 3026sub set_range {
2276 my ($self, $range) = @_; 3027 my ($self, $range) = @_;
2277 3028
2278 ($range, $self->{range}) = ($self->{range}, $range); 3029 ($range, $self->{range}) = ($self->{range}, $range);
2279 3030
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 3031 if ("@$range" ne "@{$self->{range}}") {
3032 $self->update;
3033 $self->set_value ($self->{range}[0]);
3034 }
2282} 3035}
2283 3036
2284sub set_value { 3037sub set_value {
2285 my ($self, $value) = @_; 3038 my ($self, $value) = @_;
2286 3039
… …
2297 if $unit; 3050 if $unit;
2298 3051
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3052 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 3053
2301 if ($value != $old_value) { 3054 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 3055 $self->emit (changed => $value);
2303 $self->update; 3056 $self->update;
2304 } 3057 }
2305} 3058}
2306 3059
2307sub size_request { 3060sub size_request {
2308 my ($self) = @_; 3061 my ($self) = @_;
2309 3062
2310 ($self->{req_w}, $self->{req_h}) 3063 ($self->{req_w}, $self->{req_h})
2311} 3064}
2312 3065
2313sub button_down { 3066sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 3067 my ($self, $ev, $x, $y) = @_;
2315 3068
2316 $self->SUPER::button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 3070
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 3072
2320 $self->mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
2321}
2322 3074
3075 1
3076}
3077
2323sub mouse_motion { 3078sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2325 3080
2326 if ($GRAB == $self) { 3081 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 3083
… …
2332 3087
2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3088 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else { 3089 } else {
2335 return 0; 3090 return 0;
2336 } 3091 }
3092
3093 1
3094}
3095
3096sub invoke_mouse_wheel {
3097 my ($self, $ev) = @_;
3098
3099 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3100
3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3102
3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2337 3104
2338 1 3105 1
2339} 3106}
2340 3107
2341sub update { 3108sub update {
… …
2392 glDisable GL_TEXTURE_2D; 3159 glDisable GL_TEXTURE_2D;
2393} 3160}
2394 3161
2395############################################################################# 3162#############################################################################
2396 3163
2397package CFClient::UI::ValSlider; 3164package CFPlus::UI::ValSlider;
2398 3165
2399our @ISA = CFClient::UI::HBox::; 3166our @ISA = CFPlus::UI::HBox::;
2400 3167
2401sub new { 3168sub new {
2402 my ($class, %arg) = @_; 3169 my ($class, %arg) = @_;
2403 3170
2404 my $range = delete $arg{range}; 3171 my $range = delete $arg{range};
2405 3172
2406 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3174 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3175 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift }, 3176 to_value => sub { shift },
2410 from_value => sub { shift }, 3177 from_value => sub { shift },
2411 %arg, 3178 %arg,
2412 ); 3179 );
2413 3180
… …
2433sub set_range { shift->{slider}->set_range (@_) } 3200sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 3201sub set_value { shift->{slider}->set_value (@_) }
2435 3202
2436############################################################################# 3203#############################################################################
2437 3204
2438package CFClient::UI::TextView; 3205package CFPlus::UI::TextScroller;
2439 3206
2440our @ISA = CFClient::UI::HBox::; 3207our @ISA = CFPlus::UI::HBox::;
2441 3208
2442use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2443 3210
2444sub new { 3211sub new {
2445 my $class = shift; 3212 my $class = shift;
2446 3213
2447 my $self = $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
2448 fontsize => 1, 3215 fontsize => 1,
2449 can_events => 0, 3216 can_events => 1,
3217 indent => 0,
2450 #font => default_font 3218 #font => default_font
2451 @_, 3219 @_,
2452 3220
2453 layout => (new CFClient::Layout 1), 3221 layout => (new CFPlus::Layout),
2454 par => [], 3222 par => [],
3223 max_par => 0,
2455 height => 0, 3224 height => 0,
2456 children => [ 3225 children => [
2457 (new CFClient::UI::Empty expand => 1), 3226 (new CFPlus::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 3227 (new CFPlus::UI::Slider vertical => 1),
2459 ], 3228 ],
2460 ); 3229 );
2461 3230
2462 $self->{children}[1]->connect (changed => sub { $self->update }); 3231 $self->{children}[1]->connect (changed => sub { $self->update });
2463 3232
… …
2469 3238
2470 $self->{fontsize} = $fontsize; 3239 $self->{fontsize} = $fontsize;
2471 $self->reflow; 3240 $self->reflow;
2472} 3241}
2473 3242
3243sub size_request {
3244 my ($self) = @_;
3245
3246 my ($empty, $slider) = $self->visible_children;
3247
3248 local $self->{children} = [$empty, $slider];
3249 $self->SUPER::size_request
3250}
3251
2474sub size_allocate { 3252sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 3253 my ($self, $w, $h) = @_;
2476 3254
2477 $self->SUPER::size_allocate ($w, $h); 3255 my ($empty, $slider, @other) = @{ $self->{children} };
3256 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 3257
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3258 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3259 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 3260 $self->{layout}->set_width ($empty->{w});
3261 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 3262
2483 $self->reflow; 3263 $self->reflow;
2484}
2485 3264
2486sub text_size { 3265 local $self->{children} = [$empty, $slider];
3266 $self->SUPER::invoke_size_allocate ($w, $h)
3267}
3268
3269sub invoke_mouse_wheel {
2487 my ($self, $text, $indent) = @_; 3270 my ($self, $ev) = @_;
3271
3272 return 0 unless $ev->{dy}; # only vertical movements
3273
3274 $self->{children}[1]->emit (mouse_wheel => $ev);
3275
3276 1
3277}
3278
3279sub get_layout {
3280 my ($self, $para) = @_;
2488 3281
2489 my $layout = $self->{layout}; 3282 my $layout = $self->{layout};
2490 3283
3284 $layout->set_font ($self->{font}) if $self->{font};
3285 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3286 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 3287 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3288 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 3289 $layout->set_markup ($para->{markup});
3290
3291 $layout->set_shapes (
3292 map
3293 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3294 @{$para->{widget}}
2494 3295 );
3296
2495 $layout->size 3297 $layout
2496} 3298}
2497 3299
2498sub reflow { 3300sub reflow {
2499 my ($self) = @_; 3301 my ($self) = @_;
2500 3302
… …
2507 3309
2508 # todo: base offset on lines or so, not on pixels 3310 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset); 3311 $self->{children}[1]->set_value ($offset);
2510} 3312}
2511 3313
3314sub current_paragraph {
3315 my ($self) = @_;
3316
3317 $self->{top_paragraph} - 1
3318}
3319
3320sub scroll_to {
3321 my ($self, $para) = @_;
3322
3323 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3324
3325 $self->{scroll_to} = $para;
3326 $self->update;
3327}
3328
2512sub clear { 3329sub clear {
2513 my ($self) = @_; 3330 my ($self) = @_;
3331
3332 my (undef, undef, @other) = @{ $self->{children} };
3333 $self->remove ($_) for @other;
2514 3334
2515 $self->{par} = []; 3335 $self->{par} = [];
2516 $self->{height} = 0; 3336 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3337 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 3338}
2519 3339
2520sub add_paragraph { 3340sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 3341 my $self = shift;
2522 3342
2523 for my $line (split /\n/, $text) { 3343 for my $para (@_) {
2524 my ($w, $h) = $self->text_size ($line); 3344 $para = {
3345 fg => [1, 1, 1, 1],
3346 indent => 0,
3347 markup => "",
3348 widget => [],
3349 ref $para ? %$para : (markup => $para),
3350 w => 1e10,
3351 wrapped => 1,
3352 };
3353
3354 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3355 push @{$self->{par}}, $para;
3356 }
3357
3358 if (my $max = $self->{max_par}) {
3359 shift @{$self->{par}} while @{$self->{par}} > $max;
3360 }
3361
3362 $self->{need_reflow}++;
3363 $self->update;
3364}
3365
3366sub scroll_to_bottom {
3367 my ($self) = @_;
3368
3369 $self->{scroll_to} = $#{$self->{par}};
3370 $self->update;
3371}
3372
3373sub force_uptodate {
3374 my ($self) = @_;
3375
3376 if (delete $self->{need_reflow}) {
3377 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3378
3379 my $height = 0;
3380
3381 for my $para (@{$self->{par}}) {
3382 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3383 my $layout = $self->get_layout ($para);
3384 my ($w, $h) = $layout->size;
3385
3386 $para->{w} = $w + $para->{indent};
3387 $para->{h} = $h;
3388 $para->{wrapped} = $layout->has_wrapped;
3389 }
3390
3391 $para->{y} = $height;
3392 $height += $para->{h};
3393 }
3394
2525 $self->{height} += $h; 3395 $self->{height} = $height;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3396 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 }
2528 3397
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3398 delete $self->{texture};
3399 }
3400
3401 if (my $paridx = delete $self->{scroll_to}) {
3402 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3403 }
2530} 3404}
2531 3405
2532sub update { 3406sub update {
2533 my ($self) = @_; 3407 my ($self) = @_;
2534 3408
… …
2536 3410
2537 return unless $self->{h} > 0; 3411 return unless $self->{h} > 0;
2538 3412
2539 delete $self->{texture}; 3413 delete $self->{texture};
2540 3414
2541 $ROOT->on_post_alloc ($self, sub { 3415 $ROOT->on_post_alloc ($self => sub {
3416 $self->force_uptodate;
3417
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3418 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 3419
2544 if (delete $self->{need_reflow}) {
2545 my $height = 0;
2546
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2562
2563 $self->{height} = $height;
2564
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566
2567 delete $self->{texture};
2568 }
2569
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3420 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 3421 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 3422 glClear GL_COLOR_BUFFER_BIT;
2573 3423
3424 package CFPlus::UI::Base;
3425 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3426 (0, 0, $self->{w}, $self->{h});
3427
3428 my $top = int $self->{children}[1]{range}[0];
3429
3430 my $paridx = 0;
3431 my $top_paragraph;
2574 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
2575 3433
2576 my $y0 = $top; 3434 my $y0 = $top;
2577 my $y1 = $top + $H; 3435 my $y1 = $top + $H;
2578 3436
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 3437 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 3438 my $h = $para->{h};
3439 my $y = $para->{y};
2591 3440
2592 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 3442 my $layout = $self->get_layout ($para);
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 3443
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
2598 3446
2599 glRasterPos $par->[3], $y - $y0; 3447 if (my @w = @{ $para->{widget} }) {
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3448 my @s = $layout->get_shapes;
3449
3450 for (@w) {
3451 my ($dx, $dy) = splice @s, 0, 2, ();
3452
3453 $_->{x} = $dx + $para->{indent};
3454 $_->{y} = $dy + $y - $y0;
3455
3456 $_->draw;
3457 }
3458 }
2601 } 3459 }
2602 3460
2603 $y += $h; 3461 $paridx++;
3462 $top_paragraph ||= $paridx if $y >= $top;
2604 } 3463 }
2605 3464
2606 glDisable GL_BLEND; 3465 $self->{top_paragraph} = $top_paragraph;
2607 }; 3466 };
2608 }); 3467 });
3468}
3469
3470sub reconfigure {
3471 my ($self) = @_;
3472
3473 $self->SUPER::reconfigure;
3474
3475 $_->{w} = 1e10 for @{ $self->{par} };
3476 $self->reflow;
2609} 3477}
2610 3478
2611sub _draw { 3479sub _draw {
2612 my ($self) = @_; 3480 my ($self) = @_;
2613 3481
… …
2616 glColor 0, 0, 0, 1; 3484 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3485 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 3486 glDisable GL_TEXTURE_2D;
2619 3487
2620 $self->{children}[1]->draw; 3488 $self->{children}[1]->draw;
2621
2622} 3489}
2623 3490
2624############################################################################# 3491#############################################################################
2625 3492
2626package CFClient::UI::Animator; 3493package CFPlus::UI::Animator;
2627 3494
2628use CFClient::OpenGL; 3495use CFPlus::OpenGL;
2629 3496
2630our @ISA = CFClient::UI::Bin::; 3497our @ISA = CFPlus::UI::Bin::;
2631 3498
2632sub moveto { 3499sub moveto {
2633 my ($self, $x, $y) = @_; 3500 my ($self, $x, $y) = @_;
2634 3501
2635 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3502 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2663 glPopMatrix; 3530 glPopMatrix;
2664} 3531}
2665 3532
2666############################################################################# 3533#############################################################################
2667 3534
2668package CFClient::UI::Flopper; 3535package CFPlus::UI::Flopper;
2669 3536
2670our @ISA = CFClient::UI::Button::; 3537our @ISA = CFPlus::UI::Button::;
2671 3538
2672sub new { 3539sub new {
2673 my $class = shift; 3540 my $class = shift;
2674 3541
2675 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
2687 $self->{other}->toggle_visibility; 3554 $self->{other}->toggle_visibility;
2688} 3555}
2689 3556
2690############################################################################# 3557#############################################################################
2691 3558
2692package CFClient::UI::Tooltip; 3559package CFPlus::UI::Tooltip;
2693 3560
2694our @ISA = CFClient::UI::Bin::; 3561our @ISA = CFPlus::UI::Bin::;
2695 3562
2696use CFClient::OpenGL; 3563use CFPlus::OpenGL;
2697 3564
2698sub new { 3565sub new {
2699 my $class = shift; 3566 my $class = shift;
2700 3567
2701 $class->SUPER::new ( 3568 $class->SUPER::new (
… …
2705} 3572}
2706 3573
2707sub set_tooltip_from { 3574sub set_tooltip_from {
2708 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
2709 3576
2710 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
2711 3582
2712 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
2717 } 3588 }
2718 3589
3590 $tip =~ s/^\n+//;
3591 $tip =~ s/\n+$//;
3592
2719 $self->add (new CFClient::UI::Label 3593 $self->add (new CFPlus::UI::Label
2720 markup => $tooltip, 3594 markup => $tip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 3596 fontsize => 0.8,
2723 fg => [0, 0, 0, 1], 3597 style => 1, # FLAG_INVERSE
2724 ellipsise => 0, 3598 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 ); 3600 );
2727} 3601}
2728 3602
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3606 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3607
2734 ($w + 4, $h + 4) 3608 ($w + 4, $h + 4)
2735} 3609}
2736 3610
2737sub size_allocate { 3611sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3612 my ($self, $w, $h) = @_;
2739 3613
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3614 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3615}
2742 3616
2743sub visibility_change { 3617sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3618 my ($self, $visible) = @_;
2745 3619
2746 return unless $visible; 3620 return unless $visible;
2747 3621
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3622 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3623 my $widget = $self->{owner}
2750 or return; 3624 or return;
2751 3625
3626 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3627 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3628
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3629 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3630 if $x + $self->{w} > $self->{root}{w};
2756 3631
2757 $self->move_abs ($x, $y); 3632 $self->move_abs ($x, $y);
3633 } else {
3634 $self->hide;
3635 }
2758 }); 3636 });
2759} 3637}
2760 3638
2761sub _draw { 3639sub _draw {
2762 my ($self) = @_; 3640 my ($self) = @_;
2763 3641
2764 glTranslate 0.375, 0.375;
2765
2766 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
2767 3643
2768 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
2769 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
2770 glVertex 0 , 0;
2771 glVertex 0 , $h;
2772 glVertex $w, $h;
2773 glVertex $w, 0;
2774 glEnd;
2775 3646
2776 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
2777 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
2778 glVertex 0 , 0;
2779 glVertex 0 , $h;
2780 glVertex $w, $h;
2781 glVertex $w, 0;
2782 glEnd;
2783 3649
2784 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
2785 3651
2786 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
2787} 3653}
2788 3654
2789############################################################################# 3655#############################################################################
2790 3656
2791package CFClient::UI::Face; 3657package CFPlus::UI::Face;
2792 3658
2793our @ISA = CFClient::UI::Base::; 3659our @ISA = CFPlus::UI::DrawBG::;
2794 3660
2795use CFClient::OpenGL; 3661use CFPlus::OpenGL;
2796 3662
2797sub new { 3663sub new {
2798 my $class = shift; 3664 my $class = shift;
2799 3665
2800 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 size_w => 32,
3668 size_h => 8,
2801 aspect => 1, 3669 aspect => 1,
2802 can_events => 0, 3670 can_events => 0,
2803 @_, 3671 @_,
2804 ); 3672 );
2805 3673
2806 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
2808 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2809 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1, 3680 parked => 1,
2812 interval => $self->{animspeed},
2813 cb => sub { 3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
2814 ++$widget->{frame}; 3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
2815 $widget->update; 3691 $w->update;
3692 $w->update_timer;
2816 }, 3693 },
2817 ); 3694 );
3695
3696 $self->update_face;
3697 $self->update_timer;
2818 } 3698 }
2819 3699
2820 $self 3700 $self
2821} 3701}
2822 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->at (
3710 $self->{anim_start}
3711 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3713 );
3714 $self->{timer}->start;
3715 } else {
3716 $self->{timer}->stop;
3717 }
3718}
3719
3720sub update_face {
3721 my ($self) = @_;
3722
3723 if ($::CONN) {
3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3725 if ($anim && @$anim) {
3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3735 }
3736 }
3737}
3738
2823sub size_request { 3739sub size_request {
2824 (32, 8) 3740 my ($self) = @_;
3741
3742 if ($::CONN) {
3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3745 if ($tex->{name}) {
3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3747 } elsif (!$tex->{loading}) {
3748 $tex->upload (sub { $self->reconfigure });
3749 }
3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3753 }
3754 }
3755
3756 ($self->{size_w} || 8, $self->{size_h} || 8)
2825} 3757}
2826 3758
2827sub update { 3759sub update {
2828 my ($self) = @_; 3760 my ($self) = @_;
2829 3761
2830 return unless $self->{visible}; 3762 return unless $self->{visible};
2831 3763
2832 $self->SUPER::update; 3764 $self->SUPER::update;
2833} 3765}
2834 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
2835sub _draw { 3775sub _draw {
2836 my ($self) = @_; 3776 my ($self) = @_;
2837 3777
2838 return unless $::CONN; 3778 $self->SUPER::_draw;
2839 3779
2840 my $face; 3780 if (my $tex = $self->{tex}) {
2841
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}];
2844
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848
2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2850
2851 if ($tex) {
2852 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
2857 } 3786 }
2858} 3787}
2859 3788
2860sub DESTROY { 3789sub destroy {
2861 my ($self) = @_; 3790 my ($self) = @_;
2862 3791
2863 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
2864 if $self->{timer}; 3793 if $self->{timer};
2865 3794
2866 $self->SUPER::DESTROY; 3795 $self->SUPER::destroy;
2867} 3796}
2868 3797
2869############################################################################# 3798#############################################################################
2870 3799
2871package CFClient::UI::Buttonbar; 3800package CFPlus::UI::Buttonbar;
2872 3801
2873our @ISA = CFClient::UI::HBox::; 3802our @ISA = CFPlus::UI::HBox::;
2874 3803
2875# TODO: should actualyl wrap buttons and other goodies. 3804# TODO: should actually wrap buttons and other goodies.
2876 3805
2877############################################################################# 3806#############################################################################
2878 3807
2879package CFClient::UI::Menu; 3808package CFPlus::UI::Menu;
2880 3809
2881our @ISA = CFClient::UI::FancyFrame::; 3810our @ISA = CFPlus::UI::Toplevel::;
2882 3811
2883use CFClient::OpenGL; 3812use CFPlus::OpenGL;
2884 3813
2885sub new { 3814sub new {
2886 my $class = shift; 3815 my $class = shift;
2887 3816
2888 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
2889 items => [], 3818 items => [],
2890 z => 100, 3819 z => 100,
2891 @_, 3820 @_,
2892 ); 3821 );
2893 3822
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3823 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895 3824
2896 for my $item (@{ $self->{items} }) { 3825 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3826 my ($widget, $cb, $tooltip) = @$item;
2898 3827
2899 # handle various types of items, only text for now 3828 # handle various types of items, only text for now
2900 if (!ref $widget) { 3829 if (!ref $widget) {
3830 if ($widget =~ /\t/) {
3831 my ($left, $right) = split /\t/, $widget, 2;
3832
2901 $widget = new CFClient::UI::Label 3833 $widget = new CFPlus::UI::HBox
2902 can_hover => 1, 3834 can_hover => 1,
2903 can_events => 1, 3835 can_events => 1,
3836 tooltip => $tooltip,
3837 children => [
3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3839 (new CFPlus::UI::Label markup => $right, align => +1),
3840 ],
3841 ;
3842
3843 } else {
3844 $widget = new CFPlus::UI::Label
3845 can_hover => 1,
3846 can_events => 1,
2904 text => $widget; 3847 markup => $widget,
3848 tooltip => $tooltip;
3849 }
2905 } 3850 }
2906 3851
2907 $self->{item}{$widget} = $item; 3852 $self->{item}{$widget} = $item;
2908 3853
2909 $self->{vbox}->add ($widget); 3854 $self->{vbox}->add ($widget);
… …
2914 3859
2915# popup given the event (must be a mouse button down event currently) 3860# popup given the event (must be a mouse button down event currently)
2916sub popup { 3861sub popup {
2917 my ($self, $ev) = @_; 3862 my ($self, $ev) = @_;
2918 3863
2919 $self->_emit ("popdown"); 3864 $self->emit ("popdown");
2920 3865
2921 # maybe save $GRAB? must be careful about events... 3866 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3867 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3868 $self->{button} = $ev->{button};
2924 3869
2925 $self->show; 3870 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3871 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3872}
2928 3873
2929sub mouse_motion { 3874sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3875 my ($self, $ev, $x, $y) = @_;
2931 3876
2932 # TODO: should use vbox->find_widget or so 3877 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3878 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3879 $self->{hover} = $self->{item}{$HOVER};
2935 3880
2936 0 3881 0
2937} 3882}
2938 3883
2939sub button_up { 3884sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3885 my ($self, $ev, $x, $y) = @_;
2941 3886
2942 if ($ev->{button} == $self->{button}) { 3887 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3888 undef $GRAB;
2944 $self->hide; 3889 $self->hide;
2945 3890
2946 $self->_emit ("popdown"); 3891 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3892 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3893 } else {
2949 return 0 3894 return 0
2950 } 3895 }
2951 3896
2952 1 3897 1
2953} 3898}
2954 3899
2955############################################################################# 3900#############################################################################
2956 3901
2957package CFClient::UI::Multiplexer; 3902package CFPlus::UI::Multiplexer;
2958 3903
2959our @ISA = CFClient::UI::Container::; 3904our @ISA = CFPlus::UI::Container::;
2960 3905
2961sub new { 3906sub new {
2962 my $class = shift; 3907 my $class = shift;
2963 3908
2964 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
… …
2978 3923
2979 $self->{current} = $self->{children}[0] 3924 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3925 if @{ $self->{children} };
2981} 3926}
2982 3927
3928sub get_current_page {
3929 my ($self) = @_;
3930
3931 $self->{current}
3932}
3933
2983sub set_current_page { 3934sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3935 my ($self, $page_or_widget) = @_;
2985 3936
2986 my $widget = ref $page_or_widget 3937 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3938 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3939 : $self->{children}[$page_or_widget];
2989 3940
2990 $self->{current} = $widget; 3941 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3942 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3943
2993 $self->_emit (page_changed => $self->{current}); 3944 $self->emit (page_changed => $self->{current});
2994 3945
2995 $self->realloc; 3946 $self->realloc;
2996} 3947}
2997 3948
2998sub visible_children { 3949sub visible_children {
… …
3003 my ($self) = @_; 3954 my ($self) = @_;
3004 3955
3005 $self->{current}->size_request 3956 $self->{current}->size_request
3006} 3957}
3007 3958
3008sub size_allocate { 3959sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3960 my ($self, $w, $h) = @_;
3010 3961
3011 $self->{current}->configure (0, 0, $w, $h); 3962 $self->{current}->configure (0, 0, $w, $h);
3963
3964 1
3012} 3965}
3013 3966
3014sub _draw { 3967sub _draw {
3015 my ($self) = @_; 3968 my ($self) = @_;
3016 3969
3017 $self->{current}->draw; 3970 $self->{current}->draw;
3018} 3971}
3019 3972
3020############################################################################# 3973#############################################################################
3021 3974
3022package CFClient::UI::Notebook; 3975package CFPlus::UI::Notebook;
3023 3976
3977use CFPlus::OpenGL;
3978
3024our @ISA = CFClient::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3025 3980
3026sub new { 3981sub new {
3027 my $class = shift; 3982 my $class = shift;
3028 3983
3029 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3032 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3033 @_, 3989 @_,
3034 ); 3990 );
3035 3991
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3039 $self 4029 $self
3040} 4030}
3041 4031
3042sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3043 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3044 4051
3045 Scalar::Util::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3046 4054
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
4056}
4057
4058sub get_current_page {
4059 my ($self) = @_;
4060
4061 $self->{multiplexer}->get_current_page
3054} 4062}
3055 4063
3056sub set_current_page { 4064sub set_current_page {
3057 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3058 4066
3059 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3061} 4089}
3062 4090
3063############################################################################# 4091#############################################################################
3064 4092
3065package CFClient::UI::Statusbox; 4093package CFPlus::UI::Selector;
3066 4094
4095use utf8;
4096
3067our @ISA = CFClient::UI::VBox::; 4097our @ISA = CFPlus::UI::Button::;
3068 4098
3069sub new { 4099sub new {
3070 my $class = shift; 4100 my $class = shift;
3071 4101
3072 $class->SUPER::new ( 4102 my $self = $class->SUPER::new (
4103 options => [], # [value, title, longdesc], ...
4104 value => undef,
4105 @_,
4106 );
4107
4108 $self->_set_value ($self->{value});
4109
4110 $self
4111}
4112
4113sub invoke_button_down {
4114 my ($self, $ev) = @_;
4115
4116 my @menu_items;
4117
4118 for (@{ $self->{options} }) {
4119 my ($value, $title, $tooltip) = @$_;
4120
4121 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4122 }
4123
4124 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4125}
4126
4127sub _set_value {
4128 my ($self, $value) = @_;
4129
4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4131 or return;
4132
4133 $self->{value} = $item->[0];
4134 $self->set_markup ("$item->[1] ⇓");
4135 $self->set_tooltip ($item->[2]);
4136}
4137
4138sub set_value {
4139 my ($self, $value) = @_;
4140
4141 return unless $self->{value} ne $value;
4142
4143 $self->_set_value ($value);
4144 $self->emit (changed => $value);
4145}
4146
4147#############################################################################
4148
4149package CFPlus::UI::Statusbox;
4150
4151our @ISA = CFPlus::UI::VBox::;
4152
4153sub new {
4154 my $class = shift;
4155
4156 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 4157 fontsize => 0.8,
3074 @_, 4158 @_,
3075 ) 4159 );
4160
4161 CFPlus::weaken (my $this = $self);
4162
4163 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4164
4165 $self
3076} 4166}
3077 4167
3078sub reorder { 4168sub reorder {
3079 my ($self) = @_; 4169 my ($self) = @_;
3080 my $NOW = time; 4170 my $NOW = Time::HiRes::time;
4171
4172 # freeze display when hovering over any label
4173 return if $CFPlus::UI::TOOLTIP->{owner}
4174 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4175 values %{ $self->{item} };
3081 4176
3082 while (my ($k, $v) = each %{ $self->{item} }) { 4177 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4178 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 4179 }
3085 4180
… …
3088 my @items = sort { 4183 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 4184 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 4185 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 4186 } values %{ $self->{item} };
3092 4187
4188 $self->{timer}->interval (1);
4189
3093 my $count = 10 + 1; 4190 my $count = 10 + 1;
3094 for my $item (@items) { 4191 for my $item (@items) {
3095 last unless --$count; 4192 last unless --$count;
3096 4193
3097 push @widgets, $item->{label} ||= do { 4194 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 4195 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 4196 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 4197 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 4198 : $item->{text};
3102 4199
3103 for ($short) { 4200 for ($short) {
3104 s/^\s+//; 4201 s/^\s+//;
3105 s/\s+/ /g; 4202 s/\s+/ /g;
3106 } 4203 }
3107 4204
3108 new CFClient::UI::Label 4205 new CFPlus::UI::Label
3109 markup => $short, 4206 markup => $short,
3110 tooltip => $item->{tooltip}, 4207 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 4208 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 4209 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 4210 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 4211 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 4212 fg => [@{ $item->{fg} }],
3116 can_events => 1, 4213 can_events => 1,
3117 can_hover => 1 4214 can_hover => 1
3118 }; 4215 };
4216
4217 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4218 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4219 $label->update;
4220 $label->set_max_size (undef, $label->{req_h} * $diff)
4221 if $diff < 1;
4222 $self->{timer}->interval (1/30);
4223 } else {
4224 $label->{fg}[3] = $item->{fg}[3] || 1;
4225 }
4226
4227 push @widgets, $label;
3119 } 4228 }
3120 4229
3121 $self->clear; 4230 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 4231 $self->SUPER::add (reverse @widgets);
3123} 4232}
… …
3128 $text =~ s/^\s+//; 4237 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 4238 $text =~ s/\s+$//;
3130 4239
3131 return unless $text; 4240 return unless $text;
3132 4241
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 4242 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 4243
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4244 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 4245
3137 if (my $item = $self->{item}{$group}) { 4246 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 4247 if ($item->{text} eq $text) {
3139 $item->{count}++; 4248 $item->{count}++;
3140 } else { 4249 } else {
3141 $item->{count} = 1; 4250 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 4251 $item->{text} = $item->{tooltip} = $text;
3143 } 4252 }
3144 $item->{id} = ++$self->{id}; 4253 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 4254 $item->{timeout} = $timeout;
3146 delete $item->{label}; 4255 delete $item->{label};
3147 } else { 4256 } else {
3148 $self->{item}{$group} = { 4257 $self->{item}{$group} = {
3149 id => ++$self->{id}, 4258 id => ++$self->{id},
… …
3155 count => 1, 4264 count => 1,
3156 %arg, 4265 %arg,
3157 }; 4266 };
3158 } 4267 }
3159 4268
4269 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 4270 $self->reorder;
4271 });
3161} 4272}
3162 4273
3163sub reconfigure { 4274sub reconfigure {
3164 my ($self) = @_; 4275 my ($self) = @_;
3165 4276
… …
3168 4279
3169 $self->reorder; 4280 $self->reorder;
3170 $self->SUPER::reconfigure; 4281 $self->SUPER::reconfigure;
3171} 4282}
3172 4283
4284sub destroy {
4285 my ($self) = @_;
4286
4287 $self->{timer}->cancel;
4288
4289 $self->SUPER::destroy;
4290}
4291
3173############################################################################# 4292#############################################################################
3174 4293
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root; 4294package CFPlus::UI::Root;
3471 4295
3472our @ISA = CFClient::UI::Container::; 4296our @ISA = CFPlus::UI::Container::;
3473 4297
4298use List::Util qw(min max);
4299
3474use CFClient::OpenGL; 4300use CFPlus::OpenGL;
3475 4301
3476sub new { 4302sub new {
3477 my $class = shift; 4303 my $class = shift;
3478 4304
3479 my $self = $class->SUPER::new ( 4305 my $self = $class->SUPER::new (
3480 visible => 1, 4306 visible => 1,
3481 @_, 4307 @_,
3482 ); 4308 );
3483 4309
3484 Scalar::Util::weaken ($self->{root} = $self); 4310 CFPlus::weaken ($self->{root} = $self);
3485 4311
3486 $self 4312 $self
3487} 4313}
3488 4314
3489sub size_request { 4315sub size_request {
… …
3504 $coord = $max - $size if $coord > $max - $size; 4330 $coord = $max - $size if $coord > $max - $size;
3505 4331
3506 int $coord + 0.5 4332 int $coord + 0.5
3507} 4333}
3508 4334
3509sub size_allocate { 4335sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 4336 my ($self, $w, $h) = @_;
3511 4337
3512 for my $child ($self->children) { 4338 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4339 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 4340
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 4344 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 4345 $Y = _to_pixel $Y, $H, $self->{h};
3520 4346
3521 $child->configure ($X, $Y, $W, $H); 4347 $child->configure ($X, $Y, $W, $H);
3522 } 4348 }
4349
4350 1
3523} 4351}
3524 4352
3525sub coord2local { 4353sub coord2local {
3526 my ($self, $x, $y) = @_; 4354 my ($self, $x, $y) = @_;
3527 4355
… …
3535} 4363}
3536 4364
3537sub update { 4365sub update {
3538 my ($self) = @_; 4366 my ($self) = @_;
3539 4367
3540 $::WANT_REFRESH++; 4368 $::WANT_REFRESH->start;
3541} 4369}
3542 4370
3543sub add { 4371sub add {
3544 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
3545 4373
… …
3582 while ($self->{refresh_hook}) { 4410 while ($self->{refresh_hook}) {
3583 $_->() 4411 $_->()
3584 for values %{delete $self->{refresh_hook}}; 4412 for values %{delete $self->{refresh_hook}};
3585 } 4413 }
3586 4414
3587 if ($self->{realloc}) { 4415 while ($self->{realloc}) {
3588 my %queue; 4416 my %queue;
3589 my @queue; 4417 my @queue;
3590 my $widget; 4418 my $widget;
3591 4419
3592 outer: 4420 outer:
… …
3612 4440
3613 delete $queue{$widget+0}; 4441 delete $queue{$widget+0};
3614 4442
3615 my ($w, $h) = $widget->size_request; 4443 my ($w, $h) = $widget->size_request;
3616 4444
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4445 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4446 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4447
4448 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4449 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 4450
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 4451 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 4452 $h = $widget->{force_h} if exists $widget->{force_h};
3622 4453
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4454 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3636 } 4467 }
3637 } 4468 }
3638 4469
3639 delete $self->{realloc}{$widget+0}; 4470 delete $self->{realloc}{$widget+0};
3640 } 4471 }
3641 }
3642 4472
3643 while (my $size_alloc = delete $self->{size_alloc}) { 4473 while (my $size_alloc = delete $self->{size_alloc}) {
3644 my @queue = sort { $b->{visible} <=> $a->{visible} } 4474 my @queue = sort { $a->{visible} <=> $b->{visible} }
3645 values %$size_alloc; 4475 values %$size_alloc;
3646 4476
3647 while () { 4477 while () {
3648 my $widget = pop @queue || last; 4478 my $widget = pop @queue || last;
3649 4479
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4480 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 4481
3652 $w = 0 if $w < 0; 4482 $w = max $widget->{min_w}, $w;
3653 $h = 0 if $h < 0; 4483 $h = max $widget->{min_h}, $h;
3654 4484
4485# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4486# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4487
4488 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4489 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4490
3655 $w = int $w + 0.5; 4491 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 4492 $h = int $h + 0.5;
3657 4493
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4494 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w}; 4495 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h}; 4496 $widget->{old_h} = $widget->{h};
3661 4497
3662 $widget->{w} = $w; 4498 $widget->{w} = $w;
3663 $widget->{h} = $h; 4499 $widget->{h} = $h;
3664 4500
3665 $widget->emit (size_allocate => $w, $h); 4501 $widget->emit (size_allocate => $w, $h);
4502 }
3666 } 4503 }
3667 } 4504 }
3668 } 4505 }
3669 4506
3670 while ($self->{post_alloc_hook}) { 4507 while ($self->{post_alloc_hook}) {
3671 $_->() 4508 $_->()
3672 for values %{delete $self->{post_alloc_hook}}; 4509 for values %{delete $self->{post_alloc_hook}};
3673 } 4510 }
3674
3675 4511
3676 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4512 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4513 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3678 glClear GL_COLOR_BUFFER_BIT; 4514 glClear GL_COLOR_BUFFER_BIT;
3679 4515
… …
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4518 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW; 4519 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity; 4520 glLoadIdentity;
3685 4521
3686 { 4522 {
3687 package CFClient::UI::Base; 4523 package CFPlus::UI::Base;
3688 4524
3689 ($draw_x, $draw_y, $draw_w, $draw_h) = 4525 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h}); 4526 (0, 0, $self->{w}, $self->{h});
3691 }
3692 4527
3693 $self->_draw; 4528 $self->_draw;
4529 }
3694} 4530}
3695 4531
3696############################################################################# 4532#############################################################################
3697 4533
3698package CFClient::UI; 4534package CFPlus::UI;
3699 4535
3700$ROOT = new CFClient::UI::Root; 4536$ROOT = new CFPlus::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4537$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702 4538
37031 45391
3704 4540

Diff Legend

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