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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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