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

Diff Legend

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