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

Diff Legend

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