ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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