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.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.406 by root, Sat Jul 21 23:17:35 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 add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1361 } 1721 }
1362
1363 $y += $row_h;
1364 } 1722 }
1365 1723
1366} 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1367 1726
1368sub find_widget { 1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1369 my ($self, $x, $y) = @_; 1749 my ($self, $W, $H) = @_;
1370 1750
1371 $x -= $self->{x}; 1751 for my $child ($self->visible_children) {
1372 $y -= $self->{y}; 1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1373 1753
1374 my $res; 1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1375 1758
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1759 $child->configure ($x, $y, $w, $h);
1377 $res = $_->find_widget ($x, $y) 1760 }
1378 and return $res; 1761
1379 } 1762 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} 1763}
1391 1764
1392############################################################################# 1765#############################################################################
1393 1766
1394package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1395 1768
1396our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1397 1770
1398sub size_request { 1771sub size_request {
1399 my ($self) = @_; 1772 my ($self) = @_;
1400 1773
1401 $self->{vertical} 1774 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1781 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1782 )
1410} 1783}
1411 1784
1412sub size_allocate { 1785sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1786 my ($self, $w, $h) = @_;
1414 1787
1415 my $space = $self->{vertical} ? $h : $w; 1788 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1789 my @children = $self->visible_children;
1417 1790
1418 my @req; 1791 my @req;
1419 1792
1420 if ($self->{homogeneous}) { 1793 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1794 @req = ($space / (@children || 1)) x @children;
1422 } else { 1795 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1796 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1797 my $req = List::Util::sum @req;
1425 1798
1426 if ($req > $space) { 1799 if ($req > $space) {
1427 # ah well, not enough space 1800 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1801 $_ *= $space / $req for @req;
1429 } else { 1802 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1803 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1804
1432 $space = ($space - $req) / $expand; # remaining space to give away 1805 $space = ($space - $req) / $expand; # remaining space to give away
1433 1806
1434 $req[$_] += $space * $children->[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1808 for 0 .. $#children;
1436 } 1809 }
1437 } 1810 }
1438 1811
1439 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1440 1813
1441 my $pos = 0; 1814 my $pos = 0;
1442 for (0 .. $#$children) { 1815 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1818
1446 $pos += $alloc; 1819 $pos += $alloc;
1447 } 1820 }
1448 1821
1449 1 1822 1
1450} 1823}
1451 1824
1452############################################################################# 1825#############################################################################
1453 1826
1454package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1455 1828
1456our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1457 1830
1458sub new { 1831sub new {
1459 my $class = shift; 1832 my $class = shift;
1460 1833
1461 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1464 ) 1837 )
1465} 1838}
1466 1839
1467############################################################################# 1840#############################################################################
1468 1841
1469package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1470 1843
1471our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1472 1845
1473sub new { 1846sub new {
1474 my $class = shift; 1847 my $class = shift;
1475 1848
1476 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1479 ) 1852 )
1480} 1853}
1481 1854
1482############################################################################# 1855#############################################################################
1483 1856
1484package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1485 1858
1486our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1487 1860
1488use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1489 1862
1490sub new { 1863sub new {
1491 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1492 1865
1493 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1869 #active_bg => none
1497 #font => default_font 1870 #font => default_font
1498 #text => initial text 1871 #text => initial text
1499 #markup => initial narkup 1872 #markup => initial narkup
1500 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1501 ellipsise => 3, # end 1875 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1877 fontsize => 1,
1504 align => -1, 1878 align => -1,
1505 valign => -1, 1879 valign => -1,
1506 padding_x => 2, 1880 padding_x => 2,
1507 padding_y => 2, 1881 padding_y => 2,
1508 can_events => 0, 1882 can_events => 0,
1509 %arg 1883 %arg
1510 ); 1884 );
1511 1885
1512 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1889 $self->{template} = $layout;
1516 } 1890 }
1517 1891
1518 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1522 } 1896 }
1523 1897
1524 $self 1898 $self
1525} 1899}
1526 1900
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1901sub update {
1538 my ($self) = @_; 1902 my ($self) = @_;
1539 1903
1540 delete $self->{texture}; 1904 delete $self->{texture};
1541 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1553 1917
1554 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1556 1920
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1922
1559 delete $self->{req_h}; 1923 delete $self->{size_req};
1560
1561 $self->realloc; 1924 $self->realloc;
1562 $self->update; 1925 $self->update;
1563} 1926}
1564 1927
1565sub set_markup { 1928sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1570 1933
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1935
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1937
1575 delete $self->{req_h}; 1938 delete $self->{size_req};
1576
1577 $self->realloc; 1939 $self->realloc;
1578 $self->update; 1940 $self->update;
1579} 1941}
1580 1942
1581sub size_request { 1943sub size_request {
1582 my ($self) = @_; 1944 my ($self) = @_;
1583 1945
1584 if (exists $self->{req_h}) { 1946 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1947 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1948 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1949 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1952
1593 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1594 1954
1595 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1959
1599 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1600 1961
1601 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1963 $h = List::Util::max $h, $h2;
1603 } 1964 }
1604 1965
1605 ($w, $h) 1966 [$w, $h]
1606 } 1967 };
1607}
1608 1968
1969 @{ $self->{size_req} }
1970}
1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1609sub size_allocate { 1976sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1611 1978
1612 delete $self->{ox}; 1979 delete $self->{ox};
1613 1980
1614 delete $self->{texture} 1981 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1982 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1983
1984 1
1616} 1985}
1617 1986
1618sub set_fontsize { 1987sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1620 1989
1621 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1622 delete $self->{texture}; 1992 delete $self->{texture};
1623 1993
1624 $self->realloc; 1994 $self->realloc;
1625} 1995}
1626 1996
1997sub reconfigure {
1998 my ($self) = @_;
1999
2000 delete $self->{size_req};
2001 delete $self->{texture};
2002
2003 $self->SUPER::reconfigure;
2004}
2005
1627sub _draw { 2006sub _draw {
1628 my ($self) = @_; 2007 my ($self) = @_;
1629 2008
1630 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1631 2010
1632 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2018
1640 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1641 }; 2020 };
1642 2021
1643 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1647 2026
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2030 };
1652 2031
1653 glEnable GL_TEXTURE_2D; 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1654
1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1663
1664 glDisable GL_TEXTURE_2D;
1665} 2033}
1666 2034
1667############################################################################# 2035#############################################################################
1668 2036
1669package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1670 2038
1671our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1672 2040
1673use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1674 2042
1675sub new { 2043sub new {
1676 my $class = shift; 2044 my $class = shift;
1677 2045
1678 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1682 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1683 can_hover => 1, 2051 can_hover => 1,
1684 can_focus => 1, 2052 can_focus => 1,
1685 valign => 0, 2053 valign => 0,
1686 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1687 #text => ... 2056 #text => ...
2057 #hidden => "*",
1688 @_ 2058 @_
1689 ) 2059 )
1690} 2060}
1691 2061
1692sub _set_text { 2062sub _set_text {
… …
1699 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1700 $self->{text} = $text; 2070 $self->{text} = $text;
1701 2071
1702 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1703 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h}; 2074 delete $self->{size_req};
1705 2075
1706 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
1707 2077
1708 $self->realloc; 2078 $self->realloc;
1709 $self->update; 2079 $self->update;
1710} 2080}
1711 2081
… …
1726 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1727 2097
1728 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1729} 2099}
1730 2100
1731sub key_down { 2101sub invoke_key_down {
1732 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1733 2103
1734 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1735 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1736 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1737 2107
1738 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1739 2111
1740 if ($uni == 8) { 2112 if ($uni == 8) {
1741 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1742 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1743 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1744 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1745 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1746 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1747 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1748 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1749 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1750 } elsif ($sym == CFClient::SDLK_END) {
1751 $self->{cursor} = length $text;
1752 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1753 $self->_emit ('escape'); 2136 $self->emit ('escape');
1754 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1755 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else { 2141 } else {
1757 return 0; 2142 return 0;
1758 } 2143 }
1759 2144
1760 $self->_set_text ($text); 2145 $self->_set_text ($text);
1761 2146
1762 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1763 2149
1764 1 2150 1
1765} 2151}
1766 2152
1767sub focus_in { 2153sub invoke_focus_in {
1768 my ($self) = @_; 2154 my ($self) = @_;
1769 2155
1770 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1771 2157
1772 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1773} 2159}
1774 2160
1775sub button_down { 2161sub invoke_button_down {
1776 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1777 2163
1778 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1779 2165
1780 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1781 2167
1782 # byte-index to char-index 2168 # byte-index to char-index
1783 my $text = $self->{text}; 2169 my $text = $self->{text};
1784 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1785 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1786 2172
1787 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1788 $self->update; 2174 $self->update;
1789 2175
1790 1 2176 1
1791} 2177}
1792 2178
1793sub mouse_motion { 2179sub invoke_mouse_motion {
1794 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796 2182
1797 0 2183 1
1798} 2184}
1799 2185
1800sub _draw { 2186sub _draw {
1801 my ($self) = @_; 2187 my ($self) = @_;
1802 2188
… …
1829 utf8::encode $text; 2215 utf8::encode $text;
1830 2216
1831 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1832 } 2218 }
1833 2219
1834 glColor @{$self->{fg}};
1835 glBegin GL_LINES; 2220 glBegin GL_LINES;
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1837 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1838 glEnd; 2223 glEnd;
1839 } 2224 }
1840} 2225}
1841 2226
2227#############################################################################
2228
1842package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1843 2230
1844our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1845 2232
1846use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1847 2234
1848sub key_down { 2235sub invoke_key_down {
1849 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1850 2237
1851 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1852 2239
1853 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1854 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1855 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1856 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1857 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1858 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1859 $self->update; 2247 $self->update;
1860 2248
1861 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1862 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1863 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1864 } 2252 }
1865 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1866 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1868 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1869 } 2257 }
1870 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1871 } 2259 }
1872 2260
1873 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1874 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1875 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1876 2264
1877 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1878 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1879 } else { 2267 } else {
1880 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1881 } 2269 }
1882 2270
1883 } else { 2271 } else {
1884 return $self->SUPER::key_down ($ev) 2272 return $self->SUPER::invoke_key_down ($ev)
1885 } 2273 }
1886 2274
1887 1 2275 1
1888} 2276}
1889 2277
1890############################################################################# 2278#############################################################################
1891 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1892package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1893 2320
1894our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1895 2322
1896use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1897 2324
1898my @tex = 2325my @tex =
1899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1900 qw(b1_button_active.png); 2327 qw(b1_button_inactive.png b1_button_active.png);
1901 2328
1902sub new { 2329sub new {
1903 my $class = shift; 2330 my $class = shift;
1904 2331
1905 $class->SUPER::new ( 2332 $class->SUPER::new (
1906 padding_x => 4, 2333 padding_x => 4,
1907 padding_y => 4, 2334 padding_y => 4,
1908 fg => [1, 1, 1], 2335 fg => [1.0, 1.0, 1.0],
1909 active_fg => [0, 0, 1], 2336 active_fg => [0.8, 0.8, 0.8],
1910 can_hover => 1, 2337 can_hover => 1,
1911 align => 0, 2338 align => 0,
1912 valign => 0, 2339 valign => 0,
1913 can_events => 1, 2340 can_events => 1,
1914 @_ 2341 @_
1915 ) 2342 )
1916} 2343}
1917 2344
1918sub activate { }
1919
1920sub button_up { 2345sub invoke_button_up {
1921 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1922 2347
1923 $self->emit ("activate") 2348 $self->emit ("activate")
1924 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1925 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
… …
1934 2359
1935 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1937 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1938 2363
2364 my $tex = $tex[$GRAB == $self];
1939 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2365 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1940 2366
1941 glDisable GL_TEXTURE_2D; 2367 glDisable GL_TEXTURE_2D;
1942 2368
1943 $self->SUPER::_draw; 2369 $self->SUPER::_draw;
1944} 2370}
1945 2371
1946############################################################################# 2372#############################################################################
1947 2373
1948package CFClient::UI::CheckBox; 2374package CFPlus::UI::CheckBox;
1949 2375
1950our @ISA = CFClient::UI::DrawBG::; 2376our @ISA = CFPlus::UI::DrawBG::;
1951 2377
1952my @tex = 2378my @tex =
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1954 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2380 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1955 2381
1956use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1957 2383
1958sub new { 2384sub new {
1959 my $class = shift; 2385 my $class = shift;
1960 2386
1961 $class->SUPER::new ( 2387 $class->SUPER::new (
… …
1975 my ($self) = @_; 2401 my ($self) = @_;
1976 2402
1977 (6) x 2 2403 (6) x 2
1978} 2404}
1979 2405
2406sub toggle {
2407 my ($self) = @_;
2408
2409 $self->{state} = !$self->{state};
2410 $self->emit (changed => $self->{state});
2411 $self->update;
2412}
2413
1980sub button_down { 2414sub invoke_button_down {
1981 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
1982 2416
1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2417 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2418 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1985 $self->{state} = !$self->{state}; 2419 $self->toggle;
1986 $self->_emit (changed => $self->{state});
1987 } else { 2420 } else {
1988 return 0 2421 return 0
1989 } 2422 }
1990 2423
1991 1 2424 1
… …
2011 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2012} 2445}
2013 2446
2014############################################################################# 2447#############################################################################
2015 2448
2016package CFClient::UI::Image; 2449package CFPlus::UI::Image;
2017 2450
2018our @ISA = CFClient::UI::Base::; 2451our @ISA = CFPlus::UI::Base::;
2019 2452
2020use CFClient::OpenGL; 2453use CFPlus::OpenGL;
2021use Carp qw/confess/;
2022 2454
2023our %loaded_images; 2455our %texture_cache;
2024 2456
2025sub new { 2457sub new {
2026 my $class = shift; 2458 my $class = shift;
2027 2459
2028 my $self = $class->SUPER::new (can_events => 0, @_); 2460 my $self = $class->SUPER::new (
2461 can_events => 0,
2462 @_,
2463 );
2029 2464
2030 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2465 $self->{path} || $self->{tex}
2466 or Carp::croak "'path' or 'tex' attributes required";
2031 2467
2032 $loaded_images{$self->{image}} ||= 2468 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2033 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2469 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2034 2470
2035 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2471 CFPlus::weaken $texture_cache{$self->{path}};
2036 2472
2037 Scalar::Util::weaken $loaded_images{$self->{image}}; 2473 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2038
2039 $self->{aspect} = $tex->{w} / $tex->{h};
2040 2474
2041 $self 2475 $self
2042} 2476}
2043 2477
2478sub STORABLE_freeze {
2479 my ($self, $cloning) = @_;
2480
2481 $self->{path}
2482 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2483
2484 $self->{path}
2485}
2486
2487sub STORABLE_attach {
2488 my ($self, $cloning, $path) = @_;
2489
2490 $self->new (path => $path)
2491}
2492
2044sub size_request { 2493sub size_request {
2045 my ($self) = @_; 2494 my ($self) = @_;
2046 2495
2047 ($self->{tex}->{w}, $self->{tex}->{h}) 2496 ($self->{tex}{w}, $self->{tex}{h})
2048} 2497}
2049 2498
2050sub _draw { 2499sub _draw {
2051 my ($self) = @_; 2500 my ($self) = @_;
2052 2501
… …
2062 } 2511 }
2063 2512
2064 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2515
2067 $tex->draw_quad_alpha (0, 0, $w, $h); 2516 $tex->draw_quad (0, 0, $w, $h);
2068 2517
2069 glDisable GL_TEXTURE_2D; 2518 glDisable GL_TEXTURE_2D;
2070} 2519}
2071 2520
2072############################################################################# 2521#############################################################################
2073 2522
2523package CFPlus::UI::ImageButton;
2524
2525our @ISA = CFPlus::UI::Image::;
2526
2527use CFPlus::OpenGL;
2528
2529my %textures;
2530
2531sub new {
2532 my $class = shift;
2533
2534 my $self = $class->SUPER::new (
2535 padding_x => 4,
2536 padding_y => 4,
2537 fg => [1, 1, 1],
2538 active_fg => [0, 0, 1],
2539 can_hover => 1,
2540 align => 0,
2541 valign => 0,
2542 can_events => 1,
2543 @_
2544 );
2545}
2546
2547sub invoke_button_up {
2548 my ($self, $ev, $x, $y) = @_;
2549
2550 $self->emit ("activate")
2551 if $x >= 0 && $x < $self->{w}
2552 && $y >= 0 && $y < $self->{h};
2553
2554 1
2555}
2556
2557#############################################################################
2558
2074package CFClient::UI::VGauge; 2559package CFPlus::UI::VGauge;
2075 2560
2076our @ISA = CFClient::UI::Base::; 2561our @ISA = CFPlus::UI::Base::;
2077 2562
2078use List::Util qw(min max); 2563use List::Util qw(min max);
2079 2564
2080use CFClient::OpenGL; 2565use CFPlus::OpenGL;
2081 2566
2082my %tex = ( 2567my %tex = (
2083 food => [ 2568 food => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2569 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2570 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2086 ], 2571 ],
2087 grace => [ 2572 grace => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2573 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2574 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2090 ], 2575 ],
2091 hp => [ 2576 hp => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2578 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2094 ], 2579 ],
2095 mana => [ 2580 mana => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2582 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2098 ], 2583 ],
2099); 2584);
2100 2585
2101# eg. VGauge->new (gauge => 'food'), default gauge: food 2586# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2161 my $ycut1 = max 0, min 1, $ycut; 2646 my $ycut1 = max 0, min 1, $ycut;
2162 my $ycut2 = max 0, min 1, $ycut - 1; 2647 my $ycut2 = max 0, min 1, $ycut - 1;
2163 2648
2164 my $h1 = $self->{h} * (1 - $ycut1); 2649 my $h1 = $self->{h} * (1 - $ycut1);
2165 my $h2 = $self->{h} * (1 - $ycut2); 2650 my $h2 = $self->{h} * (1 - $ycut2);
2651 my $h3 = $self->{h};
2652
2653 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2166 2654
2167 glEnable GL_BLEND; 2655 glEnable GL_BLEND;
2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2656 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2657 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
… …
2189 2677
2190 if ($t3) { 2678 if ($t3) {
2191 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2679 glBindTexture GL_TEXTURE_2D, $t3->{name};
2192 glBegin GL_QUADS; 2680 glBegin GL_QUADS;
2193 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2681 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2194 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2682 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2195 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2683 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2196 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2684 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2197 glEnd; 2685 glEnd;
2198 } 2686 }
2199 2687
2200 glDisable GL_BLEND; 2688 glDisable GL_BLEND;
2201 glDisable GL_TEXTURE_2D; 2689 glDisable GL_TEXTURE_2D;
2202} 2690}
2203 2691
2204############################################################################# 2692#############################################################################
2205 2693
2206package CFClient::UI::Gauge; 2694package CFPlus::UI::Gauge;
2207 2695
2208our @ISA = CFClient::UI::VBox::; 2696our @ISA = CFPlus::UI::VBox::;
2209 2697
2210sub new { 2698sub new {
2211 my ($class, %arg) = @_; 2699 my ($class, %arg) = @_;
2212 2700
2213 my $self = $class->SUPER::new ( 2701 my $self = $class->SUPER::new (
… …
2215 can_hover => 1, 2703 can_hover => 1,
2216 can_events => 1, 2704 can_events => 1,
2217 %arg, 2705 %arg,
2218 ); 2706 );
2219 2707
2220 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2708 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2221 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2709 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2222 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2710 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2223 2711
2224 $self 2712 $self
2225} 2713}
2226 2714
2227sub set_fontsize { 2715sub set_fontsize {
… …
2248 $self->{value}->set_text ($val); 2736 $self->{value}->set_text ($val);
2249} 2737}
2250 2738
2251############################################################################# 2739#############################################################################
2252 2740
2253package CFClient::UI::Slider; 2741package CFPlus::UI::Slider;
2254 2742
2255use strict; 2743use strict;
2256 2744
2257use CFClient::OpenGL; 2745use CFPlus::OpenGL;
2258 2746
2259our @ISA = CFClient::UI::DrawBG::; 2747our @ISA = CFPlus::UI::DrawBG::;
2260 2748
2261my @tex = 2749my @tex =
2262 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2750 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2263 qw(s1_slider.png s1_slider_bg.png); 2751 qw(s1_slider.png s1_slider_bg.png);
2264 2752
2265sub new { 2753sub new {
2266 my $class = shift; 2754 my $class = shift;
2267 2755
… …
2288 $self->update; 2776 $self->update;
2289 2777
2290 $self 2778 $self
2291} 2779}
2292 2780
2293sub changed { }
2294
2295sub set_range { 2781sub set_range {
2296 my ($self, $range) = @_; 2782 my ($self, $range) = @_;
2297 2783
2298 ($range, $self->{range}) = ($self->{range}, $range); 2784 ($range, $self->{range}) = ($self->{range}, $range);
2299 2785
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}"; 2786 if ("@$range" ne "@{$self->{range}}") {
2787 $self->update;
2788 $self->set_value ($self->{range}[0]);
2789 }
2302} 2790}
2303 2791
2304sub set_value { 2792sub set_value {
2305 my ($self, $value) = @_; 2793 my ($self, $value) = @_;
2306 2794
… …
2317 if $unit; 2805 if $unit;
2318 2806
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2807 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320 2808
2321 if ($value != $old_value) { 2809 if ($value != $old_value) {
2322 $self->_emit (changed => $value); 2810 $self->emit (changed => $value);
2323 $self->update; 2811 $self->update;
2324 } 2812 }
2325} 2813}
2326 2814
2327sub size_request { 2815sub size_request {
2328 my ($self) = @_; 2816 my ($self) = @_;
2329 2817
2330 ($self->{req_w}, $self->{req_h}) 2818 ($self->{req_w}, $self->{req_h})
2331} 2819}
2332 2820
2333sub button_down { 2821sub invoke_button_down {
2334 my ($self, $ev, $x, $y) = @_; 2822 my ($self, $ev, $x, $y) = @_;
2335 2823
2336 $self->SUPER::button_down ($ev, $x, $y); 2824 $self->SUPER::invoke_button_down ($ev, $x, $y);
2337 2825
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2826 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339 2827
2340 $self->mouse_motion ($ev, $x, $y) 2828 $self->invoke_mouse_motion ($ev, $x, $y)
2341} 2829}
2342 2830
2343sub mouse_motion { 2831sub invoke_mouse_motion {
2344 my ($self, $ev, $x, $y) = @_; 2832 my ($self, $ev, $x, $y) = @_;
2345 2833
2346 if ($GRAB == $self) { 2834 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2835 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348 2836
… …
2354 } else { 2842 } else {
2355 return 0; 2843 return 0;
2356 } 2844 }
2357 2845
2358 1 2846 1
2847}
2848
2849sub invoke_mouse_wheel {
2850 my ($self, $ev) = @_;
2851
2852 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2853
2854 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2855
2856 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857
2858 ! ! $delta
2359} 2859}
2360 2860
2361sub update { 2861sub update {
2362 my ($self) = @_; 2862 my ($self) = @_;
2363 2863
… …
2412 glDisable GL_TEXTURE_2D; 2912 glDisable GL_TEXTURE_2D;
2413} 2913}
2414 2914
2415############################################################################# 2915#############################################################################
2416 2916
2417package CFClient::UI::ValSlider; 2917package CFPlus::UI::ValSlider;
2418 2918
2419our @ISA = CFClient::UI::HBox::; 2919our @ISA = CFPlus::UI::HBox::;
2420 2920
2421sub new { 2921sub new {
2422 my ($class, %arg) = @_; 2922 my ($class, %arg) = @_;
2423 2923
2424 my $range = delete $arg{range}; 2924 my $range = delete $arg{range};
2425 2925
2426 my $self = $class->SUPER::new ( 2926 my $self = $class->SUPER::new (
2427 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2927 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2428 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2928 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2429 to_value => sub { shift }, 2929 to_value => sub { shift },
2430 from_value => sub { shift }, 2930 from_value => sub { shift },
2431 %arg, 2931 %arg,
2432 ); 2932 );
2433 2933
… …
2453sub set_range { shift->{slider}->set_range (@_) } 2953sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) } 2954sub set_value { shift->{slider}->set_value (@_) }
2455 2955
2456############################################################################# 2956#############################################################################
2457 2957
2458package CFClient::UI::TextView; 2958package CFPlus::UI::TextScroller;
2459 2959
2460our @ISA = CFClient::UI::HBox::; 2960our @ISA = CFPlus::UI::HBox::;
2461 2961
2462use CFClient::OpenGL; 2962use CFPlus::OpenGL;
2463 2963
2464sub new { 2964sub new {
2465 my $class = shift; 2965 my $class = shift;
2466 2966
2467 my $self = $class->SUPER::new ( 2967 my $self = $class->SUPER::new (
2468 fontsize => 1, 2968 fontsize => 1,
2469 can_events => 0, 2969 can_events => 1,
2970 indent => 0,
2470 #font => default_font 2971 #font => default_font
2471 @_, 2972 @_,
2472 2973
2473 layout => (new CFClient::Layout 1), 2974 layout => (new CFPlus::Layout),
2474 par => [], 2975 par => [],
2976 max_par => 0,
2475 height => 0, 2977 height => 0,
2476 children => [ 2978 children => [
2477 (new CFClient::UI::Empty expand => 1), 2979 (new CFPlus::UI::Empty expand => 1),
2478 (new CFClient::UI::Slider vertical => 1), 2980 (new CFPlus::UI::Slider vertical => 1),
2479 ], 2981 ],
2480 ); 2982 );
2481 2983
2482 $self->{children}[1]->connect (changed => sub { $self->update }); 2984 $self->{children}[1]->connect (changed => sub { $self->update });
2483 2985
… …
2489 2991
2490 $self->{fontsize} = $fontsize; 2992 $self->{fontsize} = $fontsize;
2491 $self->reflow; 2993 $self->reflow;
2492} 2994}
2493 2995
2996sub size_request {
2997 my ($self) = @_;
2998
2999 my ($empty, $slider) = @{ $self->{children} };
3000
3001 local $self->{children} = [$empty, $slider];
3002 $self->SUPER::size_request
3003}
3004
2494sub size_allocate { 3005sub invoke_size_allocate {
2495 my ($self, $w, $h) = @_; 3006 my ($self, $w, $h) = @_;
2496 3007
2497 $self->SUPER::size_allocate ($w, $h); 3008 my ($empty, $slider, @other) = @{ $self->{children} };
3009 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2498 3010
2499 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3011 $self->{layout}->set_font ($self->{font}) if $self->{font};
2500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3012 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $self->{layout}->set_width ($self->{children}[0]{w}); 3013 $self->{layout}->set_width ($empty->{w});
3014 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 3015
2503 $self->reflow; 3016 $self->reflow;
2504}
2505 3017
2506sub text_size { 3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::invoke_size_allocate ($w, $h)
3020}
3021
3022sub invoke_mouse_wheel {
2507 my ($self, $text, $indent) = @_; 3023 my ($self, $ev) = @_;
3024
3025 return 0 unless $ev->{dy}; # only vertical movements
3026
3027 $self->{children}[1]->emit (mouse_wheel => $ev);
3028
3029 1
3030}
3031
3032sub get_layout {
3033 my ($self, $para) = @_;
2508 3034
2509 my $layout = $self->{layout}; 3035 my $layout = $self->{layout};
2510 3036
3037 $layout->set_font ($self->{font}) if $self->{font};
3038 $layout->set_foreground (@{$para->{fg}});
2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3039 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512 $layout->set_width ($self->{children}[0]{w} - $indent); 3040 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3041 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 $layout->set_markup ($text); 3042 $layout->set_markup ($para->{markup});
3043
3044 $layout->set_shapes (
3045 map
3046 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3047 @{$para->{widget}}
2514 3048 );
3049
2515 $layout->size 3050 $layout
2516} 3051}
2517 3052
2518sub reflow { 3053sub reflow {
2519 my ($self) = @_; 3054 my ($self) = @_;
2520 3055
… …
2527 3062
2528 # todo: base offset on lines or so, not on pixels 3063 # todo: base offset on lines or so, not on pixels
2529 $self->{children}[1]->set_value ($offset); 3064 $self->{children}[1]->set_value ($offset);
2530} 3065}
2531 3066
3067sub current_paragraph {
3068 my ($self) = @_;
3069
3070 $self->{top_paragraph} - 1
3071}
3072
3073sub scroll_to {
3074 my ($self, $para) = @_;
3075
3076 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3077
3078 $self->{scroll_to} = $para;
3079 $self->update;
3080}
3081
2532sub clear { 3082sub clear {
2533 my ($self) = @_; 3083 my ($self) = @_;
3084
3085 my (undef, undef, @other) = @{ $self->{children} };
3086 $self->remove ($_) for @other;
2534 3087
2535 $self->{par} = []; 3088 $self->{par} = [];
2536 $self->{height} = 0; 3089 $self->{height} = 0;
2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3090 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2538} 3091}
2539 3092
2540sub add_paragraph { 3093sub add_paragraph {
2541 my ($self, $color, $text, $indent) = @_; 3094 my $self = shift;
2542 3095
2543 for my $line (split /\n/, $text) { 3096 for my $para (@_) {
2544 my ($w, $h) = $self->text_size ($line); 3097 $para = {
3098 fg => [1, 1, 1, 1],
3099 indent => 0,
3100 markup => "",
3101 widget => [],
3102 ref $para ? %$para : (markup => $para),
3103 w => 1e10,
3104 wrapped => 1,
3105 };
3106
3107 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3108 push @{$self->{par}}, $para;
3109 }
3110
3111 if (my $max = $self->{max_par}) {
3112 shift @{$self->{par}} while @{$self->{par}} > $max;
3113 }
3114
3115 $self->{need_reflow}++;
3116 $self->update;
3117}
3118
3119sub scroll_to_bottom {
3120 my ($self) = @_;
3121
3122 $self->{scroll_to} = $#{$self->{par}};
3123 $self->update;
3124}
3125
3126sub force_uptodate {
3127 my ($self) = @_;
3128
3129 if (delete $self->{need_reflow}) {
3130 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3131
3132 my $height = 0;
3133
3134 for my $para (@{$self->{par}}) {
3135 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3136 my $layout = $self->get_layout ($para);
3137 my ($w, $h) = $layout->size;
3138
3139 $para->{w} = $w + $para->{indent};
3140 $para->{h} = $h;
3141 $para->{wrapped} = $layout->has_wrapped;
3142 }
3143
3144 $para->{y} = $height;
3145 $height += $para->{h};
3146 }
3147
2545 $self->{height} += $h; 3148 $self->{height} = $height;
2546 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3149 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2547 }
2548 3150
2549 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3151 delete $self->{texture};
3152 }
3153
3154 if (my $paridx = delete $self->{scroll_to}) {
3155 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3156 }
2550} 3157}
2551 3158
2552sub update { 3159sub update {
2553 my ($self) = @_; 3160 my ($self) = @_;
2554 3161
… …
2556 3163
2557 return unless $self->{h} > 0; 3164 return unless $self->{h} > 0;
2558 3165
2559 delete $self->{texture}; 3166 delete $self->{texture};
2560 3167
2561 $ROOT->on_post_alloc ($self, sub { 3168 $ROOT->on_post_alloc ($self => sub {
3169 $self->force_uptodate;
3170
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3171 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563 3172
2564 if (delete $self->{need_reflow}) {
2565 my $height = 0;
2566
2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
2571 for (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573 $layout->set_width ($W - $_->[3]);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3];
2577 $_->[1] = $h;
2578 }
2579
2580 $height += $_->[1];
2581 }
2582
2583 $self->{height} = $height;
2584
2585 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2586
2587 delete $self->{texture};
2588 }
2589
2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3173 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2591 glClearColor 0, 0, 0, 0; 3174 glClearColor 0, 0, 0, 0;
2592 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2593 3176
3177 package CFPlus::UI::Base;
3178 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3179 (0, 0, $self->{w}, $self->{h});
3180
3181 my $top = int $self->{children}[1]{range}[0];
3182
3183 my $paridx = 0;
3184 my $top_paragraph;
2594 my $top = int $self->{children}[1]{range}[0]; 3185 my $top = int $self->{children}[1]{range}[0];
2595 3186
2596 my $y0 = $top; 3187 my $y0 = $top;
2597 my $y1 = $top + $H; 3188 my $y1 = $top + $H;
2598 3189
2599 my $y = 0;
2600
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2608
2609 for my $par (@{$self->{par}}) { 3190 for my $para (@{$self->{par}}) {
2610 my $h = $par->[1]; 3191 my $h = $para->{h};
3192 my $y = $para->{y};
2611 3193
2612 if ($y0 < $y + $h && $y < $y1) { 3194 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] }); 3195 my $layout = $self->get_layout ($para);
2614 $layout->set_width ($W - $par->[3]);
2615 $layout->set_markup ($par->[4]);
2616 3196
2617 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3197 $layout->render ($para->{indent}, $y - $y0);
2618 3198
2619 glRasterPos $par->[3], $y - $y0; 3199 if (my @w = @{ $para->{widget} }) {
2620 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3200 my @s = $layout->get_shapes;
3201
3202 for (@w) {
3203 my ($dx, $dy) = splice @s, 0, 2, ();
3204
3205 $_->{x} = $dx + $para->{indent};
3206 $_->{y} = $dy + $y - $y0;
3207
3208 $_->draw;
3209 }
3210 }
2621 } 3211 }
2622 3212
2623 $y += $h; 3213 $paridx++;
3214 $top_paragraph ||= $paridx if $y >= $top;
2624 } 3215 }
2625 3216
2626 glDisable GL_BLEND; 3217 $self->{top_paragraph} = $top_paragraph;
2627 }; 3218 };
2628 }); 3219 });
3220}
3221
3222sub reconfigure {
3223 my ($self) = @_;
3224
3225 $self->SUPER::reconfigure;
3226
3227 $_->{w} = 1e10 for @{ $self->{par} };
3228 $self->reflow;
2629} 3229}
2630 3230
2631sub _draw { 3231sub _draw {
2632 my ($self) = @_; 3232 my ($self) = @_;
2633 3233
… …
2636 glColor 0, 0, 0, 1; 3236 glColor 0, 0, 0, 1;
2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3237 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2638 glDisable GL_TEXTURE_2D; 3238 glDisable GL_TEXTURE_2D;
2639 3239
2640 $self->{children}[1]->draw; 3240 $self->{children}[1]->draw;
2641
2642} 3241}
2643 3242
2644############################################################################# 3243#############################################################################
2645 3244
2646package CFClient::UI::Animator; 3245package CFPlus::UI::Animator;
2647 3246
2648use CFClient::OpenGL; 3247use CFPlus::OpenGL;
2649 3248
2650our @ISA = CFClient::UI::Bin::; 3249our @ISA = CFPlus::UI::Bin::;
2651 3250
2652sub moveto { 3251sub moveto {
2653 my ($self, $x, $y) = @_; 3252 my ($self, $x, $y) = @_;
2654 3253
2655 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3254 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2683 glPopMatrix; 3282 glPopMatrix;
2684} 3283}
2685 3284
2686############################################################################# 3285#############################################################################
2687 3286
2688package CFClient::UI::Flopper; 3287package CFPlus::UI::Flopper;
2689 3288
2690our @ISA = CFClient::UI::Button::; 3289our @ISA = CFPlus::UI::Button::;
2691 3290
2692sub new { 3291sub new {
2693 my $class = shift; 3292 my $class = shift;
2694 3293
2695 my $self = $class->SUPER::new ( 3294 my $self = $class->SUPER::new (
… …
2707 $self->{other}->toggle_visibility; 3306 $self->{other}->toggle_visibility;
2708} 3307}
2709 3308
2710############################################################################# 3309#############################################################################
2711 3310
2712package CFClient::UI::Tooltip; 3311package CFPlus::UI::Tooltip;
2713 3312
2714our @ISA = CFClient::UI::Bin::; 3313our @ISA = CFPlus::UI::Bin::;
2715 3314
2716use CFClient::OpenGL; 3315use CFPlus::OpenGL;
2717 3316
2718sub new { 3317sub new {
2719 my $class = shift; 3318 my $class = shift;
2720 3319
2721 $class->SUPER::new ( 3320 $class->SUPER::new (
… …
2724 ) 3323 )
2725} 3324}
2726 3325
2727sub set_tooltip_from { 3326sub set_tooltip_from {
2728 my ($self, $widget) = @_; 3327 my ($self, $widget) = @_;
3328
3329 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3330 if $widget->{tooltip} =~ /^#(.*)$/;
2729 3331
2730 my $tooltip = $widget->{tooltip}; 3332 my $tooltip = $widget->{tooltip};
2731 3333
2732 if ($ENV{CFPLUS_DEBUG} & 2) { 3334 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n" 3335 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3336 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n" 3337 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}"; 3338 . "visible $widget->{visible}";
2737 } 3339 }
2738 3340
3341 $tooltip =~ s/^\n+//;
3342 $tooltip =~ s/\n+$//;
3343
2739 $self->add (new CFClient::UI::Label 3344 $self->add (new CFPlus::UI::Label
2740 markup => $tooltip, 3345 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3346 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8, 3347 fontsize => 0.8,
2743 fg => [0, 0, 0, 1], 3348 style => 1, # FLAG_INVERSE
2744 ellipsise => 0, 3349 ellipsise => 0,
2745 font => ($widget->{tooltip_font} || $::FONT_PROP), 3350 font => ($widget->{tooltip_font} || $::FONT_PROP),
2746 ); 3351 );
2747} 3352}
2748 3353
… …
2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3357 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2753 3358
2754 ($w + 4, $h + 4) 3359 ($w + 4, $h + 4)
2755} 3360}
2756 3361
2757sub size_allocate { 3362sub invoke_size_allocate {
2758 my ($self, $w, $h) = @_; 3363 my ($self, $w, $h) = @_;
2759 3364
2760 $self->SUPER::size_allocate ($w - 4, $h - 4); 3365 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2761} 3366}
2762 3367
2763sub visibility_change { 3368sub invoke_visibility_change {
2764 my ($self, $visible) = @_; 3369 my ($self, $visible) = @_;
2765 3370
2766 return unless $visible; 3371 return unless $visible;
2767 3372
2768 $self->{root}->on_post_alloc ("move_$self" => sub { 3373 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner} 3374 my $widget = $self->{owner}
2770 or return; 3375 or return;
2771 3376
3377 if ($widget->{visible}) {
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3378 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773 3379
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3380 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH; 3381 if $x + $self->{w} > $self->{root}{w};
2776 3382
2777 $self->move_abs ($x, $y); 3383 $self->move_abs ($x, $y);
3384 } else {
3385 $self->hide;
3386 }
2778 }); 3387 });
2779} 3388}
2780 3389
2781sub _draw { 3390sub _draw {
2782 my ($self) = @_; 3391 my ($self) = @_;
… …
2806 $self->SUPER::_draw; 3415 $self->SUPER::_draw;
2807} 3416}
2808 3417
2809############################################################################# 3418#############################################################################
2810 3419
2811package CFClient::UI::Face; 3420package CFPlus::UI::Face;
2812 3421
2813our @ISA = CFClient::UI::Base::; 3422our @ISA = CFPlus::UI::DrawBG::;
2814 3423
2815use CFClient::OpenGL; 3424use CFPlus::OpenGL;
2816 3425
2817sub new { 3426sub new {
2818 my $class = shift; 3427 my $class = shift;
2819 3428
2820 my $self = $class->SUPER::new ( 3429 my $self = $class->SUPER::new (
3430 size_w => 32,
3431 size_h => 8,
2821 aspect => 1, 3432 aspect => 1,
2822 can_events => 0, 3433 can_events => 0,
2823 @_, 3434 @_,
2824 ); 3435 );
2825 3436
2826 if ($self->{anim} && $self->{animspeed}) { 3437 if ($self->{anim} && $self->{animspeed}) {
2827 Scalar::Util::weaken (my $widget = $self); 3438 CFPlus::weaken (my $widget = $self);
2828 3439
3440 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3441 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2829 $self->{timer} = Event->timer ( 3442 $self->{timer} = Event->timer (
2830 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2831 hard => 1, 3443 parked => 1,
2832 interval => $self->{animspeed},
2833 cb => sub { 3444 cb => sub {
3445 return unless $::CONN && $widget;
3446
2834 ++$widget->{frame}; 3447 ++$widget->{frame};
3448 $widget->update_face;
2835 $widget->update; 3449 $widget->update;
3450
3451 $widget->update_timer;
2836 }, 3452 },
2837 ); 3453 );
3454
3455 $self->update_face;
3456 $self->update_timer;
2838 } 3457 }
2839 3458
2840 $self 3459 $self
2841} 3460}
2842 3461
3462sub update_timer {
3463 my ($self) = @_;
3464
3465 return unless $self->{timer};
3466
3467 if ($self->{visible}) {
3468 $self->{timer}->at (
3469 $self->{anim_start}
3470 + $self->{animspeed}
3471 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3472 );
3473 $self->{timer}->start;
3474 } else {
3475 $self->{timer}->stop;
3476 }
3477}
3478
3479sub update_face {
3480 my ($self) = @_;
3481
3482 return unless $::CONN;
3483
3484 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3485 if ($anim && @$anim) {
3486 delete $self->{wait_face};
3487 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3488 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3489 }
3490 }
3491}
3492
2843sub size_request { 3493sub size_request {
2844 (32, 8) 3494 my ($self) = @_;
3495
3496 if ($::CONN) {
3497 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3498 if (my $tex = $::CONN->{texture}[$faceid]) {
3499 $self->{tex} = $tex;
3500 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3501 } else {
3502 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3503 $self->realloc;
3504 });
3505 }
3506 }
3507 }
3508
3509 ($self->{size_w} || 8, $self->{size_h} || 8)
2845} 3510}
2846 3511
2847sub update { 3512sub update {
2848 my ($self) = @_; 3513 my ($self) = @_;
2849 3514
2850 return unless $self->{visible}; 3515 return unless $self->{visible};
2851 3516
2852 $self->SUPER::update; 3517 $self->SUPER::update;
2853} 3518}
2854 3519
3520sub invoke_visibility_change {
3521 my ($self) = @_;
3522
3523 $self->update_timer;
3524
3525 0
3526}
3527
2855sub _draw { 3528sub _draw {
2856 my ($self) = @_; 3529 my ($self) = @_;
2857 3530
2858 return unless $::CONN; 3531 $self->SUPER::_draw;
2859 3532
2860 my $face; 3533 if (my $tex = $self->{tex}) {
2861
2862 if ($self->{frame}) {
2863 my $anim = $::CONN->{anim}[$self->{anim}];
2864
2865 $face = $anim->[ $self->{frame} % @$anim ]
2866 if $anim && @$anim;
2867 }
2868
2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2870
2871 if ($tex) {
2872 glEnable GL_TEXTURE_2D; 3534 glEnable GL_TEXTURE_2D;
2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2874 glColor 0, 0, 0, 1; 3536 glColor 0, 0, 0, 1;
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3537 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D; 3538 glDisable GL_TEXTURE_2D;
2877 } 3539 }
2878} 3540}
2879 3541
2880sub DESTROY { 3542sub destroy {
2881 my ($self) = @_; 3543 my ($self) = @_;
2882 3544
2883 $self->{timer}->cancel 3545 (delete $self->{timer})->cancel
2884 if $self->{timer}; 3546 if $self->{timer};
2885 3547
2886 $self->SUPER::DESTROY; 3548 $self->SUPER::destroy;
2887} 3549}
2888 3550
2889############################################################################# 3551#############################################################################
2890 3552
2891package CFClient::UI::Buttonbar; 3553package CFPlus::UI::Buttonbar;
2892 3554
2893our @ISA = CFClient::UI::HBox::; 3555our @ISA = CFPlus::UI::HBox::;
2894 3556
2895# TODO: should actualyl wrap buttons and other goodies. 3557# TODO: should actually wrap buttons and other goodies.
2896 3558
2897############################################################################# 3559#############################################################################
2898 3560
2899package CFClient::UI::Menu; 3561package CFPlus::UI::Menu;
2900 3562
2901our @ISA = CFClient::UI::FancyFrame::; 3563our @ISA = CFPlus::UI::Toplevel::;
2902 3564
2903use CFClient::OpenGL; 3565use CFPlus::OpenGL;
2904 3566
2905sub new { 3567sub new {
2906 my $class = shift; 3568 my $class = shift;
2907 3569
2908 my $self = $class->SUPER::new ( 3570 my $self = $class->SUPER::new (
2909 items => [], 3571 items => [],
2910 z => 100, 3572 z => 100,
2911 @_, 3573 @_,
2912 ); 3574 );
2913 3575
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3576 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2915 3577
2916 for my $item (@{ $self->{items} }) { 3578 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item; 3579 my ($widget, $cb, $tooltip) = @$item;
2918 3580
2919 # handle various types of items, only text for now 3581 # handle various types of items, only text for now
2920 if (!ref $widget) { 3582 if (!ref $widget) {
3583 if ($widget =~ /\t/) {
3584 my ($left, $right) = split /\t/, $widget, 2;
3585
2921 $widget = new CFClient::UI::Label 3586 $widget = new CFPlus::UI::HBox
2922 can_hover => 1, 3587 can_hover => 1,
2923 can_events => 1, 3588 can_events => 1,
3589 tooltip => $tooltip,
3590 children => [
3591 (new CFPlus::UI::Label markup => $left, expand => 1),
3592 (new CFPlus::UI::Label markup => $right, align => +1),
3593 ],
3594 ;
3595
3596 } else {
3597 $widget = new CFPlus::UI::Label
3598 can_hover => 1,
3599 can_events => 1,
2924 text => $widget; 3600 markup => $widget,
3601 tooltip => $tooltip;
3602 }
2925 } 3603 }
2926 3604
2927 $self->{item}{$widget} = $item; 3605 $self->{item}{$widget} = $item;
2928 3606
2929 $self->{vbox}->add ($widget); 3607 $self->{vbox}->add ($widget);
… …
2934 3612
2935# popup given the event (must be a mouse button down event currently) 3613# popup given the event (must be a mouse button down event currently)
2936sub popup { 3614sub popup {
2937 my ($self, $ev) = @_; 3615 my ($self, $ev) = @_;
2938 3616
2939 $self->_emit ("popdown"); 3617 $self->emit ("popdown");
2940 3618
2941 # maybe save $GRAB? must be careful about events... 3619 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self; 3620 $GRAB = $self;
2943 $self->{button} = $ev->{button}; 3621 $self->{button} = $ev->{button};
2944 3622
2945 $self->show; 3623 $self->show;
2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3624 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2947} 3625}
2948 3626
2949sub mouse_motion { 3627sub invoke_mouse_motion {
2950 my ($self, $ev, $x, $y) = @_; 3628 my ($self, $ev, $x, $y) = @_;
2951 3629
2952 # TODO: should use vbox->find_widget or so 3630 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER}; 3632 $self->{hover} = $self->{item}{$HOVER};
2955 3633
2956 0 3634 0
2957} 3635}
2958 3636
2959sub button_up { 3637sub invoke_button_up {
2960 my ($self, $ev, $x, $y) = @_; 3638 my ($self, $ev, $x, $y) = @_;
2961 3639
2962 if ($ev->{button} == $self->{button}) { 3640 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB; 3641 undef $GRAB;
2964 $self->hide; 3642 $self->hide;
2965 3643
2966 $self->_emit ("popdown"); 3644 $self->emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover}; 3645 $self->{hover}[1]->() if $self->{hover};
2968 } else { 3646 } else {
2969 return 0 3647 return 0
2970 } 3648 }
2971 3649
2972 1 3650 1
2973} 3651}
2974 3652
2975############################################################################# 3653#############################################################################
2976 3654
2977package CFClient::UI::Multiplexer; 3655package CFPlus::UI::Multiplexer;
2978 3656
2979our @ISA = CFClient::UI::Container::; 3657our @ISA = CFPlus::UI::Container::;
2980 3658
2981sub new { 3659sub new {
2982 my $class = shift; 3660 my $class = shift;
2983 3661
2984 my $self = $class->SUPER::new ( 3662 my $self = $class->SUPER::new (
… …
2998 3676
2999 $self->{current} = $self->{children}[0] 3677 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} }; 3678 if @{ $self->{children} };
3001} 3679}
3002 3680
3681sub get_current_page {
3682 my ($self) = @_;
3683
3684 $self->{current}
3685}
3686
3003sub set_current_page { 3687sub set_current_page {
3004 my ($self, $page_or_widget) = @_; 3688 my ($self, $page_or_widget) = @_;
3005 3689
3006 my $widget = ref $page_or_widget 3690 my $widget = ref $page_or_widget
3007 ? $page_or_widget 3691 ? $page_or_widget
3008 : $self->{children}[$page_or_widget]; 3692 : $self->{children}[$page_or_widget];
3009 3693
3010 $self->{current} = $widget; 3694 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3695 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012 3696
3013 $self->_emit (page_changed => $self->{current}); 3697 $self->emit (page_changed => $self->{current});
3014 3698
3015 $self->realloc; 3699 $self->realloc;
3016} 3700}
3017 3701
3018sub visible_children { 3702sub visible_children {
… …
3023 my ($self) = @_; 3707 my ($self) = @_;
3024 3708
3025 $self->{current}->size_request 3709 $self->{current}->size_request
3026} 3710}
3027 3711
3028sub size_allocate { 3712sub invoke_size_allocate {
3029 my ($self, $w, $h) = @_; 3713 my ($self, $w, $h) = @_;
3030 3714
3031 $self->{current}->configure (0, 0, $w, $h); 3715 $self->{current}->configure (0, 0, $w, $h);
3716
3717 1
3032} 3718}
3033 3719
3034sub _draw { 3720sub _draw {
3035 my ($self) = @_; 3721 my ($self) = @_;
3036 3722
3037 $self->{current}->draw; 3723 $self->{current}->draw;
3038} 3724}
3039 3725
3040############################################################################# 3726#############################################################################
3041 3727
3042package CFClient::UI::Notebook; 3728package CFPlus::UI::Notebook;
3043 3729
3044our @ISA = CFClient::UI::VBox::; 3730our @ISA = CFPlus::UI::VBox::;
3045 3731
3046sub new { 3732sub new {
3047 my $class = shift; 3733 my $class = shift;
3048 3734
3049 my $self = $class->SUPER::new ( 3735 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar), 3736 buttonbar => (new CFPlus::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3737 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self 3738 # filter => # will be put between multiplexer and $self
3053 @_, 3739 @_,
3054 ); 3740 );
3055 3741
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3742 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3060} 3746}
3061 3747
3062sub add { 3748sub add {
3063 my ($self, $title, $widget, $tooltip) = @_; 3749 my ($self, $title, $widget, $tooltip) = @_;
3064 3750
3065 Scalar::Util::weaken $self; 3751 CFPlus::weaken $self;
3066 3752
3067 $self->{buttonbar}->add (new CFClient::UI::Button 3753 $self->{buttonbar}->add (new CFPlus::UI::Button
3068 markup => $title, 3754 markup => $title,
3069 tooltip => $tooltip, 3755 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) }, 3756 on_activate => sub { $self->set_current_page ($widget) },
3071 ); 3757 );
3072 3758
3073 $self->{multiplexer}->add ($widget); 3759 $self->{multiplexer}->add ($widget);
3074} 3760}
3075 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{multiplexer}->get_current_page
3766}
3767
3076sub set_current_page { 3768sub set_current_page {
3077 my ($self, $page) = @_; 3769 my ($self, $page) = @_;
3078 3770
3079 $self->{multiplexer}->set_current_page ($page); 3771 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current}); 3772 $self->emit (page_changed => $self->{multiplexer}{current});
3081} 3773}
3082 3774
3083############################################################################# 3775#############################################################################
3084 3776
3777package CFPlus::UI::Selector;
3778
3779use utf8;
3780
3781our @ISA = CFPlus::UI::Button::;
3782
3783sub new {
3784 my $class = shift;
3785
3786 my $self = $class->SUPER::new (
3787 options => [], # [value, title, longdesc], ...
3788 value => undef,
3789 @_,
3790 );
3791
3792 $self->_set_value ($self->{value});
3793
3794 $self
3795}
3796
3797sub invoke_button_down {
3798 my ($self, $ev) = @_;
3799
3800 my @menu_items;
3801
3802 for (@{ $self->{options} }) {
3803 my ($value, $title, $tooltip) = @$_;
3804
3805 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3806 }
3807
3808 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3809}
3810
3811sub _set_value {
3812 my ($self, $value) = @_;
3813
3814 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3815 or return;
3816
3817 $self->{value} = $item->[0];
3818 $self->set_markup ("$item->[1] ⇓");
3819 $self->set_tooltip ($item->[2]);
3820}
3821
3822sub set_value {
3823 my ($self, $value) = @_;
3824
3825 return unless $self->{value} ne $value;
3826
3827 $self->_set_value ($value);
3828 $self->emit (changed => $value);
3829}
3830
3831#############################################################################
3832
3085package CFClient::UI::Statusbox; 3833package CFPlus::UI::Statusbox;
3086 3834
3087our @ISA = CFClient::UI::VBox::; 3835our @ISA = CFPlus::UI::VBox::;
3088 3836
3089sub new { 3837sub new {
3090 my $class = shift; 3838 my $class = shift;
3091 3839
3092 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3093 fontsize => 0.8, 3841 fontsize => 0.8,
3094 @_, 3842 @_,
3095 ); 3843 );
3096 3844
3097 Scalar::Util::weaken (my $this = $self); 3845 CFPlus::weaken (my $this = $self);
3098 3846
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3847 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100 3848
3101 $self 3849 $self
3102} 3850}
… …
3104sub reorder { 3852sub reorder {
3105 my ($self) = @_; 3853 my ($self) = @_;
3106 my $NOW = Time::HiRes::time; 3854 my $NOW = Time::HiRes::time;
3107 3855
3108 # freeze display when hovering over any label 3856 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner} 3857 return if $CFPlus::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3858 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} }; 3859 values %{ $self->{item} };
3112 3860
3113 while (my ($k, $v) = each %{ $self->{item} }) { 3861 while (my ($k, $v) = each %{ $self->{item} }) {
3114 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3862 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3115 } 3863 }
… …
3136 for ($short) { 3884 for ($short) {
3137 s/^\s+//; 3885 s/^\s+//;
3138 s/\s+/ /g; 3886 s/\s+/ /g;
3139 } 3887 }
3140 3888
3141 new CFClient::UI::Label 3889 new CFPlus::UI::Label
3142 markup => $short, 3890 markup => $short,
3143 tooltip => $item->{tooltip}, 3891 tooltip => $item->{tooltip},
3144 tooltip_font => $::FONT_PROP, 3892 tooltip_font => $::FONT_PROP,
3145 tooltip_width => 0.67, 3893 tooltip_width => 0.67,
3146 fontsize => $item->{fontsize} || $self->{fontsize}, 3894 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3184 $item->{count}++; 3932 $item->{count}++;
3185 } else { 3933 } else {
3186 $item->{count} = 1; 3934 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text; 3935 $item->{text} = $item->{tooltip} = $text;
3188 } 3936 }
3189 $item->{id} = ++$self->{id}; 3937 $item->{id} += 0.2;#d#
3190 $item->{timeout} = $timeout; 3938 $item->{timeout} = $timeout;
3191 delete $item->{label}; 3939 delete $item->{label};
3192 } else { 3940 } else {
3193 $self->{item}{$group} = { 3941 $self->{item}{$group} = {
3194 id => ++$self->{id}, 3942 id => ++$self->{id},
… …
3200 count => 1, 3948 count => 1,
3201 %arg, 3949 %arg,
3202 }; 3950 };
3203 } 3951 }
3204 3952
3953 $ROOT->on_refresh (reorder => sub {
3205 $self->reorder; 3954 $self->reorder;
3955 });
3206} 3956}
3207 3957
3208sub reconfigure { 3958sub reconfigure {
3209 my ($self) = @_; 3959 my ($self) = @_;
3210 3960
… …
3213 3963
3214 $self->reorder; 3964 $self->reorder;
3215 $self->SUPER::reconfigure; 3965 $self->SUPER::reconfigure;
3216} 3966}
3217 3967
3218sub DESTROY { 3968sub destroy {
3219 my ($self) = @_; 3969 my ($self) = @_;
3220 3970
3221 $self->{timer}->cancel; 3971 $self->{timer}->cancel;
3222 3972
3223 $self->SUPER::DESTROY; 3973 $self->SUPER::destroy;
3224} 3974}
3225 3975
3226############################################################################# 3976#############################################################################
3227 3977
3228package CFClient::UI::Inventory;
3229
3230our @ISA = CFClient::UI::ScrolledWindow::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3477 @_,
3478 )
3479}
3480
3481# XXX: Do sorting? Argl...
3482sub add_spell {
3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3485
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root; 3978package CFPlus::UI::Root;
3524 3979
3525our @ISA = CFClient::UI::Container::; 3980our @ISA = CFPlus::UI::Container::;
3526 3981
3527use List::Util qw(min max); 3982use List::Util qw(min max);
3528 3983
3529use CFClient::OpenGL; 3984use CFPlus::OpenGL;
3530 3985
3531sub new { 3986sub new {
3532 my $class = shift; 3987 my $class = shift;
3533 3988
3534 my $self = $class->SUPER::new ( 3989 my $self = $class->SUPER::new (
3535 visible => 1, 3990 visible => 1,
3536 @_, 3991 @_,
3537 ); 3992 );
3538 3993
3539 Scalar::Util::weaken ($self->{root} = $self); 3994 CFPlus::weaken ($self->{root} = $self);
3540 3995
3541 $self 3996 $self
3542} 3997}
3543 3998
3544sub size_request { 3999sub size_request {
… …
3559 $coord = $max - $size if $coord > $max - $size; 4014 $coord = $max - $size if $coord > $max - $size;
3560 4015
3561 int $coord + 0.5 4016 int $coord + 0.5
3562} 4017}
3563 4018
3564sub size_allocate { 4019sub invoke_size_allocate {
3565 my ($self, $w, $h) = @_; 4020 my ($self, $w, $h) = @_;
3566 4021
3567 for my $child ($self->children) { 4022 for my $child ($self->children) {
3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3569 4024
… …
3573 $X = _to_pixel $X, $W, $self->{w}; 4028 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h}; 4029 $Y = _to_pixel $Y, $H, $self->{h};
3575 4030
3576 $child->configure ($X, $Y, $W, $H); 4031 $child->configure ($X, $Y, $W, $H);
3577 } 4032 }
4033
4034 1
3578} 4035}
3579 4036
3580sub coord2local { 4037sub coord2local {
3581 my ($self, $x, $y) = @_; 4038 my ($self, $x, $y) = @_;
3582 4039
… …
3637 while ($self->{refresh_hook}) { 4094 while ($self->{refresh_hook}) {
3638 $_->() 4095 $_->()
3639 for values %{delete $self->{refresh_hook}}; 4096 for values %{delete $self->{refresh_hook}};
3640 } 4097 }
3641 4098
3642 if ($self->{realloc}) { 4099 while ($self->{realloc}) {
3643 my %queue; 4100 my %queue;
3644 my @queue; 4101 my @queue;
3645 my $widget; 4102 my $widget;
3646 4103
3647 outer: 4104 outer:
… …
3694 } 4151 }
3695 } 4152 }
3696 4153
3697 delete $self->{realloc}{$widget+0}; 4154 delete $self->{realloc}{$widget+0};
3698 } 4155 }
3699 }
3700 4156
3701 while (my $size_alloc = delete $self->{size_alloc}) { 4157 while (my $size_alloc = delete $self->{size_alloc}) {
3702 my @queue = sort { $b->{visible} <=> $a->{visible} } 4158 my @queue = sort { $a->{visible} <=> $b->{visible} }
3703 values %$size_alloc; 4159 values %$size_alloc;
3704 4160
3705 while () { 4161 while () {
3706 my $widget = pop @queue || last; 4162 my $widget = pop @queue || last;
3707 4163
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4164 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709 4165
3710 $w = 0 if $w < 0; 4166 $w = max $widget->{min_w}, $w;
3711 $h = 0 if $h < 0; 4167 $h = max $widget->{min_h}, $h;
3712 4168
4169# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4170# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4171
4172 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4173 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4174
3713 $w = int $w + 0.5; 4175 $w = int $w + 0.5;
3714 $h = int $h + 0.5; 4176 $h = int $h + 0.5;
3715 4177
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4178 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w}; 4179 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h}; 4180 $widget->{old_h} = $widget->{h};
3719 4181
3720 $widget->{w} = $w; 4182 $widget->{w} = $w;
3721 $widget->{h} = $h; 4183 $widget->{h} = $h;
3722 4184
3723 $widget->emit (size_allocate => $w, $h); 4185 $widget->emit (size_allocate => $w, $h);
4186 }
3724 } 4187 }
3725 } 4188 }
3726 } 4189 }
3727 4190
3728 while ($self->{post_alloc_hook}) { 4191 while ($self->{post_alloc_hook}) {
3729 $_->() 4192 $_->()
3730 for values %{delete $self->{post_alloc_hook}}; 4193 for values %{delete $self->{post_alloc_hook}};
3731 } 4194 }
3732
3733 4195
3734 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4196 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4197 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3736 glClear GL_COLOR_BUFFER_BIT; 4198 glClear GL_COLOR_BUFFER_BIT;
3737 4199
… …
3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4202 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3741 glMatrixMode GL_MODELVIEW; 4203 glMatrixMode GL_MODELVIEW;
3742 glLoadIdentity; 4204 glLoadIdentity;
3743 4205
3744 { 4206 {
3745 package CFClient::UI::Base; 4207 package CFPlus::UI::Base;
3746 4208
3747 ($draw_x, $draw_y, $draw_w, $draw_h) = 4209 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h}); 4210 (0, 0, $self->{w}, $self->{h});
3749 }
3750 4211
3751 $self->_draw; 4212 $self->_draw;
4213 }
3752} 4214}
3753 4215
3754############################################################################# 4216#############################################################################
3755 4217
3756package CFClient::UI; 4218package CFPlus::UI;
3757 4219
3758$ROOT = new CFClient::UI::Root; 4220$ROOT = new CFPlus::UI::Root;
3759$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4221$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3760 4222
37611 42231
3762 4224

Diff Legend

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