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

Diff Legend

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