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

Diff Legend

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