ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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