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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 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 invoke_mouse_wheel {
977 my ($self) = @_; 1140 my ($self, $ev) = @_;
978 1141
979 $self->SUPER::update; 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
980 1144
981 # todo: overwrite size_allocate of child 1145 $self->{hslider}->emit (mouse_wheel => $ev)
982 my $child = $self->{vp}->child; 1146 if $ev->{dx};
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985 1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
986sub size_allocate { 1194sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
988 1196
1197 $self->update_slider;
989 $self->SUPER::size_allocate ($w, $h); 1198 $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} 1199}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1200
998############################################################################# 1201#############################################################################
999 1202
1000package CFClient::UI::Frame; 1203package CFPlus::UI::Frame;
1001 1204
1002our @ISA = CFClient::UI::Bin::; 1205our @ISA = CFPlus::UI::Bin::;
1003 1206
1004use CFClient::OpenGL; 1207use CFPlus::OpenGL;
1005 1208
1006sub new { 1209sub new {
1007 my $class = shift; 1210 my $class = shift;
1008 1211
1009 $class->SUPER::new ( 1212 $class->SUPER::new (
1017 1220
1018 if ($self->{bg}) { 1221 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1222 my ($w, $h) = @$self{qw(w h)};
1020 1223
1021 glEnable GL_BLEND; 1224 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1226 glColor_premultiply @{ $self->{bg} };
1024 1227
1025 glBegin GL_QUADS; 1228 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1229 glVertex 0 , 0;
1027 glVertex 0 , $h; 1230 glVertex 0 , $h;
1028 glVertex $w, $h; 1231 glVertex $w, $h;
1035 $self->SUPER::_draw; 1238 $self->SUPER::_draw;
1036} 1239}
1037 1240
1038############################################################################# 1241#############################################################################
1039 1242
1040package CFClient::UI::FancyFrame; 1243package CFPlus::UI::FancyFrame;
1041 1244
1042our @ISA = CFClient::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1043 1246
1044use CFClient::OpenGL; 1247use 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 1248
1054sub new { 1249sub new {
1055 my ($class, %arg) = @_; 1250 my ($class, %arg) = @_;
1056 1251
1057 my $title = delete $arg{title}; 1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1348
1349my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1351 mipmap => 1, wrap => 1;
1352
1353my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1361sub new {
1362 my ($class, %arg) = @_;
1058 1363
1059 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1366 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1367 border => 0.6,
1063 can_events => 1, 1368 can_events => 1,
1064 min_w => 16, 1369 min_w => 64,
1065 min_h => 16, 1370 min_h => 32,
1066 %arg, 1371 %arg,
1067 ); 1372 );
1068 1373
1069 $self->{title} = new CFClient::UI::Label 1374 $self->{title_widget} = new CFPlus::UI::Label
1070 align => 0, 1375 align => 0,
1071 valign => 1, 1376 valign => 1,
1072 text => $title, 1377 text => $self->{title},
1073 fontsize => $self->{border} 1378 fontsize => $self->{border},
1074 if defined $title; 1379 if exists $self->{title};
1380
1381 if ($self->{has_close_button}) {
1382 $self->{close_button} =
1383 new CFPlus::UI::ImageButton
1384 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") };
1386
1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1388 }
1075 1389
1076 $self 1390 $self
1077} 1391}
1078 1392
1079sub add { 1393sub add {
1080 my ($self, @widgets) = @_; 1394 my ($self, @widgets) = @_;
1081 1395
1082 $self->SUPER::add (@widgets); 1396 $self->SUPER::add (@widgets);
1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1399}
1085 1400
1086sub border { 1401sub border {
1087 int $_[0]{border} * $::FONTSIZE 1402 int $_[0]{border} * $::FONTSIZE
1088} 1403}
1089 1404
1090sub size_request { 1405sub size_request {
1091 my ($self) = @_; 1406 my ($self) = @_;
1092 1407
1093 $self->{title}->size_request 1408 $self->{title_widget}->size_request
1094 if $self->{title}; 1409 if $self->{title_widget};
1410
1411 $self->{close_button}->size_request
1412 if $self->{close_button};
1095 1413
1096 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1097 1415
1098 ( 1416 (
1099 $w + $self->border * 2, 1417 $w + $self->border * 2,
1100 $h + $self->border * 2, 1418 $h + $self->border * 2,
1101 ) 1419 )
1102} 1420}
1103 1421
1104sub size_allocate { 1422sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1106 1424
1107 if ($self->{title}) { 1425 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1429 }
1112 1430
1113 my $border = $self->border; 1431 my $border = $self->border;
1114 1432
1115 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1435
1436 $self->child->configure ($border, $border, $w, $h);
1437
1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1439 if $self->{close_button};
1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1117 1448
1118 $self->child->configure ($border, $border, $w, $h); 1449 1
1119} 1450}
1120 1451
1121sub button_down { 1452sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1123 1454
1124 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1456 my $border = $self->border;
1126 1457
1142 my $dy = $ev->{y} - $oy; 1473 my $dy = $ev->{y} - $oy;
1143 1474
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1475 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1476 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1477
1478 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1479 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1480 };
1150 1481
1151 } elsif ($lr ^ $td) { 1482 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1483 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1484 my ($bx, $by) = ($self->{x}, $self->{y});
1156 my ($ev, $x, $y) = @_; 1487 my ($ev, $x, $y) = @_;
1157 1488
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1490
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1492 # HACK: the next line is required to enforce placement
1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161 }; 1494 };
1495 } else {
1496 return 0;
1497 }
1498
1162 } 1499 1
1163} 1500}
1164 1501
1165sub button_up { 1502sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1167 1504
1168 delete $self->{motion}; 1505 ! ! delete $self->{motion}
1169} 1506}
1170 1507
1171sub mouse_motion { 1508sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1173 1510
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1512
1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1175} 1522}
1176 1523
1177sub _draw { 1524sub _draw {
1178 my ($self) = @_; 1525 my ($self) = @_;
1179 1526
1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1187 1534
1188 my $border = $self->border; 1535 my $border = $self->border;
1189 1536
1190 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1191 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1195 1556
1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1197 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1198 1559
1199 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
1205 1566
1206 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1207 1568
1208 $child->draw; 1569 $child->draw;
1209 1570
1210 if ($self->{title}) { 1571 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1572 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1573 $self->{title_widget}->_draw;
1574
1575 glTranslate 0, - ($border - $self->{h});
1213 } 1576 }
1577
1578 $self->{close_button}->draw
1579 if $self->{close_button};
1214} 1580}
1215 1581
1216############################################################################# 1582#############################################################################
1217 1583
1218package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1219 1585
1220our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1221 1587
1222use List::Util qw(max sum); 1588use List::Util qw(max sum);
1223 1589
1224use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1225 1591
1226sub new { 1592sub new {
1227 my $class = shift; 1593 my $class = shift;
1228 1594
1229 $class->SUPER::new ( 1595 $class->SUPER::new (
1230 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1231 @_, 1598 @_,
1232 ) 1599 )
1233} 1600}
1234 1601
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237}
1238
1239sub add { 1602sub 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) = @_; 1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{rowspan} ||= 1;
1607 $child->{colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1614 my $self = shift;
1615
1616 my @widgets;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1631 my ($self) = @_;
1632
1633 my (@w, @h);
1251 1634
1252 my @children = $self->children; 1635 my @children = $self->children;
1253 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1254 1646 }
1255 for (@children) {
1256 delete $_->{parent};
1257 $_->hide;
1258 }
1259 1647
1260 $self->realloc; 1648 # second pass, rows
1261} 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1276 1651
1277 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1278 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1279 } 1656 }
1280 } 1657 }
1281 1658
1282 (\@w, \@h) 1659 (\@w, \@h)
1283} 1660}
1291 (sum @$ws), 1668 (sum @$ws),
1292 (sum @$hs), 1669 (sum @$hs),
1293 ) 1670 )
1294} 1671}
1295 1672
1296sub size_allocate { 1673sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1674 my ($self, $w, $h) = @_;
1298 1675
1299 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1300 1677
1301 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1302 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1303 1680
1304 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1305 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1306 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1307 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1308 1685
1309 # linearly scale sizes
1310 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312 1687
1313 CFClient::UI::harmonize $ws; 1688 CFPlus::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1314 CFClient::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1315 1697
1316 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1317 1700
1318 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1319 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1320 or next;
1321 1703
1322 my $x = 0; 1704 $widget->configure (
1323 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1324 1707 );
1325 for my $c (0 .. $#$row) { 1708 }
1326 my $col_w = $ws->[$c];
1327 1709
1328 if (my $widget = $row->[$c]) { 1710 1
1329 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1330 }
1331 1712
1332 $x += $col_w; 1713#############################################################################
1714
1715package CFPlus::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = CFPlus::UI::Container::;
1720
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) {
1729 my ($mode, $val, $max) = @_;
1730
1731 $mode eq "abs" ? $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734}
1735
1736sub size_request {
1737 my ($self) = @_;
1738
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740
1741 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1744
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1333 } 1751 }
1334
1335 $y += $row_h;
1336 } 1752 }
1337 1753
1338} 1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1339 1756
1340sub find_widget { 1757 # now layout remaining widgets
1758 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1760
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1341 my ($self, $x, $y) = @_; 1779 my ($self, $W, $H) = @_;
1342 1780
1343 $x -= $self->{x}; 1781 for my $child ($self->visible_children) {
1344 $y -= $self->{y}; 1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1345 1783
1346 my $res; 1784 $x = _scale $pos, $x, $W;
1785 $y = _scale $pos, $x, $H;
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1347 1788
1348 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1789 $child->configure ($x, $y, $w, $h);
1349 $res = $_->find_widget ($x, $y) 1790 }
1350 and return $res; 1791
1351 } 1792 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} 1793}
1363 1794
1364############################################################################# 1795#############################################################################
1365 1796
1366package CFClient::UI::Box; 1797package CFPlus::UI::Box;
1367 1798
1368our @ISA = CFClient::UI::Container::; 1799our @ISA = CFPlus::UI::Container::;
1369 1800
1370sub size_request { 1801sub size_request {
1371 my ($self) = @_; 1802 my ($self) = @_;
1372 1803
1373 $self->{vertical} 1804 $self->{vertical}
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1810 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1811 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1812 )
1382} 1813}
1383 1814
1384sub size_allocate { 1815sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1816 my ($self, $w, $h) = @_;
1386 1817
1387 my $space = $self->{vertical} ? $h : $w; 1818 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1819 my @children = $self->visible_children;
1389 1820
1390 my @req; 1821 my @req;
1391 1822
1392 if ($self->{homogeneous}) { 1823 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1824 @req = ($space / (@children || 1)) x @children;
1394 } else { 1825 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1826 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1827 my $req = List::Util::sum @req;
1397 1828
1398 if ($req > $space) { 1829 if ($req > $space) {
1399 # ah well, not enough space 1830 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1831 $_ *= $space / $req for @req;
1401 } else { 1832 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1833 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1834
1404 $space = ($space - $req) / $expand; # remaining space to give away 1835 $space = ($space - $req) / $expand; # remaining space to give away
1405 1836
1406 $req[$_] += $space * $children->[$_]{expand} 1837 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1838 for 0 .. $#children;
1408 } 1839 }
1409 } 1840 }
1410 1841
1411 CFClient::UI::harmonize \@req; 1842 CFPlus::UI::harmonize \@req;
1412 1843
1413 my $pos = 0; 1844 my $pos = 0;
1414 for (0 .. $#$children) { 1845 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1846 my $alloc = $req[$_];
1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1847 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417 1848
1418 $pos += $alloc; 1849 $pos += $alloc;
1419 } 1850 }
1420 1851
1421 1 1852 1
1422} 1853}
1423 1854
1424############################################################################# 1855#############################################################################
1425 1856
1426package CFClient::UI::HBox; 1857package CFPlus::UI::HBox;
1427 1858
1428our @ISA = CFClient::UI::Box::; 1859our @ISA = CFPlus::UI::Box::;
1429 1860
1430sub new { 1861sub new {
1431 my $class = shift; 1862 my $class = shift;
1432 1863
1433 $class->SUPER::new ( 1864 $class->SUPER::new (
1436 ) 1867 )
1437} 1868}
1438 1869
1439############################################################################# 1870#############################################################################
1440 1871
1441package CFClient::UI::VBox; 1872package CFPlus::UI::VBox;
1442 1873
1443our @ISA = CFClient::UI::Box::; 1874our @ISA = CFPlus::UI::Box::;
1444 1875
1445sub new { 1876sub new {
1446 my $class = shift; 1877 my $class = shift;
1447 1878
1448 $class->SUPER::new ( 1879 $class->SUPER::new (
1451 ) 1882 )
1452} 1883}
1453 1884
1454############################################################################# 1885#############################################################################
1455 1886
1456package CFClient::UI::Label; 1887package CFPlus::UI::Label;
1457 1888
1458our @ISA = CFClient::UI::DrawBG::; 1889our @ISA = CFPlus::UI::DrawBG::;
1459 1890
1460use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1461 1892
1462sub new { 1893sub new {
1463 my ($class, %arg) = @_; 1894 my ($class, %arg) = @_;
1464 1895
1465 my $self = $class->SUPER::new ( 1896 my $self = $class->SUPER::new (
1468 #active_bg => none 1899 #active_bg => none
1469 #font => default_font 1900 #font => default_font
1470 #text => initial text 1901 #text => initial text
1471 #markup => initial narkup 1902 #markup => initial narkup
1472 #max_w => maximum pixel width 1903 #max_w => maximum pixel width
1904 #style => 0, # render flags
1473 ellipsise => 3, # end 1905 ellipsise => 3, # end
1474 layout => (new CFClient::Layout), 1906 layout => (new CFPlus::Layout),
1475 fontsize => 1, 1907 fontsize => 1,
1476 align => -1, 1908 align => -1,
1477 valign => -1, 1909 valign => -1,
1478 padding_x => 2, 1910 padding_x => 2,
1479 padding_y => 2, 1911 padding_y => 2,
1480 can_events => 0, 1912 can_events => 0,
1481 %arg 1913 %arg
1482 ); 1914 );
1483 1915
1484 if (exists $self->{template}) { 1916 if (exists $self->{template}) {
1485 my $layout = new CFClient::Layout; 1917 my $layout = new CFPlus::Layout;
1486 $layout->set_text (delete $self->{template}); 1918 $layout->set_text (delete $self->{template});
1487 $self->{template} = $layout; 1919 $self->{template} = $layout;
1488 } 1920 }
1489 1921
1490 if (exists $self->{markup}) { 1922 if (exists $self->{markup}) {
1494 } 1926 }
1495 1927
1496 $self 1928 $self
1497} 1929}
1498 1930
1499sub escape($) {
1500 local $_ = $_[0];
1501
1502 s/&/&amp;/g;
1503 s/>/&gt;/g;
1504 s/</&lt;/g;
1505
1506 $_
1507}
1508
1509sub update { 1931sub update {
1510 my ($self) = @_; 1932 my ($self) = @_;
1511 1933
1512 delete $self->{texture}; 1934 delete $self->{texture};
1513 $self->SUPER::update; 1935 $self->SUPER::update;
1514} 1936}
1515 1937
1938sub realloc {
1939 my ($self) = @_;
1940
1941 delete $self->{ox};
1942 $self->SUPER::realloc;
1943}
1944
1516sub set_text { 1945sub set_text {
1517 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1518 1947
1519 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1521 1950
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1524 1952
1953 delete $self->{size_req};
1525 $self->realloc; 1954 $self->realloc;
1526 $self->update; 1955 $self->update;
1527} 1956}
1528 1957
1529sub set_markup { 1958sub set_markup {
1532 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1534 1963
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1965
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1539 1967
1968 delete $self->{size_req};
1540 $self->realloc; 1969 $self->realloc;
1541 $self->update; 1970 $self->update;
1542} 1971}
1543 1972
1544sub size_request { 1973sub size_request {
1545 my ($self) = @_; 1974 my ($self) = @_;
1546 1975
1976 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1977 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1978 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1979 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1980 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1981 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1982
1553 my ($w, $h) = $self->{layout}->size; 1983 my ($w, $h) = $self->{layout}->size;
1554 1984
1555 if (exists $self->{template}) { 1985 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1986 $self->{template}->set_font ($self->{font}) if $self->{font};
1987 $self->{template}->set_width ($self->{max_w} || -1);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1989
1559 my ($w2, $h2) = $self->{template}->size; 1990 my ($w2, $h2) = $self->{template}->size;
1560 1991
1561 $w = List::Util::max $w, $w2; 1992 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1993 $h = List::Util::max $h, $h2;
1994 }
1995
1996 [$w, $h]
1563 } 1997 };
1564 1998
1565 ($w, $h) 1999 @{ $self->{size_req} }
1566} 2000}
1567 2001
2002sub baseline_shift {
2003 $_[0]{layout}->descent
2004}
2005
1568sub size_allocate { 2006sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 2007 my ($self, $w, $h) = @_;
1570 2008
1571 delete $self->{ox}; 2009 delete $self->{ox};
1572 2010
1573 delete $self->{texture} 2011 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2012 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2013
2014 1
1575} 2015}
1576 2016
1577sub set_fontsize { 2017sub set_fontsize {
1578 my ($self, $fontsize) = @_; 2018 my ($self, $fontsize) = @_;
1579 2019
1580 $self->{fontsize} = $fontsize; 2020 $self->{fontsize} = $fontsize;
2021 delete $self->{size_req};
1581 delete $self->{texture}; 2022 delete $self->{texture};
1582 2023
1583 $self->realloc; 2024 $self->realloc;
1584} 2025}
1585 2026
2027sub reconfigure {
2028 my ($self) = @_;
2029
2030 delete $self->{size_req};
2031 delete $self->{texture};
2032
2033 $self->SUPER::reconfigure;
2034}
2035
1586sub _draw { 2036sub _draw {
1587 my ($self) = @_; 2037 my ($self) = @_;
1588 2038
1589 $self->SUPER::_draw; # draw background, if applicable 2039 $self->SUPER::_draw; # draw background, if applicable
1590 2040
1591 my $tex = $self->{texture} ||= do { 2041 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 2042 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2043 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 2044 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2045 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2046 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2047 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2048
1599 new_from_layout CFClient::Texture $self->{layout} 2049 [$self->{layout}->size]
1600 }; 2050 };
1601 2051
1602 unless (exists $self->{ox}) { 2052 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2053 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2054 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 2055 : ($self->{w} - $size->[0]) * 0.5);
1606 2056
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 2059 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 2060 };
1611 2061
1612 glEnable GL_TEXTURE_2D; 2062 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2063 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 2064
1615 if ($tex->{format} == GL_ALPHA) { 2065 $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} 2066}
1624 2067
1625############################################################################# 2068#############################################################################
1626 2069
1627package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1628 2071
1629our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1630 2073
1631use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1632 2075
1633sub new { 2076sub new {
1634 my $class = shift; 2077 my $class = shift;
1635 2078
1636 $class->SUPER::new ( 2079 $class->SUPER::new (
1640 active_fg => [0, 0, 0], 2083 active_fg => [0, 0, 0],
1641 can_hover => 1, 2084 can_hover => 1,
1642 can_focus => 1, 2085 can_focus => 1,
1643 valign => 0, 2086 valign => 0,
1644 can_events => 1, 2087 can_events => 1,
2088 ellipsise => 0,
1645 #text => ... 2089 #text => ...
2090 #hidden => "*",
1646 @_ 2091 @_
1647 ) 2092 )
1648} 2093}
1649 2094
1650sub _set_text { 2095sub _set_text {
1652 2097
1653 delete $self->{cur_h}; 2098 delete $self->{cur_h};
1654 2099
1655 return if $self->{text} eq $text; 2100 return if $self->{text} eq $text;
1656 2101
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 2102 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 2103 $self->{text} = $text;
1661 2104
1662 $text =~ s/./*/g if $self->{hidden}; 2105 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 2106 $self->{layout}->set_text ("$text ");
2107 delete $self->{size_req};
1664 2108
1665 $self->_emit (changed => $self->{text}); 2109 $self->emit (changed => $self->{text});
2110
2111 $self->realloc;
2112 $self->update;
1666} 2113}
1667 2114
1668sub set_text { 2115sub set_text {
1669 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
1670 2117
1671 $self->{cursor} = length $text; 2118 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 2119 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 2120}
1676 2121
1677sub get_text { 2122sub get_text {
1678 $_[0]{text} 2123 $_[0]{text}
1679} 2124}
1684 my ($w, $h) = $self->SUPER::size_request; 2129 my ($w, $h) = $self->SUPER::size_request;
1685 2130
1686 ($w + 1, $h) # add 1 for cursor 2131 ($w + 1, $h) # add 1 for cursor
1687} 2132}
1688 2133
1689sub key_down { 2134sub invoke_key_down {
1690 my ($self, $ev) = @_; 2135 my ($self, $ev) = @_;
1691 2136
1692 my $mod = $ev->{mod}; 2137 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 2138 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 2139 my $uni = $ev->{unicode};
1695 2140
1696 my $text = $self->get_text; 2141 my $text = $self->get_text;
2142
2143 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1697 2144
1698 if ($uni == 8) { 2145 if ($uni == 8) {
1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2146 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700 } elsif ($uni == 127) { 2147 } elsif ($uni == 127) {
1701 substr $text, $self->{cursor}, 1, ""; 2148 substr $text, $self->{cursor}, 1, "";
1702 } elsif ($sym == CFClient::SDLK_LEFT) { 2149 } elsif ($sym == CFPlus::SDLK_LEFT) {
1703 --$self->{cursor} if $self->{cursor}; 2150 --$self->{cursor} if $self->{cursor};
1704 } elsif ($sym == CFClient::SDLK_RIGHT) { 2151 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1705 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2152 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1706 } elsif ($sym == CFClient::SDLK_HOME) { 2153 } elsif ($sym == CFPlus::SDLK_HOME) {
2154 # what a hack
2155 $self->{cursor} =
2156 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2157 ? length $1
2158 : 0;
2159 } elsif ($sym == CFPlus::SDLK_END) {
2160 # uh, again
2161 $self->{cursor} =
2162 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2163 ? $self->{cursor} + length $1
2164 : length $self->{text};
2165 } elsif ($uni == 21) { # ctrl-u
2166 $text = "";
1707 $self->{cursor} = 0; 2167 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 2168 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 2169 $self->emit ('escape');
1712 } elsif ($uni) { 2170 } elsif ($uni == 0x0d) {
2171 substr $text, $self->{cursor}++, 0, "\012";
2172 } elsif ($uni >= 0x20) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 2173 substr $text, $self->{cursor}++, 0, chr $uni;
2174 } else {
2175 return 0;
1714 } 2176 }
1715 2177
1716 $self->_set_text ($text); 2178 $self->_set_text ($text);
1717 2179
1718 $self->realloc; 2180 $self->realloc;
1719} 2181 $self->update;
1720 2182
2183 1
2184}
2185
1721sub focus_in { 2186sub invoke_focus_in {
1722 my ($self) = @_; 2187 my ($self) = @_;
1723 2188
1724 $self->{last_activity} = $::NOW; 2189 $self->{last_activity} = $::NOW;
1725 2190
1726 $self->SUPER::focus_in; 2191 $self->SUPER::invoke_focus_in
1727} 2192}
1728 2193
1729sub button_down { 2194sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 2195 my ($self, $ev, $x, $y) = @_;
1731 2196
1732 $self->SUPER::button_down ($ev, $x, $y); 2197 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 2198
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 2199 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 2200
1736 # byte-index to char-index 2201 # byte-index to char-index
1737 my $text = $self->{text}; 2202 my $text = $self->{text};
1738 utf8::encode $text; 2203 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 2204 $self->{cursor} = length $text;
1740 2205
1741 $self->_set_text ($self->{text}); 2206 $self->_set_text ($self->{text});
1742 $self->update; 2207 $self->update;
2208
2209 1
1743} 2210}
1744 2211
1745sub mouse_motion { 2212sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 2213 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2214# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2215
2216 1
1748} 2217}
1749 2218
1750sub _draw { 2219sub _draw {
1751 my ($self) = @_; 2220 my ($self) = @_;
1752 2221
1753 local $self->{fg} = $self->{fg}; 2222 local $self->{fg} = $self->{fg};
1754 2223
1755 if ($FOCUS == $self) { 2224 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 2225 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 2226 $self->{fg} = $self->{active_fg};
1758 } else { 2227 } else {
1759 glColor @{$self->{bg}}; 2228 glColor_premultiply @{$self->{bg}};
1760 } 2229 }
1761 2230
1762 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 2233 glBegin GL_QUADS;
1765 glVertex 0 , 0; 2234 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 2235 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 2236 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 2237 glVertex $self->{w}, 0;
1779 utf8::encode $text; 2248 utf8::encode $text;
1780 2249
1781 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2250 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1782 } 2251 }
1783 2252
1784 glColor @{$self->{fg}};
1785 glBegin GL_LINES; 2253 glBegin GL_LINES;
1786 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 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}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1788 glEnd; 2256 glEnd;
1789 } 2257 }
1790} 2258}
1791 2259
2260#############################################################################
2261
1792package CFClient::UI::Entry; 2262package CFPlus::UI::Entry;
1793 2263
1794our @ISA = CFClient::UI::EntryBase::; 2264our @ISA = CFPlus::UI::EntryBase::;
1795 2265
1796use CFClient::OpenGL; 2266use CFPlus::OpenGL;
1797 2267
1798sub key_down { 2268sub invoke_key_down {
1799 my ($self, $ev) = @_; 2269 my ($self, $ev) = @_;
1800 2270
1801 my $sym = $ev->{sym}; 2271 my $sym = $ev->{sym};
1802 2272
1803 if ($sym == 13) { 2273 if ($ev->{uni} == 0x0d || $sym == 13) {
1804 unshift @{$self->{history}}, 2274 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 2275 my $txt = $self->get_text;
2276
1806 $self->{history_pointer} = -1; 2277 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 2278 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 2279 $self->emit (activate => $txt);
1809 $self->update; 2280 $self->update;
1810 2281
1811 } elsif ($sym == CFClient::SDLK_UP) { 2282 } elsif ($sym == CFPlus::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 2283 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 2284 $self->{history_saveback} = $self->get_text;
1814 } 2285 }
1815 if (@{$self->{history} || []} > 0) { 2286 if (@{$self->{history} || []} > 0) {
1816 $self->{history_pointer}++; 2287 $self->{history_pointer}++;
1818 $self->{history_pointer} = @{$self->{history} || []} - 1; 2289 $self->{history_pointer} = @{$self->{history} || []} - 1;
1819 } 2290 }
1820 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2291 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1821 } 2292 }
1822 2293
1823 } elsif ($sym == CFClient::SDLK_DOWN) { 2294 } elsif ($sym == CFPlus::SDLK_DOWN) {
1824 $self->{history_pointer}--; 2295 $self->{history_pointer}--;
1825 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2296 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826 2297
1827 if ($self->{history_pointer} >= 0) { 2298 if ($self->{history_pointer} >= 0) {
1828 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2299 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1829 } else { 2300 } else {
1830 $self->set_text ($self->{history_saveback}); 2301 $self->set_text ($self->{history_saveback});
1831 } 2302 }
1832 2303
1833 } else { 2304 } else {
1834 $self->SUPER::key_down ($ev); 2305 return $self->SUPER::invoke_key_down ($ev)
2306 }
2307
1835 } 2308 1
1836
1837} 2309}
1838 2310
1839############################################################################# 2311#############################################################################
1840 2312
2313package CFPlus::UI::TextEdit;
2314
2315our @ISA = CFPlus::UI::EntryBase::;
2316
2317use CFPlus::OpenGL;
2318
2319sub move_cursor_ver {
2320 my ($self, $dy) = @_;
2321
2322 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2323
2324 $y += $dy;
2325
2326 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2327 $self->{cursor} = $index;
2328 delete $self->{cur_h};
2329 $self->update;
2330 return;
2331 }
2332}
2333
2334sub invoke_key_down {
2335 my ($self, $ev) = @_;
2336
2337 my $sym = $ev->{sym};
2338
2339 if ($sym == CFPlus::SDLK_UP) {
2340 $self->move_cursor_ver (-1);
2341 } elsif ($sym == CFPlus::SDLK_DOWN) {
2342 $self->move_cursor_ver (+1);
2343 } else {
2344 return $self->SUPER::invoke_key_down ($ev)
2345 }
2346
2347 1
2348}
2349
2350#############################################################################
2351
1841package CFClient::UI::Button; 2352package CFPlus::UI::Button;
1842 2353
1843our @ISA = CFClient::UI::Label::; 2354our @ISA = CFPlus::UI::Label::;
1844 2355
1845use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1846 2357
1847my @tex = 2358my @tex =
1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849 qw(b1_button_active.png); 2360 qw(b1_button_inactive.png b1_button_active.png);
1850 2361
1851sub new { 2362sub new {
1852 my $class = shift; 2363 my $class = shift;
1853 2364
1854 $class->SUPER::new ( 2365 $class->SUPER::new (
1855 padding_x => 4, 2366 padding_x => 4,
1856 padding_y => 4, 2367 padding_y => 4,
1857 fg => [1, 1, 1], 2368 fg => [1.0, 1.0, 1.0],
1858 active_fg => [0, 0, 1], 2369 active_fg => [0.8, 0.8, 0.8],
1859 can_hover => 1, 2370 can_hover => 1,
1860 align => 0, 2371 align => 0,
1861 valign => 0, 2372 valign => 0,
1862 can_events => 1, 2373 can_events => 1,
1863 @_ 2374 @_
1864 ) 2375 )
1865} 2376}
1866 2377
1867sub activate { }
1868
1869sub button_up { 2378sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2379 my ($self, $ev, $x, $y) = @_;
1871 2380
1872 $self->emit ("activate") 2381 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2382 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2383 && $y >= 0 && $y < $self->{h};
2384
2385 1
1875} 2386}
1876 2387
1877sub _draw { 2388sub _draw {
1878 my ($self) = @_; 2389 my ($self) = @_;
1879 2390
1880 local $self->{fg} = $self->{fg}; 2391 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2392
1886 glEnable GL_TEXTURE_2D; 2393 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2395 glColor 0, 0, 0, 1;
1889 2396
2397 my $tex = $tex[$GRAB == $self];
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2398 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 2399
1892 glDisable GL_TEXTURE_2D; 2400 glDisable GL_TEXTURE_2D;
1893 2401
1894 $self->SUPER::_draw; 2402 $self->SUPER::_draw;
1895} 2403}
1896 2404
1897############################################################################# 2405#############################################################################
1898 2406
1899package CFClient::UI::CheckBox; 2407package CFPlus::UI::CheckBox;
1900 2408
1901our @ISA = CFClient::UI::DrawBG::; 2409our @ISA = CFPlus::UI::DrawBG::;
1902 2410
1903my @tex = 2411my @tex =
1904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2412 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1905 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2413 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906 2414
1907use CFClient::OpenGL; 2415use CFPlus::OpenGL;
1908 2416
1909sub new { 2417sub new {
1910 my $class = shift; 2418 my $class = shift;
1911 2419
1912 $class->SUPER::new ( 2420 $class->SUPER::new (
1926 my ($self) = @_; 2434 my ($self) = @_;
1927 2435
1928 (6) x 2 2436 (6) x 2
1929} 2437}
1930 2438
2439sub toggle {
2440 my ($self) = @_;
2441
2442 $self->{state} = !$self->{state};
2443 $self->emit (changed => $self->{state});
2444 $self->update;
2445}
2446
1931sub button_down { 2447sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
1933 2449
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2450 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2451 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2452 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2453 } else {
2454 return 0
2455 }
2456
1938 } 2457 1
1939} 2458}
1940 2459
1941sub _draw { 2460sub _draw {
1942 my ($self) = @_; 2461 my ($self) = @_;
1943 2462
1958 glDisable GL_TEXTURE_2D; 2477 glDisable GL_TEXTURE_2D;
1959} 2478}
1960 2479
1961############################################################################# 2480#############################################################################
1962 2481
1963package CFClient::UI::Image; 2482package CFPlus::UI::Image;
1964 2483
1965our @ISA = CFClient::UI::Base::; 2484our @ISA = CFPlus::UI::Base::;
1966 2485
1967use CFClient::OpenGL; 2486use CFPlus::OpenGL;
1968use Carp qw/confess/;
1969 2487
1970our %loaded_images; 2488our %texture_cache;
1971 2489
1972sub new { 2490sub new {
1973 my $class = shift; 2491 my $class = shift;
1974 2492
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2493 my $self = $class->SUPER::new (
2494 can_events => 0,
2495 @_,
2496 );
1976 2497
1977 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2498 $self->{path} || $self->{tex}
2499 or Carp::croak "'path' or 'tex' attributes required";
1978 2500
1979 $loaded_images{$self->{image}} ||= 2501 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2502 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1981 2503
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2504 CFPlus::weaken $texture_cache{$self->{path}};
1983 2505
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2506 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2507
1988 $self 2508 $self
1989} 2509}
1990 2510
2511sub STORABLE_freeze {
2512 my ($self, $cloning) = @_;
2513
2514 $self->{path}
2515 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2516
2517 $self->{path}
2518}
2519
2520sub STORABLE_attach {
2521 my ($self, $cloning, $path) = @_;
2522
2523 $self->new (path => $path)
2524}
2525
1991sub size_request { 2526sub size_request {
1992 my ($self) = @_; 2527 my ($self) = @_;
1993 2528
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2529 ($self->{tex}{w}, $self->{tex}{h})
1995} 2530}
1996 2531
1997sub _draw { 2532sub _draw {
1998 my ($self) = @_; 2533 my ($self) = @_;
1999 2534
2009 } 2544 }
2010 2545
2011 glEnable GL_TEXTURE_2D; 2546 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2548
2014 $tex->draw_quad_alpha (0, 0, $w, $h); 2549 $tex->draw_quad (0, 0, $w, $h);
2015 2550
2016 glDisable GL_TEXTURE_2D; 2551 glDisable GL_TEXTURE_2D;
2017} 2552}
2018 2553
2019############################################################################# 2554#############################################################################
2020 2555
2556package CFPlus::UI::ImageButton;
2557
2558our @ISA = CFPlus::UI::Image::;
2559
2560use CFPlus::OpenGL;
2561
2562my %textures;
2563
2564sub new {
2565 my $class = shift;
2566
2567 my $self = $class->SUPER::new (
2568 padding_x => 4,
2569 padding_y => 4,
2570 fg => [1, 1, 1],
2571 active_fg => [0, 0, 1],
2572 can_hover => 1,
2573 align => 0,
2574 valign => 0,
2575 can_events => 1,
2576 @_
2577 );
2578}
2579
2580sub invoke_button_up {
2581 my ($self, $ev, $x, $y) = @_;
2582
2583 $self->emit ("activate")
2584 if $x >= 0 && $x < $self->{w}
2585 && $y >= 0 && $y < $self->{h};
2586
2587 1
2588}
2589
2590#############################################################################
2591
2021package CFClient::UI::VGauge; 2592package CFPlus::UI::VGauge;
2022 2593
2023our @ISA = CFClient::UI::Base::; 2594our @ISA = CFPlus::UI::Base::;
2024 2595
2025use List::Util qw(min max); 2596use List::Util qw(min max);
2026 2597
2027use CFClient::OpenGL; 2598use CFPlus::OpenGL;
2028 2599
2029my %tex = ( 2600my %tex = (
2030 food => [ 2601 food => [
2031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2602 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2603 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033 ], 2604 ],
2034 grace => [ 2605 grace => [
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2606 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/ 2607 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2037 ], 2608 ],
2038 hp => [ 2609 hp => [
2039 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2610 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2611 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041 ], 2612 ],
2042 mana => [ 2613 mana => [
2043 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2614 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/ 2615 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2045 ], 2616 ],
2046); 2617);
2047 2618
2048# eg. VGauge->new (gauge => 'food'), default gauge: food 2619# eg. VGauge->new (gauge => 'food'), default gauge: food
2108 my $ycut1 = max 0, min 1, $ycut; 2679 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2680 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2681
2111 my $h1 = $self->{h} * (1 - $ycut1); 2682 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2683 my $h2 = $self->{h} * (1 - $ycut2);
2684 my $h3 = $self->{h};
2685
2686 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2113 2687
2114 glEnable GL_BLEND; 2688 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2689 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2690 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2691 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2692 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2693
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2694 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2695 glBegin GL_QUADS;
2135 2710
2136 if ($t3) { 2711 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2712 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2713 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2714 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2715 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2716 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2717 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2718 glEnd;
2144 } 2719 }
2145 2720
2146 glDisable GL_BLEND; 2721 glDisable GL_BLEND;
2147 glDisable GL_TEXTURE_2D; 2722 glDisable GL_TEXTURE_2D;
2148} 2723}
2149 2724
2150############################################################################# 2725#############################################################################
2151 2726
2152package CFClient::UI::Gauge; 2727package CFPlus::UI::Gauge;
2153 2728
2154our @ISA = CFClient::UI::VBox::; 2729our @ISA = CFPlus::UI::VBox::;
2155 2730
2156sub new { 2731sub new {
2157 my ($class, %arg) = @_; 2732 my ($class, %arg) = @_;
2158 2733
2159 my $self = $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2161 can_hover => 1, 2736 can_hover => 1,
2162 can_events => 1, 2737 can_events => 1,
2163 %arg, 2738 %arg,
2164 ); 2739 );
2165 2740
2166 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2741 $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); 2742 $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"); 2743 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2169 2744
2170 $self 2745 $self
2171} 2746}
2172 2747
2173sub set_fontsize { 2748sub set_fontsize {
2194 $self->{value}->set_text ($val); 2769 $self->{value}->set_text ($val);
2195} 2770}
2196 2771
2197############################################################################# 2772#############################################################################
2198 2773
2199package CFClient::UI::Slider; 2774package CFPlus::UI::Slider;
2200 2775
2201use strict; 2776use strict;
2202 2777
2203use CFClient::OpenGL; 2778use CFPlus::OpenGL;
2204 2779
2205our @ISA = CFClient::UI::DrawBG::; 2780our @ISA = CFPlus::UI::DrawBG::;
2206 2781
2207my @tex = 2782my @tex =
2208 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2783 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209 qw(s1_slider.png s1_slider_bg.png); 2784 qw(s1_slider.png s1_slider_bg.png);
2210 2785
2211sub new { 2786sub new {
2212 my $class = shift; 2787 my $class = shift;
2213 2788
2234 $self->update; 2809 $self->update;
2235 2810
2236 $self 2811 $self
2237} 2812}
2238 2813
2239sub changed { }
2240
2241sub set_range { 2814sub set_range {
2242 my ($self, $range) = @_; 2815 my ($self, $range) = @_;
2243 2816
2244 ($range, $self->{range}) = ($self->{range}, $range); 2817 ($range, $self->{range}) = ($self->{range}, $range);
2245 2818
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2819 if ("@$range" ne "@{$self->{range}}") {
2820 $self->update;
2821 $self->set_value ($self->{range}[0]);
2822 }
2248} 2823}
2249 2824
2250sub set_value { 2825sub set_value {
2251 my ($self, $value) = @_; 2826 my ($self, $value) = @_;
2252 2827
2263 if $unit; 2838 if $unit;
2264 2839
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2840 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2841
2267 if ($value != $old_value) { 2842 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2843 $self->emit (changed => $value);
2269 $self->update; 2844 $self->update;
2270 } 2845 }
2271} 2846}
2272 2847
2273sub size_request { 2848sub size_request {
2274 my ($self) = @_; 2849 my ($self) = @_;
2275 2850
2276 ($self->{req_w}, $self->{req_h}) 2851 ($self->{req_w}, $self->{req_h})
2277} 2852}
2278 2853
2279sub button_down { 2854sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2855 my ($self, $ev, $x, $y) = @_;
2281 2856
2282 $self->SUPER::button_down ($ev, $x, $y); 2857 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2858
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2860
2286 $self->mouse_motion ($ev, $x, $y); 2861 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2862}
2288 2863
2289sub mouse_motion { 2864sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2865 my ($self, $ev, $x, $y) = @_;
2291 2866
2292 if ($GRAB == $self) { 2867 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2868 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2869
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2870 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2871
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2872 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2873
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2874 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2875 } else {
2876 return 0;
2877 }
2878
2300 } 2879 1
2880}
2881
2882sub invoke_mouse_wheel {
2883 my ($self, $ev) = @_;
2884
2885 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2886
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890
2891 ! ! $delta
2301} 2892}
2302 2893
2303sub update { 2894sub update {
2304 my ($self) = @_; 2895 my ($self) = @_;
2305 2896
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2897 delete $self->{knob_w};
2898 $self->SUPER::update;
2899}
2900
2901sub _draw {
2902 my ($self) = @_;
2903
2904 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2905 $self->set_value ($self->{range}[0]);
2308 2906
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2907 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2908 my $range = ($hi - $page - $lo) || 1e-100;
2311 2909
2317 $value = ($value - $lo) / $range; 2915 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2916 $value = $value * $self->{scale} + $self->{offset};
2319 2917
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2918 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2919 $self->{knob_w} = $knob_w;
2322 }); 2920 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2921
2330 $self->SUPER::_draw (); 2922 $self->SUPER::_draw ();
2331 2923
2332 glScale $self->{w}, $self->{h}; 2924 glScale $self->{w}, $self->{h};
2333 2925
2353 glDisable GL_TEXTURE_2D; 2945 glDisable GL_TEXTURE_2D;
2354} 2946}
2355 2947
2356############################################################################# 2948#############################################################################
2357 2949
2358package CFClient::UI::ValSlider; 2950package CFPlus::UI::ValSlider;
2359 2951
2360our @ISA = CFClient::UI::HBox::; 2952our @ISA = CFPlus::UI::HBox::;
2361 2953
2362sub new { 2954sub new {
2363 my ($class, %arg) = @_; 2955 my ($class, %arg) = @_;
2364 2956
2365 my $range = delete $arg{range}; 2957 my $range = delete $arg{range};
2366 2958
2367 my $self = $class->SUPER::new ( 2959 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2960 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2961 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift }, 2962 to_value => sub { shift },
2371 from_value => sub { shift }, 2963 from_value => sub { shift },
2372 %arg, 2964 %arg,
2373 ); 2965 );
2374 2966
2394sub set_range { shift->{slider}->set_range (@_) } 2986sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2987sub set_value { shift->{slider}->set_value (@_) }
2396 2988
2397############################################################################# 2989#############################################################################
2398 2990
2399package CFClient::UI::TextView; 2991package CFPlus::UI::TextScroller;
2400 2992
2401our @ISA = CFClient::UI::HBox::; 2993our @ISA = CFPlus::UI::HBox::;
2402 2994
2403use CFClient::OpenGL; 2995use CFPlus::OpenGL;
2404 2996
2405sub new { 2997sub new {
2406 my $class = shift; 2998 my $class = shift;
2407 2999
2408 my $self = $class->SUPER::new ( 3000 my $self = $class->SUPER::new (
2409 fontsize => 1, 3001 fontsize => 1,
2410 can_events => 0, 3002 can_events => 1,
3003 indent => 0,
2411 #font => default_font 3004 #font => default_font
2412 @_, 3005 @_,
2413 3006
2414 layout => (new CFClient::Layout 1), 3007 layout => (new CFPlus::Layout),
2415 par => [], 3008 par => [],
3009 max_par => 0,
2416 height => 0, 3010 height => 0,
2417 children => [ 3011 children => [
2418 (new CFClient::UI::Empty expand => 1), 3012 (new CFPlus::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 3013 (new CFPlus::UI::Slider vertical => 1),
2420 ], 3014 ],
2421 ); 3015 );
2422 3016
2423 $self->{children}[1]->connect (changed => sub { $self->update }); 3017 $self->{children}[1]->connect (changed => sub { $self->update });
2424 3018
2430 3024
2431 $self->{fontsize} = $fontsize; 3025 $self->{fontsize} = $fontsize;
2432 $self->reflow; 3026 $self->reflow;
2433} 3027}
2434 3028
3029sub size_request {
3030 my ($self) = @_;
3031
3032 my ($empty, $slider) = @{ $self->{children} };
3033
3034 local $self->{children} = [$empty, $slider];
3035 $self->SUPER::size_request
3036}
3037
2435sub size_allocate { 3038sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2437 3040
2438 $self->SUPER::size_allocate ($w, $h); 3041 my ($empty, $slider, @other) = @{ $self->{children} };
3042 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 3043
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3044 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3045 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 3046 $self->{layout}->set_width ($empty->{w});
3047 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 3048
2444 $self->reflow; 3049 $self->reflow;
2445}
2446 3050
2447sub text_size { 3051 local $self->{children} = [$empty, $slider];
3052 $self->SUPER::invoke_size_allocate ($w, $h)
3053}
3054
3055sub invoke_mouse_wheel {
2448 my ($self, $text, $indent) = @_; 3056 my ($self, $ev) = @_;
3057
3058 return 0 unless $ev->{dy}; # only vertical movements
3059
3060 $self->{children}[1]->emit (mouse_wheel => $ev);
3061
3062 1
3063}
3064
3065sub get_layout {
3066 my ($self, $para) = @_;
2449 3067
2450 my $layout = $self->{layout}; 3068 my $layout = $self->{layout};
2451 3069
3070 $layout->set_font ($self->{font}) if $self->{font};
3071 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3072 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 3073 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3074 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 3075 $layout->set_markup ($para->{markup});
3076
3077 $layout->set_shapes (
3078 map
3079 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3080 @{$para->{widget}}
2455 3081 );
3082
2456 $layout->size 3083 $layout
2457} 3084}
2458 3085
2459sub reflow { 3086sub reflow {
2460 my ($self) = @_; 3087 my ($self) = @_;
2461 3088
2468 3095
2469 # todo: base offset on lines or so, not on pixels 3096 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset); 3097 $self->{children}[1]->set_value ($offset);
2471} 3098}
2472 3099
3100sub current_paragraph {
3101 my ($self) = @_;
3102
3103 $self->{top_paragraph} - 1
3104}
3105
3106sub scroll_to {
3107 my ($self, $para) = @_;
3108
3109 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3110
3111 $self->{scroll_to} = $para;
3112 $self->update;
3113}
3114
2473sub clear { 3115sub clear {
2474 my ($self) = @_; 3116 my ($self) = @_;
3117
3118 my (undef, undef, @other) = @{ $self->{children} };
3119 $self->remove ($_) for @other;
2475 3120
2476 $self->{par} = []; 3121 $self->{par} = [];
2477 $self->{height} = 0; 3122 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3123 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 3124}
2480 3125
2481sub add_paragraph { 3126sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 3127 my $self = shift;
2483 3128
2484 for my $line (split /\n/, $text) { 3129 for my $para (@_) {
2485 my ($w, $h) = $self->text_size ($line); 3130 $para = {
3131 fg => [1, 1, 1, 1],
3132 indent => 0,
3133 markup => "",
3134 widget => [],
3135 ref $para ? %$para : (markup => $para),
3136 w => 1e10,
3137 wrapped => 1,
3138 };
3139
3140 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3141 push @{$self->{par}}, $para;
3142 }
3143
3144 if (my $max = $self->{max_par}) {
3145 shift @{$self->{par}} while @{$self->{par}} > $max;
3146 }
3147
3148 $self->{need_reflow}++;
3149 $self->update;
3150}
3151
3152sub scroll_to_bottom {
3153 my ($self) = @_;
3154
3155 $self->{scroll_to} = $#{$self->{par}};
3156 $self->update;
3157}
3158
3159sub force_uptodate {
3160 my ($self) = @_;
3161
3162 if (delete $self->{need_reflow}) {
3163 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3164
3165 my $height = 0;
3166
3167 for my $para (@{$self->{par}}) {
3168 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3169 my $layout = $self->get_layout ($para);
3170 my ($w, $h) = $layout->size;
3171
3172 $para->{w} = $w + $para->{indent};
3173 $para->{h} = $h;
3174 $para->{wrapped} = $layout->has_wrapped;
3175 }
3176
3177 $para->{y} = $height;
3178 $height += $para->{h};
3179 }
3180
2486 $self->{height} += $h; 3181 $self->{height} = $height;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3182 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488 }
2489 3183
2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3184 delete $self->{texture};
3185 }
3186
3187 if (my $paridx = delete $self->{scroll_to}) {
3188 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3189 }
2491} 3190}
2492 3191
2493sub update { 3192sub update {
2494 my ($self) = @_; 3193 my ($self) = @_;
2495 3194
2497 3196
2498 return unless $self->{h} > 0; 3197 return unless $self->{h} > 0;
2499 3198
2500 delete $self->{texture}; 3199 delete $self->{texture};
2501 3200
2502 $ROOT->on_post_alloc ($self, sub { 3201 $ROOT->on_post_alloc ($self => sub {
3202 $self->force_uptodate;
3203
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3204 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 3205
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 { 3206 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 3207 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 3208 glClear GL_COLOR_BUFFER_BIT;
2534 3209
3210 package CFPlus::UI::Base;
3211 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3212 (0, 0, $self->{w}, $self->{h});
3213
3214 my $top = int $self->{children}[1]{range}[0];
3215
3216 my $paridx = 0;
3217 my $top_paragraph;
2535 my $top = int $self->{children}[1]{range}[0]; 3218 my $top = int $self->{children}[1]{range}[0];
2536 3219
2537 my $y0 = $top; 3220 my $y0 = $top;
2538 my $y1 = $top + $H; 3221 my $y1 = $top + $H;
2539 3222
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}}) { 3223 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 3224 my $h = $para->{h};
3225 my $y = $para->{y};
2552 3226
2553 if ($y0 < $y + $h && $y < $y1) { 3227 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 3228 my $layout = $self->get_layout ($para);
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 3229
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3230 $layout->render ($para->{indent}, $y - $y0);
2559 3231
2560 glRasterPos $par->[3], $y - $y0; 3232 if (my @w = @{ $para->{widget} }) {
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3233 my @s = $layout->get_shapes;
3234
3235 for (@w) {
3236 my ($dx, $dy) = splice @s, 0, 2, ();
3237
3238 $_->{x} = $dx + $para->{indent};
3239 $_->{y} = $dy + $y - $y0;
3240
3241 $_->draw;
3242 }
3243 }
2562 } 3244 }
2563 3245
2564 $y += $h; 3246 $paridx++;
3247 $top_paragraph ||= $paridx if $y >= $top;
2565 } 3248 }
2566 3249
2567 glDisable GL_BLEND; 3250 $self->{top_paragraph} = $top_paragraph;
2568 }; 3251 };
2569 }); 3252 });
2570} 3253}
2571 3254
3255sub reconfigure {
3256 my ($self) = @_;
3257
3258 $self->SUPER::reconfigure;
3259
3260 $_->{w} = 1e10 for @{ $self->{par} };
3261 $self->reflow;
3262}
3263
2572sub _draw { 3264sub _draw {
2573 my ($self) = @_; 3265 my ($self) = @_;
2574 3266
2575 glEnable GL_TEXTURE_2D; 3267 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3268 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 3269 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3270 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 3271 glDisable GL_TEXTURE_2D;
2580 3272
2581 $self->{children}[1]->draw; 3273 $self->{children}[1]->draw;
2582
2583} 3274}
2584 3275
2585############################################################################# 3276#############################################################################
2586 3277
2587package CFClient::UI::Animator; 3278package CFPlus::UI::Animator;
2588 3279
2589use CFClient::OpenGL; 3280use CFPlus::OpenGL;
2590 3281
2591our @ISA = CFClient::UI::Bin::; 3282our @ISA = CFPlus::UI::Bin::;
2592 3283
2593sub moveto { 3284sub moveto {
2594 my ($self, $x, $y) = @_; 3285 my ($self, $x, $y) = @_;
2595 3286
2596 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3287 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
2624 glPopMatrix; 3315 glPopMatrix;
2625} 3316}
2626 3317
2627############################################################################# 3318#############################################################################
2628 3319
2629package CFClient::UI::Flopper; 3320package CFPlus::UI::Flopper;
2630 3321
2631our @ISA = CFClient::UI::Button::; 3322our @ISA = CFPlus::UI::Button::;
2632 3323
2633sub new { 3324sub new {
2634 my $class = shift; 3325 my $class = shift;
2635 3326
2636 my $self = $class->SUPER::new ( 3327 my $self = $class->SUPER::new (
2648 $self->{other}->toggle_visibility; 3339 $self->{other}->toggle_visibility;
2649} 3340}
2650 3341
2651############################################################################# 3342#############################################################################
2652 3343
2653package CFClient::UI::Tooltip; 3344package CFPlus::UI::Tooltip;
2654 3345
2655our @ISA = CFClient::UI::Bin::; 3346our @ISA = CFPlus::UI::Bin::;
2656 3347
2657use CFClient::OpenGL; 3348use CFPlus::OpenGL;
2658 3349
2659sub new { 3350sub new {
2660 my $class = shift; 3351 my $class = shift;
2661 3352
2662 $class->SUPER::new ( 3353 $class->SUPER::new (
2665 ) 3356 )
2666} 3357}
2667 3358
2668sub set_tooltip_from { 3359sub set_tooltip_from {
2669 my ($self, $widget) = @_; 3360 my ($self, $widget) = @_;
3361
3362 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363 if $widget->{tooltip} =~ /^#(.*)$/;
2670 3364
2671 my $tooltip = $widget->{tooltip}; 3365 my $tooltip = $widget->{tooltip};
2672 3366
2673 if ($ENV{CFPLUS_DEBUG} & 2) { 3367 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 3368 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3369 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 3370 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 3371 . "visible $widget->{visible}";
2678 } 3372 }
2679 3373
3374 $tooltip =~ s/^\n+//;
3375 $tooltip =~ s/\n+$//;
3376
2680 $self->add (new CFClient::UI::Label 3377 $self->add (new CFPlus::UI::Label
2681 markup => $tooltip, 3378 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3379 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 3380 fontsize => 0.8,
2684 fg => [0, 0, 0, 1], 3381 style => 1, # FLAG_INVERSE
2685 ellipsise => 0, 3382 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP), 3383 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 ); 3384 );
2688} 3385}
2689 3386
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3390 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 3391
2695 ($w + 4, $h + 4) 3392 ($w + 4, $h + 4)
2696} 3393}
2697 3394
2698sub size_allocate { 3395sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 3396 my ($self, $w, $h) = @_;
2700 3397
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 3398 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 3399}
2703 3400
2704sub visibility_change { 3401sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 3402 my ($self, $visible) = @_;
2706 3403
2707 return unless $visible; 3404 return unless $visible;
2708 3405
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 3406 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner} 3407 my $widget = $self->{owner}
2711 or return; 3408 or return;
2712 3409
3410 if ($widget->{visible}) {
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3411 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 3412
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3413 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 3414 if $x + $self->{w} > $self->{root}{w};
2717 3415
2718 $self->move_abs ($x, $y); 3416 $self->move_abs ($x, $y);
3417 } else {
3418 $self->hide;
3419 }
2719 }); 3420 });
2720} 3421}
2721 3422
2722sub _draw { 3423sub _draw {
2723 my ($self) = @_; 3424 my ($self) = @_;
2747 $self->SUPER::_draw; 3448 $self->SUPER::_draw;
2748} 3449}
2749 3450
2750############################################################################# 3451#############################################################################
2751 3452
2752package CFClient::UI::Face; 3453package CFPlus::UI::Face;
2753 3454
2754our @ISA = CFClient::UI::Base::; 3455our @ISA = CFPlus::UI::DrawBG::;
2755 3456
2756use CFClient::OpenGL; 3457use CFPlus::OpenGL;
2757 3458
2758sub new { 3459sub new {
2759 my $class = shift; 3460 my $class = shift;
2760 3461
2761 my $self = $class->SUPER::new ( 3462 my $self = $class->SUPER::new (
3463 size_w => 32,
3464 size_h => 8,
2762 aspect => 1, 3465 aspect => 1,
2763 can_events => 0, 3466 can_events => 0,
2764 @_, 3467 @_,
2765 ); 3468 );
2766 3469
2767 if ($self->{anim} && $self->{animspeed}) { 3470 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self); 3471 CFPlus::weaken (my $widget = $self);
2769 3472
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2770 $self->{timer} = Event->timer ( 3475 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1, 3476 parked => 1,
2773 interval => $self->{animspeed},
2774 cb => sub { 3477 cb => sub {
3478 return unless $::CONN && $widget;
3479
2775 ++$widget->{frame}; 3480 ++$widget->{frame};
3481 $widget->update_face;
2776 $widget->update; 3482 $widget->update;
3483
3484 $widget->update_timer;
2777 }, 3485 },
2778 ); 3486 );
3487
3488 $self->update_face;
3489 $self->update_timer;
2779 } 3490 }
2780 3491
2781 $self 3492 $self
2782} 3493}
2783 3494
3495sub update_timer {
3496 my ($self) = @_;
3497
3498 return unless $self->{timer};
3499
3500 if ($self->{visible}) {
3501 $self->{timer}->at (
3502 $self->{anim_start}
3503 + $self->{animspeed}
3504 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3505 );
3506 $self->{timer}->start;
3507 } else {
3508 $self->{timer}->stop;
3509 }
3510}
3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
2784sub size_request { 3525sub size_request {
2785 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
2786} 3541}
2787 3542
2788sub update { 3543sub update {
2789 my ($self) = @_; 3544 my ($self) = @_;
2790 3545
2791 return unless $self->{visible}; 3546 return unless $self->{visible};
2792 3547
2793 $self->SUPER::update; 3548 $self->SUPER::update;
2794} 3549}
2795 3550
3551sub invoke_visibility_change {
3552 my ($self) = @_;
3553
3554 $self->update_timer;
3555
3556 0
3557}
3558
2796sub _draw { 3559sub _draw {
2797 my ($self) = @_; 3560 my ($self) = @_;
2798 3561
2799 return unless $::CONN; 3562 return unless $::CONN;
2800 3563
2801 my $face; 3564 $self->SUPER::_draw;
2802 3565
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}]; 3566 my $faceid = $::CONN->{faceid}[$self->{face}]
2805 3567 or return;
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809 3568
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3569 my $tex = $::CONN->{texture}[$faceid];
2811 3570
2812 if ($tex) { 3571 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3572 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3574 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3575 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3576 glDisable GL_TEXTURE_2D;
2818 } 3577 }
2819} 3578}
2820 3579
2821sub DESTROY { 3580sub destroy {
2822 my ($self) = @_; 3581 my ($self) = @_;
2823 3582
2824 $self->{timer}->cancel 3583 (delete $self->{timer})->cancel
2825 if $self->{timer}; 3584 if $self->{timer};
2826 3585
2827 $self->SUPER::DESTROY; 3586 $self->SUPER::destroy;
2828} 3587}
2829 3588
2830############################################################################# 3589#############################################################################
2831 3590
3591package CFPlus::UI::Buttonbar;
3592
3593our @ISA = CFPlus::UI::HBox::;
3594
3595# TODO: should actually wrap buttons and other goodies.
3596
3597#############################################################################
3598
2832package CFClient::UI::Menu; 3599package CFPlus::UI::Menu;
2833 3600
2834our @ISA = CFClient::UI::FancyFrame::; 3601our @ISA = CFPlus::UI::Toplevel::;
2835 3602
2836use CFClient::OpenGL; 3603use CFPlus::OpenGL;
2837 3604
2838sub new { 3605sub new {
2839 my $class = shift; 3606 my $class = shift;
2840 3607
2841 my $self = $class->SUPER::new ( 3608 my $self = $class->SUPER::new (
2842 items => [], 3609 items => [],
2843 z => 100, 3610 z => 100,
2844 @_, 3611 @_,
2845 ); 3612 );
2846 3613
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3614 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848 3615
2849 for my $item (@{ $self->{items} }) { 3616 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3617 my ($widget, $cb, $tooltip) = @$item;
2851 3618
2852 # handle various types of items, only text for now 3619 # handle various types of items, only text for now
2853 if (!ref $widget) { 3620 if (!ref $widget) {
3621 if ($widget =~ /\t/) {
3622 my ($left, $right) = split /\t/, $widget, 2;
3623
2854 $widget = new CFClient::UI::Label 3624 $widget = new CFPlus::UI::HBox
2855 can_hover => 1, 3625 can_hover => 1,
2856 can_events => 1, 3626 can_events => 1,
3627 tooltip => $tooltip,
3628 children => [
3629 (new CFPlus::UI::Label markup => $left, expand => 1),
3630 (new CFPlus::UI::Label markup => $right, align => +1),
3631 ],
3632 ;
3633
3634 } else {
3635 $widget = new CFPlus::UI::Label
3636 can_hover => 1,
3637 can_events => 1,
2857 text => $widget; 3638 markup => $widget,
3639 tooltip => $tooltip;
3640 }
2858 } 3641 }
2859 3642
2860 $self->{item}{$widget} = $item; 3643 $self->{item}{$widget} = $item;
2861 3644
2862 $self->{vbox}->add ($widget); 3645 $self->{vbox}->add ($widget);
2867 3650
2868# popup given the event (must be a mouse button down event currently) 3651# popup given the event (must be a mouse button down event currently)
2869sub popup { 3652sub popup {
2870 my ($self, $ev) = @_; 3653 my ($self, $ev) = @_;
2871 3654
2872 $self->_emit ("popdown"); 3655 $self->emit ("popdown");
2873 3656
2874 # maybe save $GRAB? must be careful about events... 3657 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3658 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3659 $self->{button} = $ev->{button};
2877 3660
2878 $self->show; 3661 $self->show;
2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3662 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3663}
2881 3664
2882sub mouse_motion { 3665sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3666 my ($self, $ev, $x, $y) = @_;
2884 3667
2885 # TODO: should use vbox->find_widget or so 3668 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3669 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3670 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3671
3672 0
3673}
3674
2890sub button_up { 3675sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3676 my ($self, $ev, $x, $y) = @_;
2892 3677
2893 if ($ev->{button} == $self->{button}) { 3678 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3679 undef $GRAB;
2895 $self->hide; 3680 $self->hide;
2896 3681
2897 $self->_emit ("popdown"); 3682 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3683 $self->{hover}[1]->() if $self->{hover};
3684 } else {
3685 return 0
3686 }
3687
2899 } 3688 1
2900} 3689}
2901 3690
2902############################################################################# 3691#############################################################################
2903 3692
2904package CFClient::UI::Statusbox; 3693package CFPlus::UI::Multiplexer;
2905 3694
2906our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::Container::;
2907 3696
2908sub new { 3697sub new {
2909 my $class = shift; 3698 my $class = shift;
2910 3699
2911 $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3701 @_,
3702 );
3703
3704 $self->{current} = $self->{children}[0]
3705 if @{ $self->{children} };
3706
3707 $self
3708}
3709
3710sub add {
3711 my ($self, @widgets) = @_;
3712
3713 $self->SUPER::add (@widgets);
3714
3715 $self->{current} = $self->{children}[0]
3716 if @{ $self->{children} };
3717}
3718
3719sub get_current_page {
3720 my ($self) = @_;
3721
3722 $self->{current}
3723}
3724
3725sub set_current_page {
3726 my ($self, $page_or_widget) = @_;
3727
3728 my $widget = ref $page_or_widget
3729 ? $page_or_widget
3730 : $self->{children}[$page_or_widget];
3731
3732 $self->{current} = $widget;
3733 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3734
3735 $self->emit (page_changed => $self->{current});
3736
3737 $self->realloc;
3738}
3739
3740sub visible_children {
3741 $_[0]{current}
3742}
3743
3744sub size_request {
3745 my ($self) = @_;
3746
3747 $self->{current}->size_request
3748}
3749
3750sub invoke_size_allocate {
3751 my ($self, $w, $h) = @_;
3752
3753 $self->{current}->configure (0, 0, $w, $h);
3754
3755 1
3756}
3757
3758sub _draw {
3759 my ($self) = @_;
3760
3761 $self->{current}->draw;
3762}
3763
3764#############################################################################
3765
3766package CFPlus::UI::Notebook;
3767
3768our @ISA = CFPlus::UI::VBox::;
3769
3770sub new {
3771 my $class = shift;
3772
3773 my $self = $class->SUPER::new (
3774 buttonbar => (new CFPlus::UI::Buttonbar),
3775 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3776 # filter => # will be put between multiplexer and $self
3777 @_,
3778 );
3779
3780 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3781 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3782
3783 $self
3784}
3785
3786sub add {
3787 my ($self, $title, $widget, $tooltip) = @_;
3788
3789 CFPlus::weaken $self;
3790
3791 $self->{buttonbar}->add (new CFPlus::UI::Button
3792 markup => $title,
3793 tooltip => $tooltip,
3794 on_activate => sub { $self->set_current_page ($widget) },
3795 );
3796
3797 $self->{multiplexer}->add ($widget);
3798}
3799
3800sub get_current_page {
3801 my ($self) = @_;
3802
3803 $self->{multiplexer}->get_current_page
3804}
3805
3806sub set_current_page {
3807 my ($self, $page) = @_;
3808
3809 $self->{multiplexer}->set_current_page ($page);
3810 $self->emit (page_changed => $self->{multiplexer}{current});
3811}
3812
3813#############################################################################
3814
3815package CFPlus::UI::Selector;
3816
3817use utf8;
3818
3819our @ISA = CFPlus::UI::Button::;
3820
3821sub new {
3822 my $class = shift;
3823
3824 my $self = $class->SUPER::new (
3825 options => [], # [value, title, longdesc], ...
3826 value => undef,
3827 @_,
3828 );
3829
3830 $self->_set_value ($self->{value});
3831
3832 $self
3833}
3834
3835sub invoke_button_down {
3836 my ($self, $ev) = @_;
3837
3838 my @menu_items;
3839
3840 for (@{ $self->{options} }) {
3841 my ($value, $title, $tooltip) = @$_;
3842
3843 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3844 }
3845
3846 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3847}
3848
3849sub _set_value {
3850 my ($self, $value) = @_;
3851
3852 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3853 or return;
3854
3855 $self->{value} = $item->[0];
3856 $self->set_markup ("$item->[1] ⇓");
3857 $self->set_tooltip ($item->[2]);
3858}
3859
3860sub set_value {
3861 my ($self, $value) = @_;
3862
3863 return unless $self->{value} ne $value;
3864
3865 $self->_set_value ($value);
3866 $self->emit (changed => $value);
3867}
3868
3869#############################################################################
3870
3871package CFPlus::UI::Statusbox;
3872
3873our @ISA = CFPlus::UI::VBox::;
3874
3875sub new {
3876 my $class = shift;
3877
3878 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3879 fontsize => 0.8,
2913 @_, 3880 @_,
2914 ) 3881 );
3882
3883 CFPlus::weaken (my $this = $self);
3884
3885 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3886
3887 $self
2915} 3888}
2916 3889
2917sub reorder { 3890sub reorder {
2918 my ($self) = @_; 3891 my ($self) = @_;
2919 my $NOW = time; 3892 my $NOW = Time::HiRes::time;
3893
3894 # freeze display when hovering over any label
3895 return if $CFPlus::UI::TOOLTIP->{owner}
3896 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3897 values %{ $self->{item} };
2920 3898
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3899 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3900 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3901 }
2924 3902
2927 my @items = sort { 3905 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3906 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3907 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3908 } values %{ $self->{item} };
2931 3909
3910 $self->{timer}->interval (1);
3911
2932 my $count = 10 + 1; 3912 my $count = 10 + 1;
2933 for my $item (@items) { 3913 for my $item (@items) {
2934 last unless --$count; 3914 last unless --$count;
2935 3915
2936 push @widgets, $item->{label} ||= do { 3916 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3917 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3918 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3919 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3920 : $item->{text};
2941 3921
2942 for ($short) { 3922 for ($short) {
2943 s/^\s+//; 3923 s/^\s+//;
2944 s/\s+/ /g; 3924 s/\s+/ /g;
2945 } 3925 }
2946 3926
2947 new CFClient::UI::Label 3927 new CFPlus::UI::Label
2948 markup => $short, 3928 markup => $short,
2949 tooltip => $item->{tooltip}, 3929 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3930 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3931 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3932 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3933 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3934 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3935 can_events => 1,
2956 can_hover => 1 3936 can_hover => 1
2957 }; 3937 };
3938
3939 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3940 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3941 $label->update;
3942 $label->set_max_size (undef, $label->{req_h} * $diff)
3943 if $diff < 1;
3944 $self->{timer}->interval (1/30);
3945 } else {
3946 $label->{fg}[3] = $item->{fg}[3] || 1;
3947 }
3948
3949 push @widgets, $label;
2958 } 3950 }
2959 3951
2960 $self->clear; 3952 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3953 $self->SUPER::add (reverse @widgets);
2962} 3954}
2967 $text =~ s/^\s+//; 3959 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3960 $text =~ s/\s+$//;
2969 3961
2970 return unless $text; 3962 return unless $text;
2971 3963
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3964 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3965
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3966 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3967
2976 if (my $item = $self->{item}{$group}) { 3968 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3969 if ($item->{text} eq $text) {
2978 $item->{count}++; 3970 $item->{count}++;
2979 } else { 3971 } else {
2980 $item->{count} = 1; 3972 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3973 $item->{text} = $item->{tooltip} = $text;
2982 } 3974 }
2983 $item->{id} = ++$self->{id}; 3975 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3976 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3977 delete $item->{label};
2986 } else { 3978 } else {
2987 $self->{item}{$group} = { 3979 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3980 id => ++$self->{id},
2994 count => 1, 3986 count => 1,
2995 %arg, 3987 %arg,
2996 }; 3988 };
2997 } 3989 }
2998 3990
3991 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3992 $self->reorder;
3993 });
3000} 3994}
3001 3995
3002sub reconfigure { 3996sub reconfigure {
3003 my ($self) = @_; 3997 my ($self) = @_;
3004 3998
3007 4001
3008 $self->reorder; 4002 $self->reorder;
3009 $self->SUPER::reconfigure; 4003 $self->SUPER::reconfigure;
3010} 4004}
3011 4005
4006sub destroy {
4007 my ($self) = @_;
4008
4009 $self->{timer}->cancel;
4010
4011 $self->SUPER::destroy;
4012}
4013
3012############################################################################# 4014#############################################################################
3013 4015
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
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
3310package CFClient::UI::Root; 4016package CFPlus::UI::Root;
3311 4017
3312our @ISA = CFClient::UI::Container::; 4018our @ISA = CFPlus::UI::Container::;
3313 4019
4020use List::Util qw(min max);
4021
3314use CFClient::OpenGL; 4022use CFPlus::OpenGL;
3315 4023
3316sub new { 4024sub new {
3317 my $class = shift; 4025 my $class = shift;
3318 4026
3319 my $self = $class->SUPER::new ( 4027 my $self = $class->SUPER::new (
3320 visible => 1, 4028 visible => 1,
3321 @_, 4029 @_,
3322 ); 4030 );
3323 4031
3324 Scalar::Util::weaken ($self->{root} = $self); 4032 CFPlus::weaken ($self->{root} = $self);
3325 4033
3326 $self 4034 $self
3327} 4035}
3328 4036
3329sub size_request { 4037sub size_request {
3344 $coord = $max - $size if $coord > $max - $size; 4052 $coord = $max - $size if $coord > $max - $size;
3345 4053
3346 int $coord + 0.5 4054 int $coord + 0.5
3347} 4055}
3348 4056
3349sub size_allocate { 4057sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3351 4059
3352 for my $child ($self->children) { 4060 for my $child ($self->children) {
3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3354 4062
3358 $X = _to_pixel $X, $W, $self->{w}; 4066 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 4067 $Y = _to_pixel $Y, $H, $self->{h};
3360 4068
3361 $child->configure ($X, $Y, $W, $H); 4069 $child->configure ($X, $Y, $W, $H);
3362 } 4070 }
4071
4072 1
3363} 4073}
3364 4074
3365sub coord2local { 4075sub coord2local {
3366 my ($self, $x, $y) = @_; 4076 my ($self, $x, $y) = @_;
3367 4077
3452 4162
3453 delete $queue{$widget+0}; 4163 delete $queue{$widget+0};
3454 4164
3455 my ($w, $h) = $widget->size_request; 4165 my ($w, $h) = $widget->size_request;
3456 4166
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4167 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4168 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4169
4170 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4171 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 4172
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 4173 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 4174 $h = $widget->{force_h} if exists $widget->{force_h};
3462 4175
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4176 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491 4204
3492 $w = 0 if $w < 0; 4205 $w = 0 if $w < 0;
3493 $h = 0 if $h < 0; 4206 $h = 0 if $h < 0;
3494 4207
4208 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h;
4210
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216
3495 $w = int $w + 0.5; 4217 $w = int $w + 0.5;
3496 $h = int $h + 0.5; 4218 $h = int $h + 0.5;
3497 4219
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w}; 4221 $widget->{old_w} = $widget->{w};
3509 4231
3510 while ($self->{post_alloc_hook}) { 4232 while ($self->{post_alloc_hook}) {
3511 $_->() 4233 $_->()
3512 for values %{delete $self->{post_alloc_hook}}; 4234 for values %{delete $self->{post_alloc_hook}};
3513 } 4235 }
3514
3515 4236
3516 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4237 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4238 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3518 glClear GL_COLOR_BUFFER_BIT; 4239 glClear GL_COLOR_BUFFER_BIT;
3519 4240
3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4243 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3523 glMatrixMode GL_MODELVIEW; 4244 glMatrixMode GL_MODELVIEW;
3524 glLoadIdentity; 4245 glLoadIdentity;
3525 4246
3526 { 4247 {
3527 package CFClient::UI::Base; 4248 package CFPlus::UI::Base;
3528 4249
3529 ($draw_x, $draw_y, $draw_w, $draw_h) = 4250 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h}); 4251 (0, 0, $self->{w}, $self->{h});
3531 }
3532 4252
3533 $self->_draw; 4253 $self->_draw;
4254 }
3534} 4255}
3535 4256
3536############################################################################# 4257#############################################################################
3537 4258
3538package CFClient::UI; 4259package CFPlus::UI;
3539 4260
3540$ROOT = new CFClient::UI::Root; 4261$ROOT = new CFPlus::UI::Root;
3541$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4262$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3542 4263
35431 42641
3544 4265

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines