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

Diff Legend

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