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

Diff Legend

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