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

Diff Legend

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