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.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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