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

Diff Legend

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