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

Diff Legend

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