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

Diff Legend

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