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.376 by root, Mon Jul 16 20:20:23 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
916 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
917 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
918 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
919 $self->update; 995 $self->update;
920} 996}
921 997
922# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
923sub coord2local { 999sub coord2local {
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1019 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1021 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1023 }
948} 1024}
949 1025
950sub _render { 1026sub _render {
951 my ($self) = @_; 1027 my ($self) = @_;
952 1028
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 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}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1031
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1033
958 $self->SUPER::_render; 1034 $self->SUPER::_render;
959} 1035}
960 1036
961############################################################################# 1037#############################################################################
962 1038
963package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
964 1040
965our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
966 1042
967sub new { 1043sub new {
968 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
969 1045
970 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
971 1047
972 my $self; 1048 my $self;
973 1049
974 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
975 vertical => 1, 1060 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1062 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
979 }, 1065 },
980 ; 1066 ;
981 1067
982 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
984 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
985 %arg, 1076 %arg,
986 ); 1077 );
987 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
989 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
990 1095
991 $self 1096 $self
992} 1097}
1098
1099#TODO# update range on size_allocate depending on child
993 1100
994sub add { 1101sub add {
995 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
996 1103
997 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
998} 1105}
999 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
1000sub update { 1131sub update {
1001 my ($self) = @_; 1132 my ($self) = @_;
1002 1133
1003 $self->SUPER::update; 1134 $self->SUPER::update;
1004 1135 $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} 1136}
1009 1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1010sub size_allocate { 1191sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1012 1193
1194 $self->update_slider;
1013 $self->SUPER::size_allocate ($w, $h); 1195 $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} 1196}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1197
1022############################################################################# 1198#############################################################################
1023 1199
1024package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1025 1201
1026our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1027 1203
1028use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1029 1205
1030sub new { 1206sub new {
1031 my $class = shift; 1207 my $class = shift;
1032 1208
1033 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1060} 1236}
1061 1237
1062############################################################################# 1238#############################################################################
1063 1239
1064package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1065 1241
1066our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1067 1243
1068use CFClient::OpenGL; 1244use 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 1245
1078sub new { 1246sub new {
1079 my ($class, %arg) = @_; 1247 my ($class, %arg) = @_;
1080 1248
1081 my $title = delete $arg{title}; 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354sub new {
1355 my ($class, %arg) = @_;
1082 1356
1083 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1360 border => 0.6,
1087 can_events => 1, 1361 can_events => 1,
1088 min_w => 16, 1362 min_w => 64,
1089 min_h => 16, 1363 min_h => 32,
1090 %arg, 1364 %arg,
1091 ); 1365 );
1092 1366
1093 $self->{title} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1368 align => 0,
1095 valign => 1, 1369 valign => 1,
1096 text => $title, 1370 text => $self->{title},
1097 fontsize => $self->{border} 1371 fontsize => $self->{border},
1098 if defined $title; 1372 if exists $self->{title};
1373
1374 if ($self->{has_close_button}) {
1375 $self->{close_button} =
1376 new CFPlus::UI::ImageButton
1377 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") };
1379
1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1381 }
1099 1382
1100 $self 1383 $self
1101} 1384}
1102 1385
1103sub add { 1386sub add {
1104 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1105 1388
1106 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1392}
1109 1393
1110sub border { 1394sub border {
1111 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1112} 1396}
1113 1397
1114sub size_request { 1398sub size_request {
1115 my ($self) = @_; 1399 my ($self) = @_;
1116 1400
1117 $self->{title}->size_request 1401 $self->{title_widget}->size_request
1118 if $self->{title}; 1402 if $self->{title_widget};
1403
1404 $self->{close_button}->size_request
1405 if $self->{close_button};
1119 1406
1120 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
1121 1408
1122 ( 1409 (
1123 $w + $self->border * 2, 1410 $w + $self->border * 2,
1124 $h + $self->border * 2, 1411 $h + $self->border * 2,
1125 ) 1412 )
1126} 1413}
1127 1414
1128sub size_allocate { 1415sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
1130 1417
1131 if ($self->{title}) { 1418 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1419 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1420 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1421 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1422 }
1136 1423
1137 my $border = $self->border; 1424 my $border = $self->border;
1138 1425
1139 $h -= List::Util::max 0, $border * 2; 1426 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1427 $w -= List::Util::max 0, $border * 2;
1428
1429 $self->child->configure ($border, $border, $w, $h);
1430
1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1432 if $self->{close_button};
1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1141 1441
1142 $self->child->configure ($border, $border, $w, $h); 1442 1
1143} 1443}
1144 1444
1145sub button_down { 1445sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
1147 1447
1148 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1449 my $border = $self->border;
1150 1450
… …
1181 1481
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1483
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1485 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1487 };
1188 } else { 1488 } else {
1189 return 0; 1489 return 0;
1190 } 1490 }
1191 1491
1192 1 1492 1
1193} 1493}
1194 1494
1195sub button_up { 1495sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1197 1497
1198 !!delete $self->{motion} 1498 ! ! delete $self->{motion}
1199} 1499}
1200 1500
1201sub mouse_motion { 1501sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1203 1503
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1505
1206 !!$self->{motion} 1506 ! ! $self->{motion}
1507}
1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1207} 1515}
1208 1516
1209sub _draw { 1517sub _draw {
1210 my ($self) = @_; 1518 my ($self) = @_;
1211 1519
… …
1237 1545
1238 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1239 1547
1240 $child->draw; 1548 $child->draw;
1241 1549
1242 if ($self->{title}) { 1550 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1551 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1552 $self->{title_widget}->_draw;
1553
1554 glTranslate 0, - ($border - $self->{h});
1245 } 1555 }
1556
1557 $self->{close_button}->draw
1558 if $self->{close_button};
1246} 1559}
1247 1560
1248############################################################################# 1561#############################################################################
1249 1562
1250package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1251 1564
1252our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1253 1566
1254use List::Util qw(max sum); 1567use List::Util qw(max sum);
1255 1568
1256use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1257 1570
1258sub new { 1571sub new {
1259 my $class = shift; 1572 my $class = shift;
1260 1573
1261 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1262 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1263 @_, 1578 @_,
1264 ) 1579 )
1265} 1580}
1266 1581
1267sub children { 1582sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1584}
1270 1585
1586# TODO: store row/col info in child widget and use standard add/del
1271sub add { 1587sub add {
1272 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1273 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1592 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1276 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1598 $self->realloc;
1599}
1600
1601sub remove {
1602 my ($self, $child) = @_;
1603
1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1278} 1609}
1279 1610
1280# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1612sub clear {
1282 my ($self) = @_; 1613 my ($self) = @_;
… …
1323 (sum @$ws), 1654 (sum @$ws),
1324 (sum @$hs), 1655 (sum @$hs),
1325 ) 1656 )
1326} 1657}
1327 1658
1328sub size_allocate { 1659sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1330 1661
1331 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1332 1663
1333 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1334 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1335 1666
1336 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1337 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1338 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1339 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1340 1671
1341 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1673
1345 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1346 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1347 1683
1348 my $y; 1684 my $y;
1349 1685
1350 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1365 } 1701 }
1366 1702
1367 $y += $row_h; 1703 $y += $row_h;
1368 } 1704 }
1369 1705
1706 1
1370} 1707}
1371 1708
1372sub find_widget { 1709sub find_widget {
1373 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1374 1711
… …
1393 } 1730 }
1394} 1731}
1395 1732
1396############################################################################# 1733#############################################################################
1397 1734
1398package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1399 1736
1737use List::Util qw(min max);
1738
1400our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1401 1820
1402sub size_request { 1821sub size_request {
1403 my ($self) = @_; 1822 my ($self) = @_;
1404 1823
1405 $self->{vertical} 1824 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1831 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1832 )
1414} 1833}
1415 1834
1416sub size_allocate { 1835sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1418 1837
1419 my $space = $self->{vertical} ? $h : $w; 1838 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1839 my @children = $self->visible_children;
1421 1840
1422 my @req; 1841 my @req;
1423 1842
1424 if ($self->{homogeneous}) { 1843 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1844 @req = ($space / (@children || 1)) x @children;
1426 } else { 1845 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1846 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1847 my $req = List::Util::sum @req;
1429 1848
1430 if ($req > $space) { 1849 if ($req > $space) {
1431 # ah well, not enough space 1850 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1851 $_ *= $space / $req for @req;
1433 } else { 1852 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1853 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1854
1436 $space = ($space - $req) / $expand; # remaining space to give away 1855 $space = ($space - $req) / $expand; # remaining space to give away
1437 1856
1438 $req[$_] += $space * $children->[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1858 for 0 .. $#children;
1440 } 1859 }
1441 } 1860 }
1442 1861
1443 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1444 1863
1445 my $pos = 0; 1864 my $pos = 0;
1446 for (0 .. $#$children) { 1865 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1868
1450 $pos += $alloc; 1869 $pos += $alloc;
1451 } 1870 }
1452 1871
1453 1 1872 1
1454} 1873}
1455 1874
1456############################################################################# 1875#############################################################################
1457 1876
1458package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1459 1878
1460our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1461 1880
1462sub new { 1881sub new {
1463 my $class = shift; 1882 my $class = shift;
1464 1883
1465 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1468 ) 1887 )
1469} 1888}
1470 1889
1471############################################################################# 1890#############################################################################
1472 1891
1473package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1474 1893
1475our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1476 1895
1477sub new { 1896sub new {
1478 my $class = shift; 1897 my $class = shift;
1479 1898
1480 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1483 ) 1902 )
1484} 1903}
1485 1904
1486############################################################################# 1905#############################################################################
1487 1906
1488package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1489 1908
1490our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1491 1910
1492use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1493 1912
1494sub new { 1913sub new {
1495 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1496 1915
1497 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1919 #active_bg => none
1501 #font => default_font 1920 #font => default_font
1502 #text => initial text 1921 #text => initial text
1503 #markup => initial narkup 1922 #markup => initial narkup
1504 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1505 ellipsise => 3, # end 1925 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1927 fontsize => 1,
1508 align => -1, 1928 align => -1,
1509 valign => -1, 1929 valign => -1,
1510 padding_x => 2, 1930 padding_x => 2,
1511 padding_y => 2, 1931 padding_y => 2,
1512 can_events => 0, 1932 can_events => 0,
1513 %arg 1933 %arg
1514 ); 1934 );
1515 1935
1516 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1939 $self->{template} = $layout;
1520 } 1940 }
1521 1941
1522 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1526 } 1946 }
1527 1947
1528 $self 1948 $self
1529} 1949}
1530 1950
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1951sub update {
1542 my ($self) = @_; 1952 my ($self) = @_;
1543 1953
1544 delete $self->{texture}; 1954 delete $self->{texture};
1545 $self->SUPER::update; 1955 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1557 1967
1558 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1560 1970
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1563 1972
1564 delete $self->{req_h}; 1973 delete $self->{size_req};
1565 $self->realloc; 1974 $self->realloc;
1566 $self->update; 1975 $self->update;
1567} 1976}
1568 1977
1569sub set_markup { 1978sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1574 1983
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1985
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1579 1987
1580 delete $self->{req_h}; 1988 delete $self->{size_req};
1581 $self->realloc; 1989 $self->realloc;
1582 $self->update; 1990 $self->update;
1583} 1991}
1584 1992
1585sub size_request { 1993sub size_request {
1586 my ($self) = @_; 1994 my ($self) = @_;
1587 1995
1588 if (exists $self->{req_h}) { 1996 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1998 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 2002
1597 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1598 2004
1599 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 2009
1603 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1604 2011
1605 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 2013 $h = List::Util::max $h, $h2;
1607 } 2014 }
1608 2015
1609 ($w, $h) 2016 [$w, $h]
1610 } 2017 };
1611}
1612 2018
2019 @{ $self->{size_req} }
2020}
2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1613sub size_allocate { 2026sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1615 2028
1616 delete $self->{ox}; 2029 delete $self->{ox};
1617 2030
1618 delete $self->{texture} 2031 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1620} 2035}
1621 2036
1622sub set_fontsize { 2037sub set_fontsize {
1623 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1624 2039
1625 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1626 delete $self->{texture}; 2042 delete $self->{texture};
1627 2043
1628 $self->realloc; 2044 $self->realloc;
1629} 2045}
1630 2046
2047sub reconfigure {
2048 my ($self) = @_;
2049
2050 delete $self->{size_req};
2051 delete $self->{texture};
2052
2053 $self->SUPER::reconfigure;
2054}
2055
1631sub _draw { 2056sub _draw {
1632 my ($self) = @_; 2057 my ($self) = @_;
1633 2058
1634 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1635 2060
1636 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 2068
1644 new_from_layout CFClient::Texture $self->{layout} 2069 [$self->{layout}->size]
1645 }; 2070 };
1646 2071
1647 unless (exists $self->{ox}) { 2072 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 2075 : ($self->{w} - $size->[0]) * 0.5);
1651 2076
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 2079 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 2080 };
1656 2081
1657 glEnable GL_TEXTURE_2D; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 2084
1659 if ($tex->{format} == GL_ALPHA) { 2085 $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} 2086}
1670 2087
1671############################################################################# 2088#############################################################################
1672 2089
1673package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1674 2091
1675our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1676 2093
1677use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1678 2095
1679sub new { 2096sub new {
1680 my $class = shift; 2097 my $class = shift;
1681 2098
1682 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1687 can_hover => 1, 2104 can_hover => 1,
1688 can_focus => 1, 2105 can_focus => 1,
1689 valign => 0, 2106 valign => 0,
1690 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1691 #text => ... 2109 #text => ...
2110 #hidden => "*",
1692 @_ 2111 @_
1693 ) 2112 )
1694} 2113}
1695 2114
1696sub _set_text { 2115sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 2122 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 2123 $self->{text} = $text;
1705 2124
1706 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 2127 delete $self->{size_req};
1709 2128
1710 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
1711 2130
1712 $self->realloc; 2131 $self->realloc;
1713 $self->update; 2132 $self->update;
1714} 2133}
1715 2134
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1731 2150
1732 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1733} 2152}
1734 2153
1735sub key_down { 2154sub invoke_key_down {
1736 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1737 2156
1738 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1741 2160
1742 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2164
1744 if ($uni == 8) { 2165 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1753 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2189 $self->emit ('escape');
1758 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2194 } else {
1761 return 0; 2195 return 0;
1762 } 2196 }
1763 2197
1764 $self->_set_text ($text); 2198 $self->_set_text ($text);
1765 2199
1766 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1767 2202
1768 1 2203 1
1769} 2204}
1770 2205
1771sub focus_in { 2206sub invoke_focus_in {
1772 my ($self) = @_; 2207 my ($self) = @_;
1773 2208
1774 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1775 2210
1776 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1777} 2212}
1778 2213
1779sub button_down { 2214sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1781 2216
1782 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2218
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2220
1786 # byte-index to char-index 2221 # byte-index to char-index
1787 my $text = $self->{text}; 2222 my $text = $self->{text};
1788 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1790 2225
1791 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1792 $self->update; 2227 $self->update;
1793 2228
1794 1 2229 1
1795} 2230}
1796 2231
1797sub mouse_motion { 2232sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2235
1801 0 2236 1
1802} 2237}
1803 2238
1804sub _draw { 2239sub _draw {
1805 my ($self) = @_; 2240 my ($self) = @_;
1806 2241
… …
1833 utf8::encode $text; 2268 utf8::encode $text;
1834 2269
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2271 }
1837 2272
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2273 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 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}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2276 glEnd;
1843 } 2277 }
1844} 2278}
1845 2279
2280#############################################################################
2281
1846package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1847 2283
1848our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1849 2285
1850use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1851 2287
1852sub key_down { 2288sub invoke_key_down {
1853 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1854 2290
1855 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1856 2292
1857 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1860 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1863 $self->update; 2300 $self->update;
1864 2301
1865 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1868 } 2305 }
1869 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2310 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2312 }
1876 2313
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2317
1881 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2320 } else {
1884 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1885 } 2322 }
1886 2323
1887 } else { 2324 } else {
1888 return $self->SUPER::key_down ($ev) 2325 return $self->SUPER::invoke_key_down ($ev)
1889 } 2326 }
1890 2327
1891 1 2328 1
1892} 2329}
1893 2330
1894############################################################################# 2331#############################################################################
1895 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1896package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1897 2373
1898our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1899 2375
1900use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1901 2377
1902my @tex = 2378my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1905 2381
1906sub new { 2382sub new {
1907 my $class = shift; 2383 my $class = shift;
1908 2384
… …
1917 can_events => 1, 2393 can_events => 1,
1918 @_ 2394 @_
1919 ) 2395 )
1920} 2396}
1921 2397
1922sub activate { }
1923
1924sub button_up { 2398sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1926 2400
1927 $self->emit ("activate") 2401 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1948} 2422}
1949 2423
1950############################################################################# 2424#############################################################################
1951 2425
1952package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1953 2427
1954our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1955 2429
1956my @tex = 2430my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2433
1960use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1961 2435
1962sub new { 2436sub new {
1963 my $class = shift; 2437 my $class = shift;
1964 2438
1965 $class->SUPER::new ( 2439 $class->SUPER::new (
… …
1979 my ($self) = @_; 2453 my ($self) = @_;
1980 2454
1981 (6) x 2 2455 (6) x 2
1982} 2456}
1983 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1984sub button_down { 2466sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1986 2468
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2471 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2472 } else {
1992 return 0 2473 return 0
1993 } 2474 }
1994 2475
1995 1 2476 1
… …
2015 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2016} 2497}
2017 2498
2018############################################################################# 2499#############################################################################
2019 2500
2020package CFClient::UI::Image; 2501package CFPlus::UI::Image;
2021 2502
2022our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
2023 2504
2024use CFClient::OpenGL; 2505use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2506
2027our %loaded_images; 2507our %texture_cache;
2028 2508
2029sub new { 2509sub new {
2030 my $class = shift; 2510 my $class = shift;
2031 2511
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2033 2516
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2035 2519
2036 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2522
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2040 2524
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2526
2045 $self 2527 $self
2046} 2528}
2047 2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2048sub size_request { 2545sub size_request {
2049 my ($self) = @_; 2546 my ($self) = @_;
2050 2547
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
2052} 2549}
2053 2550
2054sub _draw { 2551sub _draw {
2055 my ($self) = @_; 2552 my ($self) = @_;
2056 2553
… …
2066 } 2563 }
2067 2564
2068 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2567
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
2072 2569
2073 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
2074} 2571}
2075 2572
2076############################################################################# 2573#############################################################################
2077 2574
2575package CFPlus::UI::ImageButton;
2576
2577our @ISA = CFPlus::UI::Image::;
2578
2579use CFPlus::OpenGL;
2580
2581my %textures;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 padding_x => 4,
2588 padding_y => 4,
2589 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1],
2591 can_hover => 1,
2592 align => 0,
2593 valign => 0,
2594 can_events => 1,
2595 @_
2596 );
2597}
2598
2599sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_;
2601
2602 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w}
2604 && $y >= 0 && $y < $self->{h};
2605
2606 1
2607}
2608
2609#############################################################################
2610
2078package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
2079 2612
2080our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2081 2614
2082use List::Util qw(min max); 2615use List::Util qw(min max);
2083 2616
2084use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2085 2618
2086my %tex = ( 2619my %tex = (
2087 food => [ 2620 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2623 ],
2091 grace => [ 2624 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 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/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2627 ],
2095 hp => [ 2628 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2631 ],
2099 mana => [ 2632 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 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/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2635 ],
2103); 2636);
2104 2637
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2700
2168 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2706
2171 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
… …
2193 2729
2194 if ($t3) { 2730 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2737 glEnd;
2202 } 2738 }
2203 2739
2204 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2206} 2742}
2207 2743
2208############################################################################# 2744#############################################################################
2209 2745
2210package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2211 2747
2212our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2213 2749
2214sub new { 2750sub new {
2215 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2216 2752
2217 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2755 can_hover => 1,
2220 can_events => 1, 2756 can_events => 1,
2221 %arg, 2757 %arg,
2222 ); 2758 );
2223 2759
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $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); 2761 $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"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2763
2228 $self 2764 $self
2229} 2765}
2230 2766
2231sub set_fontsize { 2767sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2253} 2789}
2254 2790
2255############################################################################# 2791#############################################################################
2256 2792
2257package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2258 2794
2259use strict; 2795use strict;
2260 2796
2261use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2262 2798
2263our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2264 2800
2265my @tex = 2801my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2268 2804
2269sub new { 2805sub new {
2270 my $class = shift; 2806 my $class = shift;
2271 2807
… …
2292 $self->update; 2828 $self->update;
2293 2829
2294 $self 2830 $self
2295} 2831}
2296 2832
2297sub changed { }
2298
2299sub set_range { 2833sub set_range {
2300 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2301 2835
2302 ($range, $self->{range}) = ($self->{range}, $range); 2836 ($range, $self->{range}) = ($self->{range}, $range);
2303 2837
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2838 if ("@$range" ne "@{$self->{range}}") {
2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2306} 2842}
2307 2843
2308sub set_value { 2844sub set_value {
2309 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2310 2846
… …
2321 if $unit; 2857 if $unit;
2322 2858
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2860
2325 if ($value != $old_value) { 2861 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2327 $self->update; 2863 $self->update;
2328 } 2864 }
2329} 2865}
2330 2866
2331sub size_request { 2867sub size_request {
2332 my ($self) = @_; 2868 my ($self) = @_;
2333 2869
2334 ($self->{req_w}, $self->{req_h}) 2870 ($self->{req_w}, $self->{req_h})
2335} 2871}
2336 2872
2337sub button_down { 2873sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2339 2875
2340 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2877
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2879
2344 $self->mouse_motion ($ev, $x, $y) 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2881}
2346 2882
2347sub mouse_motion { 2883sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2349 2885
2350 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2888
… …
2358 } else { 2894 } else {
2359 return 0; 2895 return 0;
2360 } 2896 }
2361 2897
2362 1 2898 1
2899}
2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2363} 2911}
2364 2912
2365sub update { 2913sub update {
2366 my ($self) = @_; 2914 my ($self) = @_;
2367 2915
… …
2416 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2417} 2965}
2418 2966
2419############################################################################# 2967#############################################################################
2420 2968
2421package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2422 2970
2423our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2424 2972
2425sub new { 2973sub new {
2426 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2427 2975
2428 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2429 2977
2430 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2981 to_value => sub { shift },
2434 from_value => sub { shift }, 2982 from_value => sub { shift },
2435 %arg, 2983 %arg,
2436 ); 2984 );
2437 2985
… …
2457sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2459 3007
2460############################################################################# 3008#############################################################################
2461 3009
2462package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2463 3011
2464our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2465 3013
2466use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2467 3015
2468sub new { 3016sub new {
2469 my $class = shift; 3017 my $class = shift;
2470 3018
2471 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2472 fontsize => 1, 3020 fontsize => 1,
2473 can_events => 0, 3021 can_events => 1,
3022 indent => 0,
2474 #font => default_font 3023 #font => default_font
2475 @_, 3024 @_,
2476 3025
2477 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2478 par => [], 3027 par => [],
3028 max_par => 0,
2479 height => 0, 3029 height => 0,
2480 children => [ 3030 children => [
2481 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2483 ], 3033 ],
2484 ); 3034 );
2485 3035
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2487 3037
… …
2493 3043
2494 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2495 $self->reflow; 3045 $self->reflow;
2496} 3046}
2497 3047
3048sub size_request {
3049 my ($self) = @_;
3050
3051 my ($empty, $slider) = @{ $self->{children} };
3052
3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request
3055}
3056
2498sub size_allocate { 3057sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2500 3059
2501 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 3062
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 3065 $self->{layout}->set_width ($empty->{w});
3066 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 3067
2507 $self->reflow; 3068 $self->reflow;
2508}
2509 3069
2510sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
3082}
3083
3084sub get_layout {
3085 my ($self, $para) = @_;
2512 3086
2513 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2514 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 3092 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 3094 $layout->set_markup ($para->{markup});
3095
3096 $layout->set_shapes (
3097 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}}
2518 3100 );
3101
2519 $layout->size 3102 $layout
2520} 3103}
2521 3104
2522sub reflow { 3105sub reflow {
2523 my ($self) = @_; 3106 my ($self) = @_;
2524 3107
… …
2531 3114
2532 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2534} 3117}
2535 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2536sub clear { 3134sub clear {
2537 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2538 3139
2539 $self->{par} = []; 3140 $self->{par} = [];
2540 $self->{height} = 0; 3141 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 3143}
2543 3144
2544sub add_paragraph { 3145sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2546 3147
2547 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
3155 w => 1e10,
3156 wrapped => 1,
3157 };
3158
3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
3167 $self->{need_reflow}++;
3168 $self->update;
3169}
3170
3171sub scroll_to_bottom {
3172 my ($self) = @_;
3173
3174 $self->{scroll_to} = $#{$self->{par}};
3175 $self->update;
3176}
3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
2549 $self->{height} += $h; 3200 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3202
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
2554} 3209}
2555 3210
2556sub update { 3211sub update {
2557 my ($self) = @_; 3212 my ($self) = @_;
2558 3213
… …
2560 3215
2561 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2562 3217
2563 delete $self->{texture}; 3218 delete $self->{texture};
2564 3219
2565 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3224
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 { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2597 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2599 3238
2600 my $y0 = $top; 3239 my $y0 = $top;
2601 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2602 3241
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}}) { 3242 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2615 3245
2616 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3248
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2622 3250
2623 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3252 my @s = $layout->get_shapes;
3253
3254 for (@w) {
3255 my ($dx, $dy) = splice @s, 0, 2, ();
3256
3257 $_->{x} = $dx + $para->{indent};
3258 $_->{y} = $dy + $y - $y0;
3259
3260 $_->draw;
3261 }
3262 }
2625 } 3263 }
2626 3264
2627 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3267 }
2629 3268
2630 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2631 }; 3270 };
2632 }); 3271 });
3272}
3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
2633} 3281}
2634 3282
2635sub _draw { 3283sub _draw {
2636 my ($self) = @_; 3284 my ($self) = @_;
2637 3285
… …
2640 glColor 0, 0, 0, 1; 3288 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3289 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2643 3291
2644 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2645
2646} 3293}
2647 3294
2648############################################################################# 3295#############################################################################
2649 3296
2650package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2651 3298
2652use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2653 3300
2654our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2655 3302
2656sub moveto { 3303sub moveto {
2657 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2658 3305
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3334 glPopMatrix;
2688} 3335}
2689 3336
2690############################################################################# 3337#############################################################################
2691 3338
2692package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2693 3340
2694our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2695 3342
2696sub new { 3343sub new {
2697 my $class = shift; 3344 my $class = shift;
2698 3345
2699 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2712} 3359}
2713 3360
2714############################################################################# 3361#############################################################################
2715 3362
2716package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2717 3364
2718our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2719 3366
2720use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2721 3368
2722sub new { 3369sub new {
2723 my $class = shift; 3370 my $class = shift;
2724 3371
2725 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2728 ) 3375 )
2729} 3376}
2730 3377
2731sub set_tooltip_from { 3378sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3383
2734 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2735 3385
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3389 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3390 . "visible $widget->{visible}";
2741 } 3391 }
2742 3392
3393 $tooltip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//;
3395
2743 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3397 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3399 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3401 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3403 );
2751} 3404}
2752 3405
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3410
2758 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2759} 3412}
2760 3413
2761sub size_allocate { 3414sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2763 3416
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3417 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3418}
2766 3419
2767sub visibility_change { 3420sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3421 my ($self, $visible) = @_;
2769 3422
2770 return unless $visible; 3423 return unless $visible;
2771 3424
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2774 or return; 3427 or return;
2775 3428
3429 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3431
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3433 if $x + $self->{w} > $self->{root}{w};
2780 3434
2781 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2782 }); 3439 });
2783} 3440}
2784 3441
2785sub _draw { 3442sub _draw {
2786 my ($self) = @_; 3443 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2811} 3468}
2812 3469
2813############################################################################# 3470#############################################################################
2814 3471
2815package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2816 3473
2817our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2818 3475
2819use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2820 3477
2821sub new { 3478sub new {
2822 my $class = shift; 3479 my $class = shift;
2823 3480
2824 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2825 aspect => 1, 3484 aspect => 1,
2826 can_events => 0, 3485 can_events => 0,
2827 @_, 3486 @_,
2828 ); 3487 );
2829 3488
2830 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2832 3491
2833 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3494 hard => 1,
2836 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2837 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2838 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2839 $widget->update; 3501 $self->update;
2840 }, 3502 },
2841 ); 3503 );
3504
3505 $self->update_face;
2842 } 3506 }
2843 3507
2844 $self 3508 $self
2845} 3509}
2846 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2847sub size_request { 3524sub size_request {
2848 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3540}
2850 3541
2851sub update { 3542sub update {
2852 my ($self) = @_; 3543 my ($self) = @_;
2853 3544
… …
2859sub _draw { 3550sub _draw {
2860 my ($self) = @_; 3551 my ($self) = @_;
2861 3552
2862 return unless $::CONN; 3553 return unless $::CONN;
2863 3554
2864 my $face; 3555 $self->SUPER::_draw;
2865 3556
2866 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2868 3558 or return;
2869 $face = $anim->[ $self->{frame} % @$anim ]
2870 if $anim && @$anim;
2871 }
2872 3559
2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2874 3561
2875 if ($tex) { 3562 if ($tex) {
2876 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2878 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2881 } 3568 }
2882} 3569}
2883 3570
2884sub DESTROY { 3571sub destroy {
2885 my ($self) = @_; 3572 my ($self) = @_;
2886 3573
2887 $self->{timer}->cancel 3574 $self->{timer}->cancel
2888 if $self->{timer}; 3575 if $self->{timer};
2889 3576
2890 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2891} 3578}
2892 3579
2893############################################################################# 3580#############################################################################
2894 3581
2895package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
2896 3583
2897our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
2898 3585
2899# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
2900 3587
2901############################################################################# 3588#############################################################################
2902 3589
2903package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2904 3591
2905our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2906 3593
2907use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2908 3595
2909sub new { 3596sub new {
2910 my $class = shift; 3597 my $class = shift;
2911 3598
2912 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2913 items => [], 3600 items => [],
2914 z => 100, 3601 z => 100,
2915 @_, 3602 @_,
2916 ); 3603 );
2917 3604
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3606
2920 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2922 3609
2923 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2924 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2925 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3616 can_hover => 1,
2927 can_events => 1, 3617 can_events => 1,
3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
2928 text => $widget; 3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2929 } 3632 }
2930 3633
2931 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2932 3635
2933 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2938 3641
2939# popup given the event (must be a mouse button down event currently) 3642# popup given the event (must be a mouse button down event currently)
2940sub popup { 3643sub popup {
2941 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2942 3645
2943 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2944 3647
2945 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3649 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2948 3651
2949 $self->show; 3652 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3654}
2952 3655
2953sub mouse_motion { 3656sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2955 3658
2956 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2959 3662
2960 0 3663 0
2961} 3664}
2962 3665
2963sub button_up { 3666sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2965 3668
2966 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3670 undef $GRAB;
2968 $self->hide; 3671 $self->hide;
2969 3672
2970 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3675 } else {
2973 return 0 3676 return 0
2974 } 3677 }
2975 3678
2976 1 3679 1
2977} 3680}
2978 3681
2979############################################################################# 3682#############################################################################
2980 3683
2981package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
2982 3685
2983our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
2984 3687
2985sub new { 3688sub new {
2986 my $class = shift; 3689 my $class = shift;
2987 3690
2988 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3002 3705
3003 $self->{current} = $self->{children}[0] 3706 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3707 if @{ $self->{children} };
3005} 3708}
3006 3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
3007sub set_current_page { 3716sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3717 my ($self, $page_or_widget) = @_;
3009 3718
3010 my $widget = ref $page_or_widget 3719 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3720 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3721 : $self->{children}[$page_or_widget];
3013 3722
3014 $self->{current} = $widget; 3723 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3725
3017 $self->_emit (page_changed => $self->{current}); 3726 $self->emit (page_changed => $self->{current});
3018 3727
3019 $self->realloc; 3728 $self->realloc;
3020} 3729}
3021 3730
3022sub visible_children { 3731sub visible_children {
… …
3027 my ($self) = @_; 3736 my ($self) = @_;
3028 3737
3029 $self->{current}->size_request 3738 $self->{current}->size_request
3030} 3739}
3031 3740
3032sub size_allocate { 3741sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3742 my ($self, $w, $h) = @_;
3034 3743
3035 $self->{current}->configure (0, 0, $w, $h); 3744 $self->{current}->configure (0, 0, $w, $h);
3745
3746 1
3036} 3747}
3037 3748
3038sub _draw { 3749sub _draw {
3039 my ($self) = @_; 3750 my ($self) = @_;
3040 3751
3041 $self->{current}->draw; 3752 $self->{current}->draw;
3042} 3753}
3043 3754
3044############################################################################# 3755#############################################################################
3045 3756
3046package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3047 3758
3048our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3049 3760
3050sub new { 3761sub new {
3051 my $class = shift; 3762 my $class = shift;
3052 3763
3053 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3057 @_, 3768 @_,
3058 ); 3769 );
3059 3770
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3064} 3775}
3065 3776
3066sub add { 3777sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3068 3779
3069 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3070 3781
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3783 markup => $title,
3073 tooltip => $tooltip, 3784 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3786 );
3076 3787
3077 $self->{multiplexer}->add ($widget); 3788 $self->{multiplexer}->add ($widget);
3078} 3789}
3079 3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3080sub set_current_page { 3797sub set_current_page {
3081 my ($self, $page) = @_; 3798 my ($self, $page) = @_;
3082 3799
3083 $self->{multiplexer}->set_current_page ($page); 3800 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3802}
3086 3803
3087############################################################################# 3804#############################################################################
3088 3805
3806package CFPlus::UI::Selector;
3807
3808use utf8;
3809
3810our @ISA = CFPlus::UI::Button::;
3811
3812sub new {
3813 my $class = shift;
3814
3815 my $self = $class->SUPER::new (
3816 options => [], # [value, title, longdesc], ...
3817 value => undef,
3818 @_,
3819 );
3820
3821 $self->_set_value ($self->{value});
3822
3823 $self
3824}
3825
3826sub invoke_button_down {
3827 my ($self, $ev) = @_;
3828
3829 my @menu_items;
3830
3831 for (@{ $self->{options} }) {
3832 my ($value, $title, $tooltip) = @$_;
3833
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 }
3836
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838}
3839
3840sub _set_value {
3841 my ($self, $value) = @_;
3842
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3844 or return;
3845
3846 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]);
3849}
3850
3851sub set_value {
3852 my ($self, $value) = @_;
3853
3854 return unless $self->{value} ne $value;
3855
3856 $self->_set_value ($value);
3857 $self->emit (changed => $value);
3858}
3859
3860#############################################################################
3861
3089package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3090 3863
3091our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3092 3865
3093sub new { 3866sub new {
3094 my $class = shift; 3867 my $class = shift;
3095 3868
3096 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 3870 fontsize => 0.8,
3098 @_, 3871 @_,
3099 ); 3872 );
3100 3873
3101 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3102 3875
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104 3877
3105 $self 3878 $self
3106} 3879}
… …
3108sub reorder { 3881sub reorder {
3109 my ($self) = @_; 3882 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3111 3884
3112 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3116 3889
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3892 }
… …
3140 for ($short) { 3913 for ($short) {
3141 s/^\s+//; 3914 s/^\s+//;
3142 s/\s+/ /g; 3915 s/\s+/ /g;
3143 } 3916 }
3144 3917
3145 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3146 markup => $short, 3919 markup => $short,
3147 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3961 $item->{count}++;
3189 } else { 3962 } else {
3190 $item->{count} = 1; 3963 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
3192 } 3965 }
3193 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3968 delete $item->{label};
3196 } else { 3969 } else {
3197 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
3204 count => 1, 3977 count => 1,
3205 %arg, 3978 %arg,
3206 }; 3979 };
3207 } 3980 }
3208 3981
3982 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3983 $self->reorder;
3984 });
3210} 3985}
3211 3986
3212sub reconfigure { 3987sub reconfigure {
3213 my ($self) = @_; 3988 my ($self) = @_;
3214 3989
… …
3217 3992
3218 $self->reorder; 3993 $self->reorder;
3219 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
3220} 3995}
3221 3996
3222sub DESTROY { 3997sub destroy {
3223 my ($self) = @_; 3998 my ($self) = @_;
3224 3999
3225 $self->{timer}->cancel; 4000 $self->{timer}->cancel;
3226 4001
3227 $self->SUPER::DESTROY; 4002 $self->SUPER::destroy;
3228} 4003}
3229 4004
3230############################################################################# 4005#############################################################################
3231 4006
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; 4007package CFPlus::UI::Root;
3528 4008
3529our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3530 4010
3531use List::Util qw(min max); 4011use List::Util qw(min max);
3532 4012
3533use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3534 4014
3535sub new { 4015sub new {
3536 my $class = shift; 4016 my $class = shift;
3537 4017
3538 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3539 visible => 1, 4019 visible => 1,
3540 @_, 4020 @_,
3541 ); 4021 );
3542 4022
3543 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3544 4024
3545 $self 4025 $self
3546} 4026}
3547 4027
3548sub size_request { 4028sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 4043 $coord = $max - $size if $coord > $max - $size;
3564 4044
3565 int $coord + 0.5 4045 int $coord + 0.5
3566} 4046}
3567 4047
3568sub size_allocate { 4048sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
3570 4050
3571 for my $child ($self->children) { 4051 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 4053
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 4057 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 4058 $Y = _to_pixel $Y, $H, $self->{h};
3579 4059
3580 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
3581 } 4061 }
4062
4063 1
3582} 4064}
3583 4065
3584sub coord2local { 4066sub coord2local {
3585 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3586 4068
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4195
3714 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3716 4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
3717 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
3719 4210
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4212 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4237 glLoadIdentity;
3747 4238
3748 { 4239 {
3749 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3750 4241
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4244
3755 $self->_draw; 4245 $self->_draw;
4246 }
3756} 4247}
3757 4248
3758############################################################################# 4249#############################################################################
3759 4250
3760package CFClient::UI; 4251package CFPlus::UI;
3761 4252
3762$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4255
37651 42561
3766 4257

Diff Legend

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