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

Diff Legend

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