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

Diff Legend

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