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

Diff Legend

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