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

Diff Legend

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