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.398 by root, Sat Jul 21 14:32:10 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 120
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
100} 129}
101 130
102sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
103 my ($ev) = @_; 132 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 133
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 135
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 137
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
111 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 140
113 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 143 $grab->update if $grab;
116 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
117 145
118 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
119 } 148 }
120} 149}
121 150
122sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
123 my ($ev) = @_; 152 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
125 154
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 156
128 if ($widget != $HOVER) { 157 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 158
131 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 160 if $HOVER;
139} 161}
140 162
141# convert position array to integers 163# convert position array to integers
142sub harmonize { 164sub harmonize {
… …
171sub rescale_widgets { 193sub rescale_widgets {
172 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
173 195
174 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 197 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 200
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185 207
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 210
189 } 211 }
190 } 212 }
191 213
192 reconfigure_widgets; 214 reconfigure_widgets;
193} 215}
194 216
195############################################################################# 217#############################################################################
196 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
197package CFClient::UI::Base; 227package CFPlus::UI::Base;
198 228
199use strict; 229use strict;
200 230
201use CFClient::OpenGL; 231use CFPlus::OpenGL;
202 232
203sub new { 233sub new {
204 my $class = shift; 234 my $class = shift;
205 235
206 my $self = bless { 236 my $self = bless {
… …
211 h => undef, 241 h => undef,
212 can_events => 1, 242 can_events => 1,
213 @_ 243 @_
214 }, $class; 244 }, $class;
215 245
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 247
218 for (keys %$self) { 248 for (keys %$self) {
219 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
221 } 251 }
222 } 252 }
223 253
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 259
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 262
233 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
238 268
239sub destroy { 269sub destroy {
240 my ($self) = @_; 270 my ($self) = @_;
241 271
242 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
243 %$self = (); 274 %$self = ();
244} 275}
245 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
246sub show { 281sub show {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
249 return if $self->{parent}; 284 return if $self->{parent};
250 285
251 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
252} 287}
253 288
254sub set_visible { 289sub set_visible {
255 my ($self) = @_; 290 my ($self) = @_;
256 291
… …
271 306
272 return unless $self->{visible}; 307 return unless $self->{visible};
273 308
274 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
275 310
311 delete $self->{visible};
276 delete $self->{root}; 312 delete $self->{root};
277 delete $self->{visible};
278 313
279 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
281 316
282 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
284 319
285 $self->focus_out; 320 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
289 323
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
366 404
367 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
368 } 406 }
369} 407}
370 408
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
376} 415}
377 416
378sub set_max_size { 417sub set_max_size {
379 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
380 419
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
383} 424}
384 425
385sub set_tooltip { 426sub set_tooltip {
386 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
387 428
… …
390 431
391 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
392 433
393 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
394 435
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
398 } 439 }
399} 440}
400 441
401# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
402sub coord2local { 443sub coord2local {
403 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
404 445
446 Carp::confess unless $self->{parent};#d#
447
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 449}
407 450
408# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
409sub coord2global { 452sub coord2global {
410 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
411 454
455 Carp::confess unless $self->{parent};#d#
456
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 458}
414 459
415sub focus_in { 460sub invoke_focus_in {
416 my ($self) = @_; 461 my ($self) = @_;
417 462
418 return if $FOCUS == $self; 463 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
420 465
421 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
422 467
423 $self->_emit (focus_in => $focus); 468 $self->update;
424 469
425 $focus->update if $focus; 470 0
426 $FOCUS->update;
427} 471}
428 472
429sub focus_out { 473sub invoke_focus_out {
430 my ($self) = @_; 474 my ($self) = @_;
431 475
432 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
433 477
434 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
435 479
436 $self->_emit (focus_out => $focus); 480 $self->update;
437 481
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 483 unless $FOCUS;
442}
443 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
444sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
445sub button_up { } 496sub invoke_button_up { 0 }
446sub key_down { } 497sub invoke_key_down { 0 }
447sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
448 500
449sub button_down { 501sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
451 503
452 $self->focus_in; 504 $self->grab_focus;
453}
454 505
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
1107sub add {
1108 my ($self, $widget) = @_;
1109
1110 $self->{vp}->add ($self->{child} = $widget);
1111}
1112
956sub update { 1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub start_dragging {
957 my ($self) = @_; 1140 my ($self, $ev) = @_;
958 1141
959 $self->SUPER::update; 1142 $self->grab_focus;
960 1143
961 # todo: overwrite size_allocate of child 1144 my $ox = $self->{vp}{view_x};
962 my $child = $self->{vp}->child; 1145 my $oy = $self->{vp}{view_y};
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1146
964} 1147 $self->{motion} = sub {
1148 my ($ev, $x, $y) = @_;
965 1149
1150 $ox -= $ev->{xrel};
1151 $oy -= $ev->{yrel};
1152
1153 $self->{vp}->set_offset ($ox, $oy);
1154 };
1155}
1156
1157sub invoke_mouse_wheel {
1158 my ($self, $ev) = @_;
1159
1160 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1161 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1162
1163 1
1164}
1165
1166sub invoke_button_down {
1167 my ($self, $ev, $x, $y) = @_;
1168
1169 if ($ev->{button} == 2) {
1170 $self->start_dragging ($ev);
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_button_up {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if (delete $self->{motion}) {
1181 return 1;
1182 }
1183
1184 0
1185}
1186
1187sub invoke_mouse_motion {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($self->{motion}) {
1191 $self->{motion}->($ev, $x, $y);
1192 return 1;
1193 }
1194
1195 0
1196}
1197
966sub size_allocate { 1198sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1199 my ($self, $w, $h) = @_;
968 1200
1201 $self->update_slider;
969 $self->SUPER::size_allocate ($w, $h); 1202 $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} 1203}
974
975#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll
977 1204
978############################################################################# 1205#############################################################################
979 1206
980package CFClient::UI::Frame; 1207package CFPlus::UI::Frame;
981 1208
982our @ISA = CFClient::UI::Bin::; 1209our @ISA = CFPlus::UI::Bin::;
983 1210
984use CFClient::OpenGL; 1211use CFPlus::OpenGL;
985 1212
986sub new { 1213sub new {
987 my $class = shift; 1214 my $class = shift;
988 1215
989 $class->SUPER::new ( 1216 $class->SUPER::new (
… …
997 1224
998 if ($self->{bg}) { 1225 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1226 my ($w, $h) = @$self{qw(w h)};
1000 1227
1001 glEnable GL_BLEND; 1228 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1229 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1230 glColor_premultiply @{ $self->{bg} };
1004 1231
1005 glBegin GL_QUADS; 1232 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1233 glVertex 0 , 0;
1007 glVertex 0 , $h; 1234 glVertex 0 , $h;
1008 glVertex $w, $h; 1235 glVertex $w, $h;
… …
1015 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1016} 1243}
1017 1244
1018############################################################################# 1245#############################################################################
1019 1246
1020package CFClient::UI::FancyFrame; 1247package CFPlus::UI::FancyFrame;
1021 1248
1022our @ISA = CFClient::UI::Bin::; 1249our @ISA = CFPlus::UI::Bin::;
1023 1250
1024use CFClient::OpenGL; 1251use CFPlus::OpenGL;
1252
1253sub new {
1254 my ($class, %arg) = @_;
1255
1256 if ((exists $arg{label}) && !ref $arg{label}) {
1257 $arg{label} = new CFPlus::UI::Label
1258 align => 1,
1259 valign => 0,
1260 text => $arg{label},
1261 fontsize => ($arg{border} || 0.8) * 0.75;
1262 }
1263
1264 my $self = $class->SUPER::new (
1265 # label => "",
1266 fg => [0.6, 0.3, 0.1],
1267 border => 0.8,
1268 style => 'single',
1269 %arg,
1270 );
1271
1272 $self
1273}
1274
1275sub add {
1276 my ($self, @widgets) = @_;
1277
1278 $self->SUPER::add (@widgets);
1279 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1280}
1281
1282sub border {
1283 int $_[0]{border} * $::FONTSIZE
1284}
1285
1286sub size_request {
1287 my ($self) = @_;
1288
1289 ($self->{label_w}, undef) = $self->{label}->size_request
1290 if $self->{label};
1291
1292 my ($w, $h) = $self->SUPER::size_request;
1293
1294 (
1295 $w + $self->border * 2,
1296 $h + $self->border * 2,
1297 )
1298}
1299
1300sub invoke_size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 my $border = $self->border;
1304
1305 $w -= List::Util::max 0, $border * 2;
1306 $h -= List::Util::max 0, $border * 2;
1307
1308 if (my $label = $self->{label}) {
1309 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1310 $label->{h} = List::Util::min $h, $border;
1311 $label->invoke_size_allocate ($label->{w}, $label->{h});
1312 }
1313
1314 $self->child->configure ($border, $border, $w, $h);
1315
1316 1
1317}
1318
1319sub _draw {
1320 my ($self) = @_;
1321
1322 my $child = $self->{children}[0];
1323
1324 my $border = $self->border;
1325 my ($w, $h) = ($self->{w}, $self->{h});
1326
1327 $child->draw;
1328
1329 glColor @{$self->{fg}};
1330 glBegin GL_LINE_STRIP;
1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1337 glEnd;
1338
1339 if ($self->{label}) {
1340 glTranslate $border * 2, 0;
1341 $self->{label}->_draw;
1342 }
1343}
1344
1345#############################################################################
1346
1347package CFPlus::UI::Toplevel;
1348
1349our @ISA = CFPlus::UI::Bin::;
1350
1351use CFPlus::OpenGL;
1025 1352
1026my $bg = 1353my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1354 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1029 1356
1030my @border = 1357my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1358 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); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1033 1360
1361my @icon =
1362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1364
1034sub new { 1365sub new {
1035 my $class = shift; 1366 my ($class, %arg) = @_;
1036 1367
1037 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1371 border => 0.6,
1041 can_events => 1, 1372 can_events => 1,
1042 min_w => 16, 1373 min_w => 64,
1043 min_h => 16, 1374 min_h => 32,
1044 @_ 1375 %arg,
1045 ); 1376 );
1046 1377
1047 $self->{title} &&= new CFClient::UI::Label 1378 $self->{title_widget} = new CFPlus::UI::Label
1048 align => 0, 1379 align => 0,
1049 valign => 1, 1380 valign => 1,
1050 text => $self->{title}, 1381 text => $self->{title},
1051 fontsize => $self->{border}; 1382 fontsize => $self->{border},
1383 if exists $self->{title};
1384
1385 if ($self->{has_close_button}) {
1386 $self->{close_button} =
1387 new CFPlus::UI::ImageButton
1388 path => 'x1_close.png',
1389 on_activate => sub { $self->emit ("delete") };
1390
1391 $self->CFPlus::UI::Container::add ($self->{close_button});
1392 }
1052 1393
1053 $self 1394 $self
1395}
1396
1397sub add {
1398 my ($self, @widgets) = @_;
1399
1400 $self->SUPER::add (@widgets);
1401 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1402 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1054} 1403}
1055 1404
1056sub border { 1405sub border {
1057 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1058} 1407}
1059 1408
1060sub size_request { 1409sub size_request {
1061 my ($self) = @_; 1410 my ($self) = @_;
1411
1412 $self->{title_widget}->size_request
1413 if $self->{title_widget};
1414
1415 $self->{close_button}->size_request
1416 if $self->{close_button};
1062 1417
1063 my ($w, $h) = $self->SUPER::size_request; 1418 my ($w, $h) = $self->SUPER::size_request;
1064 1419
1065 ( 1420 (
1066 $w + $self->border * 2, 1421 $w + $self->border * 2,
1067 $h + $self->border * 2, 1422 $h + $self->border * 2,
1068 ) 1423 )
1069} 1424}
1070 1425
1071sub size_allocate { 1426sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1427 my ($self, $w, $h) = @_;
1073 1428
1429 if ($self->{title_widget}) {
1430 $self->{title_widget}{w} = $w;
1431 $self->{title_widget}{h} = $h;
1432 $self->{title_widget}->invoke_size_allocate ($w, $h);
1433 }
1434
1435 my $border = $self->border;
1436
1074 $h -= List::Util::max 0, $self->border * 2; 1437 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1438 $w -= List::Util::max 0, $border * 2;
1076 1439
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); 1440 $self->child->configure ($border, $border, $w, $h);
1081}
1082 1441
1442 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1443 if $self->{close_button};
1444
1445 1
1446}
1447
1448sub invoke_delete {
1449 my ($self) = @_;
1450
1451 $self->hide;
1452
1453 1
1454}
1455
1083sub button_down { 1456sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1457 my ($self, $ev, $x, $y) = @_;
1085 1458
1086 my ($w, $h) = @$self{qw(w h)}; 1459 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1460 my $border = $self->border;
1088 1461
… …
1104 my $dy = $ev->{y} - $oy; 1477 my $dy = $ev->{y} - $oy;
1105 1478
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1479 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1480 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1481
1482 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1483 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1484 };
1112 1485
1113 } elsif ($lr ^ $td) { 1486 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1487 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1488 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1119 1492
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1493 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1494
1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1495 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1496 # HACK: the next line is required to enforce placement
1497 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1123 }; 1498 };
1499 } else {
1500 return 0;
1501 }
1502
1124 } 1503 1
1125} 1504}
1126 1505
1127sub button_up { 1506sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1507 my ($self, $ev, $x, $y) = @_;
1129 1508
1130 delete $self->{motion}; 1509 ! ! delete $self->{motion}
1131} 1510}
1132 1511
1133sub mouse_motion { 1512sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1513 my ($self, $ev, $x, $y) = @_;
1135 1514
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1515 $self->{motion}->($ev, $x, $y) if $self->{motion};
1516
1517 ! ! $self->{motion}
1518}
1519
1520sub invoke_visibility_change {
1521 my ($self, $visible) = @_;
1522
1523 delete $self->{motion} unless $visible;
1524
1525 0
1137} 1526}
1138 1527
1139sub _draw { 1528sub _draw {
1140 my ($self) = @_; 1529 my ($self) = @_;
1141 1530
1531 my $child = $self->{children}[0];
1532
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1533 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1534 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1535
1145 glEnable GL_TEXTURE_2D; 1536 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1537 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1538
1148 my $border = $self->border; 1539 my $border = $self->border;
1149 1540
1150 glColor @{ $self->{border_bg} }; 1541 glColor @{ $self->{border_bg} };
1151 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1542 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1543 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1544 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1545 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1546
1547 # move
1548 my $w2 = ($w - $border) * .5;
1549 my $h2 = ($h - $border) * .5;
1550 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1553
1554 # resize
1555 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1556 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1557 unless $self->{has_close_button};
1558 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1155 1560
1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1561 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1157 glColor @{ $self->{bg} }; 1562 glColor @{ $self->{bg} };
1158 1563
1159 # TODO: repeat texture not scale 1564 # TODO: repeat texture not scale
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1568 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1569 }
1165 1570
1166 glDisable GL_TEXTURE_2D; 1571 glDisable GL_TEXTURE_2D;
1167 1572
1168 $self->{title}->draw if $self->{title};
1169
1170 $self->child->draw; 1573 $child->draw;
1574
1575 if ($self->{title_widget}) {
1576 glTranslate 0, $border - $self->{h};
1577 $self->{title_widget}->_draw;
1578
1579 glTranslate 0, - ($border - $self->{h});
1580 }
1581
1582 $self->{close_button}->draw
1583 if $self->{close_button};
1171} 1584}
1172 1585
1173############################################################################# 1586#############################################################################
1174 1587
1175package CFClient::UI::Table; 1588package CFPlus::UI::Table;
1176 1589
1177our @ISA = CFClient::UI::Base::; 1590our @ISA = CFPlus::UI::Container::;
1178 1591
1179use List::Util qw(max sum); 1592use List::Util qw(max sum);
1180 1593
1181use CFClient::OpenGL; 1594use CFPlus::OpenGL;
1182 1595
1183sub new { 1596sub new {
1184 my $class = shift; 1597 my $class = shift;
1185 1598
1186 $class->SUPER::new ( 1599 $class->SUPER::new (
1187 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1188 @_, 1602 @_,
1189 ) 1603 )
1190} 1604}
1191 1605
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1194}
1195
1196sub add { 1606sub 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) = @_; 1607 my ($self, @widgets) = @_;
1608
1609 for my $child (@widgets) {
1610 $child->{rowspan} ||= 1;
1611 $child->{colspan} ||= 1;
1612 }
1613
1614 $self->SUPER::add (@widgets);
1615}
1616
1617sub add_at {
1618 my $self = shift;
1619
1620 my @widgets;
1621
1622 while (@_) {
1623 my ($col, $row, $child) = splice @_, 0, 3, ();
1624
1625 $child->{row} = $row;
1626 $child->{col} = $col;
1627
1628 push @widgets, $child;
1629 }
1630
1631 $self->add (@widgets);
1632}
1633
1634sub get_wh {
1635 my ($self) = @_;
1636
1637 my (@w, @h);
1208 1638
1209 my @children = $self->children; 1639 my @children = $self->children;
1210 delete $self->{children}; 1640
1641 # first pass, columns
1642 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1643 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1644
1645 my $sw = sum @w[$c .. $c + $cs - 1];
1646
1647 if ($w > $sw) {
1648 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649 }
1211 1650 }
1212 for (@children) {
1213 delete $_->{parent};
1214 $_->hide;
1215 }
1216 1651
1217 $self->realloc; 1652 # second pass, rows
1218} 1653 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)}; 1654 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1233 1655
1234 $w[$x] = max $w[$x], $w; 1656 my $sh = sum @h[$r .. $r + $rs - 1];
1235 $h[$y] = max $h[$y], $h; 1657
1658 if ($h > $sh) {
1659 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1236 } 1660 }
1237 } 1661 }
1238 1662
1239 (\@w, \@h) 1663 (\@w, \@h)
1240} 1664}
… …
1248 (sum @$ws), 1672 (sum @$ws),
1249 (sum @$hs), 1673 (sum @$hs),
1250 ) 1674 )
1251} 1675}
1252 1676
1253sub size_allocate { 1677sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1678 my ($self, $w, $h) = @_;
1255 1679
1256 my ($ws, $hs) = $self->get_wh; 1680 my ($ws, $hs) = $self->get_wh;
1257 1681
1258 my $req_w = (sum @$ws) || 1; 1682 my $req_w = (sum @$ws) || 1;
1259 my $req_h = (sum @$hs) || 1; 1683 my $req_h = (sum @$hs) || 1;
1260 1684
1261 # TODO: nicer code && do row_expand 1685 # now linearly scale the rows/columns to the allocated size
1262 my @col_expand = @{$self->{col_expand}}; 1686 my @col_expand = @{$self->{col_expand}};
1263 @col_expand = (1) x @$ws unless @col_expand; 1687 @col_expand = (1) x @$ws unless @col_expand;
1264 my $col_expand = (sum @col_expand) || 1; 1688 my $col_expand = (sum @col_expand) || 1;
1265 1689
1266 # linearly scale sizes
1267 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1690 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1268 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1269 1691
1270 CFClient::UI::harmonize $ws; 1692 CFPlus::UI::harmonize $ws;
1693
1694 my @row_expand = @{$self->{row_expand}};
1695 @row_expand = (1) x @$ws unless @row_expand;
1696 my $row_expand = (sum @row_expand) || 1;
1697
1698 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1699
1271 CFClient::UI::harmonize $hs; 1700 CFPlus::UI::harmonize $hs;
1272 1701
1273 my $y; 1702 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1274 1704
1275 for my $r (0 .. $#{$self->{children}}) { 1705 for my $widget ($self->children) {
1276 my $row = $self->{children}[$r] 1706 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1277 or next;
1278 1707
1279 my $x = 0; 1708 $widget->configure (
1280 my $row_h = $hs->[$r]; 1709 $x[$c], $y[$r],
1710 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1281 1711 );
1282 for my $c (0 .. $#$row) { 1712 }
1283 my $col_w = $ws->[$c];
1284 1713
1285 if (my $widget = $row->[$c]) { 1714 1
1286 $widget->configure ($x, $y, $col_w, $row_h); 1715}
1287 }
1288 1716
1289 $x += $col_w; 1717#############################################################################
1718
1719package CFPlus::UI::Fixed;
1720
1721use List::Util qw(min max);
1722
1723our @ISA = CFPlus::UI::Container::;
1724
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) {
1733 my ($mode, $val, $max) = @_;
1734
1735 $mode eq "abs" ? $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744
1745 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) {
1747 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1748
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1290 } 1755 }
1291
1292 $y += $row_h;
1293 } 1756 }
1294 1757
1295} 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1296 1760
1297sub find_widget { 1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1773 }
1774 }
1775
1776 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1;
1778
1779 ($W, $H)
1780}
1781
1782sub invoke_size_allocate {
1298 my ($self, $x, $y) = @_; 1783 my ($self, $W, $H) = @_;
1299 1784
1300 $x -= $self->{x}; 1785 for my $child ($self->visible_children) {
1301 $y -= $self->{y}; 1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1302 1787
1303 my $res; 1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1304 1792
1305 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1793 $child->configure ($x, $y, $w, $h);
1306 $res = $_->find_widget ($x, $y) 1794 }
1307 and return $res; 1795
1308 } 1796 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} 1797}
1320 1798
1321############################################################################# 1799#############################################################################
1322 1800
1323package CFClient::UI::Box; 1801package CFPlus::UI::Box;
1324 1802
1325our @ISA = CFClient::UI::Container::; 1803our @ISA = CFPlus::UI::Container::;
1326 1804
1327sub size_request { 1805sub size_request {
1328 my ($self) = @_; 1806 my ($self) = @_;
1329 1807
1330 $self->{vertical} 1808 $self->{vertical}
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1816 )
1339} 1817}
1340 1818
1341sub size_allocate { 1819sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1820 my ($self, $w, $h) = @_;
1343 1821
1344 my $space = $self->{vertical} ? $h : $w; 1822 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1823 my @children = $self->visible_children;
1346 1824
1347 my @req; 1825 my @req;
1348 1826
1349 if ($self->{homogeneous}) { 1827 if ($self->{homogeneous}) {
1350 @req = ($space / (@$children || 1)) x @$children; 1828 @req = ($space / (@children || 1)) x @children;
1351 } else { 1829 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1830 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1353 my $req = List::Util::sum @req; 1831 my $req = List::Util::sum @req;
1354 1832
1355 if ($req > $space) { 1833 if ($req > $space) {
1356 # ah well, not enough space 1834 # ah well, not enough space
1357 $_ *= $space / $req for @req; 1835 $_ *= $space / $req for @req;
1358 } else { 1836 } else {
1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1837 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1360 1838
1361 $space = ($space - $req) / $expand; # remaining space to give away 1839 $space = ($space - $req) / $expand; # remaining space to give away
1362 1840
1363 $req[$_] += $space * $children->[$_]{expand} 1841 $req[$_] += $space * $children[$_]{expand}
1364 for 0 .. $#$children; 1842 for 0 .. $#children;
1365 } 1843 }
1366 } 1844 }
1367 1845
1368 CFClient::UI::harmonize \@req; 1846 CFPlus::UI::harmonize \@req;
1369 1847
1370 my $pos = 0; 1848 my $pos = 0;
1371 for (0 .. $#$children) { 1849 for (0 .. $#children) {
1372 my $alloc = $req[$_]; 1850 my $alloc = $req[$_];
1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1851 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1374 1852
1375 $pos += $alloc; 1853 $pos += $alloc;
1376 } 1854 }
1377 1855
1378 1 1856 1
1379} 1857}
1380 1858
1381############################################################################# 1859#############################################################################
1382 1860
1383package CFClient::UI::HBox; 1861package CFPlus::UI::HBox;
1384 1862
1385our @ISA = CFClient::UI::Box::; 1863our @ISA = CFPlus::UI::Box::;
1386 1864
1387sub new { 1865sub new {
1388 my $class = shift; 1866 my $class = shift;
1389 1867
1390 $class->SUPER::new ( 1868 $class->SUPER::new (
… …
1393 ) 1871 )
1394} 1872}
1395 1873
1396############################################################################# 1874#############################################################################
1397 1875
1398package CFClient::UI::VBox; 1876package CFPlus::UI::VBox;
1399 1877
1400our @ISA = CFClient::UI::Box::; 1878our @ISA = CFPlus::UI::Box::;
1401 1879
1402sub new { 1880sub new {
1403 my $class = shift; 1881 my $class = shift;
1404 1882
1405 $class->SUPER::new ( 1883 $class->SUPER::new (
… …
1408 ) 1886 )
1409} 1887}
1410 1888
1411############################################################################# 1889#############################################################################
1412 1890
1413package CFClient::UI::Label; 1891package CFPlus::UI::Label;
1414 1892
1415our @ISA = CFClient::UI::DrawBG::; 1893our @ISA = CFPlus::UI::DrawBG::;
1416 1894
1417use CFClient::OpenGL; 1895use CFPlus::OpenGL;
1418 1896
1419sub new { 1897sub new {
1420 my ($class, %arg) = @_; 1898 my ($class, %arg) = @_;
1421 1899
1422 my $self = $class->SUPER::new ( 1900 my $self = $class->SUPER::new (
… …
1425 #active_bg => none 1903 #active_bg => none
1426 #font => default_font 1904 #font => default_font
1427 #text => initial text 1905 #text => initial text
1428 #markup => initial narkup 1906 #markup => initial narkup
1429 #max_w => maximum pixel width 1907 #max_w => maximum pixel width
1908 #style => 0, # render flags
1430 ellipsise => 3, # end 1909 ellipsise => 3, # end
1431 layout => (new CFClient::Layout), 1910 layout => (new CFPlus::Layout),
1432 fontsize => 1, 1911 fontsize => 1,
1433 align => -1, 1912 align => -1,
1434 valign => -1, 1913 valign => -1,
1435 padding_x => 2, 1914 padding_x => 2,
1436 padding_y => 2, 1915 padding_y => 2,
1437 can_events => 0, 1916 can_events => 0,
1438 %arg 1917 %arg
1439 ); 1918 );
1440 1919
1441 if (exists $self->{template}) { 1920 if (exists $self->{template}) {
1442 my $layout = new CFClient::Layout; 1921 my $layout = new CFPlus::Layout;
1443 $layout->set_text (delete $self->{template}); 1922 $layout->set_text (delete $self->{template});
1444 $self->{template} = $layout; 1923 $self->{template} = $layout;
1445 } 1924 }
1446 1925
1447 if (exists $self->{markup}) { 1926 if (exists $self->{markup}) {
… …
1451 } 1930 }
1452 1931
1453 $self 1932 $self
1454} 1933}
1455 1934
1456sub escape($) {
1457 local $_ = $_[0];
1458
1459 s/&/&amp;/g;
1460 s/>/&gt;/g;
1461 s/</&lt;/g;
1462
1463 $_
1464}
1465
1466sub update { 1935sub update {
1467 my ($self) = @_; 1936 my ($self) = @_;
1468 1937
1469 delete $self->{texture}; 1938 delete $self->{texture};
1470 $self->SUPER::update; 1939 $self->SUPER::update;
1471} 1940}
1472 1941
1942sub realloc {
1943 my ($self) = @_;
1944
1945 delete $self->{ox};
1946 $self->SUPER::realloc;
1947}
1948
1473sub set_text { 1949sub set_text {
1474 my ($self, $text) = @_; 1950 my ($self, $text) = @_;
1475 1951
1476 return if $self->{text} eq "T$text"; 1952 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1953 $self->{text} = "T$text";
1478 1954
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1955 $self->{layout}->set_text ($text);
1481 1956
1957 delete $self->{size_req};
1482 $self->realloc; 1958 $self->realloc;
1483 $self->update; 1959 $self->update;
1484} 1960}
1485 1961
1486sub set_markup { 1962sub set_markup {
… …
1489 return if $self->{text} eq "M$markup"; 1965 return if $self->{text} eq "M$markup";
1490 $self->{text} = "M$markup"; 1966 $self->{text} = "M$markup";
1491 1967
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1968 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1969
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1970 $self->{layout}->set_markup ($markup);
1496 1971
1972 delete $self->{size_req};
1497 $self->realloc; 1973 $self->realloc;
1498 $self->update; 1974 $self->update;
1499} 1975}
1500 1976
1501sub size_request { 1977sub size_request {
1502 my ($self) = @_; 1978 my ($self) = @_;
1503 1979
1980 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1981 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1982 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1983 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1984 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1985 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1986
1510 my ($w, $h) = $self->{layout}->size; 1987 my ($w, $h) = $self->{layout}->size;
1511 1988
1512 if (exists $self->{template}) { 1989 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1990 $self->{template}->set_font ($self->{font}) if $self->{font};
1991 $self->{template}->set_width ($self->{max_w} || -1);
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1992 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1993
1516 my ($w2, $h2) = $self->{template}->size; 1994 my ($w2, $h2) = $self->{template}->size;
1517 1995
1518 $w = List::Util::max $w, $w2; 1996 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1997 $h = List::Util::max $h, $h2;
1998 }
1999
2000 [$w, $h]
1520 } 2001 };
1521 2002
1522 ($w, $h) 2003 @{ $self->{size_req} }
1523} 2004}
1524 2005
2006sub baseline_shift {
2007 $_[0]{layout}->descent
2008}
2009
1525sub size_allocate { 2010sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 2011 my ($self, $w, $h) = @_;
2012
2013 delete $self->{ox};
1527 2014
1528 delete $self->{texture} 2015 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2016 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2017
2018 1
1530} 2019}
1531 2020
1532sub set_fontsize { 2021sub set_fontsize {
1533 my ($self, $fontsize) = @_; 2022 my ($self, $fontsize) = @_;
1534 2023
1535 $self->{fontsize} = $fontsize; 2024 $self->{fontsize} = $fontsize;
2025 delete $self->{size_req};
1536 delete $self->{texture}; 2026 delete $self->{texture};
1537 2027
1538 $self->realloc; 2028 $self->realloc;
1539} 2029}
1540 2030
2031sub reconfigure {
2032 my ($self) = @_;
2033
2034 delete $self->{size_req};
2035 delete $self->{texture};
2036
2037 $self->SUPER::reconfigure;
2038}
2039
1541sub _draw { 2040sub _draw {
1542 my ($self) = @_; 2041 my ($self) = @_;
1543 2042
1544 $self->SUPER::_draw; # draw background, if applicable 2043 $self->SUPER::_draw; # draw background, if applicable
1545 2044
1546 my $tex = $self->{texture} ||= do { 2045 my $size = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}}); 2046 $self->{layout}->set_foreground (@{$self->{fg}});
1548 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2047 $self->{layout}->set_font ($self->{font}) if $self->{font};
1549 $self->{layout}->set_width ($self->{w}); 2048 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2049 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2050 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2051 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 2052
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2053 [$self->{layout}->size]
2054 };
1555 2055
2056 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2057 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2058 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 2059 : ($self->{w} - $size->[0]) * 0.5);
1559 2060
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2061 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2062 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 2063 : ($self->{h} - $size->[1]) * 0.5);
1563
1564 $tex
1565 }; 2064 };
1566 2065
1567 glEnable GL_TEXTURE_2D; 2066 my $w = List::Util::min $self->{w} + 4, $size->[0];
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 my $h = List::Util::min $self->{h} + 2, $size->[1];
1569 2068
1570 if ($tex->{format} == GL_ALPHA) { 2069 $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} 2070}
1579 2071
1580############################################################################# 2072#############################################################################
1581 2073
1582package CFClient::UI::EntryBase; 2074package CFPlus::UI::EntryBase;
1583 2075
1584our @ISA = CFClient::UI::Label::; 2076our @ISA = CFPlus::UI::Label::;
1585 2077
1586use CFClient::OpenGL; 2078use CFPlus::OpenGL;
1587 2079
1588sub new { 2080sub new {
1589 my $class = shift; 2081 my $class = shift;
1590 2082
1591 $class->SUPER::new ( 2083 $class->SUPER::new (
… …
1595 active_fg => [0, 0, 0], 2087 active_fg => [0, 0, 0],
1596 can_hover => 1, 2088 can_hover => 1,
1597 can_focus => 1, 2089 can_focus => 1,
1598 valign => 0, 2090 valign => 0,
1599 can_events => 1, 2091 can_events => 1,
2092 ellipsise => 0,
1600 #text => ... 2093 #text => ...
2094 #hidden => "*",
1601 @_ 2095 @_
1602 ) 2096 )
1603} 2097}
1604 2098
1605sub _set_text { 2099sub _set_text {
… …
1607 2101
1608 delete $self->{cur_h}; 2102 delete $self->{cur_h};
1609 2103
1610 return if $self->{text} eq $text; 2104 return if $self->{text} eq $text;
1611 2105
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 2106 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 2107 $self->{text} = $text;
1616 2108
1617 $text =~ s/./*/g if $self->{hidden}; 2109 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 2110 $self->{layout}->set_text ("$text ");
2111 delete $self->{size_req};
1619 2112
1620 $self->_emit (changed => $self->{text}); 2113 $self->emit (changed => $self->{text});
2114
2115 $self->realloc;
2116 $self->update;
1621} 2117}
1622 2118
1623sub set_text { 2119sub set_text {
1624 my ($self, $text) = @_; 2120 my ($self, $text) = @_;
1625 2121
1626 $self->{cursor} = length $text; 2122 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 2123 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 2124}
1631 2125
1632sub get_text { 2126sub get_text {
1633 $_[0]{text} 2127 $_[0]{text}
1634} 2128}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 2133 my ($w, $h) = $self->SUPER::size_request;
1640 2134
1641 ($w + 1, $h) # add 1 for cursor 2135 ($w + 1, $h) # add 1 for cursor
1642} 2136}
1643 2137
1644sub key_down { 2138sub invoke_key_down {
1645 my ($self, $ev) = @_; 2139 my ($self, $ev) = @_;
1646 2140
1647 my $mod = $ev->{mod}; 2141 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 2143 my $uni = $ev->{unicode};
1650 2144
1651 my $text = $self->get_text; 2145 my $text = $self->get_text;
2146
2147 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1652 2148
1653 if ($uni == 8) { 2149 if ($uni == 8) {
1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2150 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1655 } elsif ($uni == 127) { 2151 } elsif ($uni == 127) {
1656 substr $text, $self->{cursor}, 1, ""; 2152 substr $text, $self->{cursor}, 1, "";
1657 } elsif ($sym == CFClient::SDLK_LEFT) { 2153 } elsif ($sym == CFPlus::SDLK_LEFT) {
1658 --$self->{cursor} if $self->{cursor}; 2154 --$self->{cursor} if $self->{cursor};
1659 } elsif ($sym == CFClient::SDLK_RIGHT) { 2155 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1660 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2156 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1661 } elsif ($sym == CFClient::SDLK_HOME) { 2157 } elsif ($sym == CFPlus::SDLK_HOME) {
2158 # what a hack
2159 $self->{cursor} =
2160 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2161 ? length $1
2162 : 0;
2163 } elsif ($sym == CFPlus::SDLK_END) {
2164 # uh, again
2165 $self->{cursor} =
2166 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2167 ? $self->{cursor} + length $1
2168 : length $self->{text};
2169 } elsif ($uni == 21) { # ctrl-u
2170 $text = "";
1662 $self->{cursor} = 0; 2171 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 2172 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 2173 $self->emit ('escape');
1667 } elsif ($uni) { 2174 } elsif ($uni == 0x0d) {
2175 substr $text, $self->{cursor}++, 0, "\012";
2176 } elsif ($uni >= 0x20) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 2177 substr $text, $self->{cursor}++, 0, chr $uni;
2178 } else {
2179 return 0;
1669 } 2180 }
1670 2181
1671 $self->_set_text ($text); 2182 $self->_set_text ($text);
1672 2183
1673 $self->realloc; 2184 $self->realloc;
1674} 2185 $self->update;
1675 2186
2187 1
2188}
2189
1676sub focus_in { 2190sub invoke_focus_in {
1677 my ($self) = @_; 2191 my ($self) = @_;
1678 2192
1679 $self->{last_activity} = $::NOW; 2193 $self->{last_activity} = $::NOW;
1680 2194
1681 $self->SUPER::focus_in; 2195 $self->SUPER::invoke_focus_in
1682} 2196}
1683 2197
1684sub button_down { 2198sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 2199 my ($self, $ev, $x, $y) = @_;
1686 2200
1687 $self->SUPER::button_down ($ev, $x, $y); 2201 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 2202
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 2203 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 2204
1691 # byte-index to char-index 2205 # byte-index to char-index
1692 my $text = $self->{text}; 2206 my $text = $self->{text};
1693 utf8::encode $text; 2207 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 2208 $self->{cursor} = length $text;
1695 2209
1696 $self->_set_text ($self->{text}); 2210 $self->_set_text ($self->{text});
1697 $self->update; 2211 $self->update;
2212
2213 1
1698} 2214}
1699 2215
1700sub mouse_motion { 2216sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 2217 my ($self, $ev, $x, $y) = @_;
1702# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2218# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2219
2220 1
1703} 2221}
1704 2222
1705sub _draw { 2223sub _draw {
1706 my ($self) = @_; 2224 my ($self) = @_;
1707 2225
1708 local $self->{fg} = $self->{fg}; 2226 local $self->{fg} = $self->{fg};
1709 2227
1710 if ($FOCUS == $self) { 2228 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 2229 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 2230 $self->{fg} = $self->{active_fg};
1713 } else { 2231 } else {
1714 glColor @{$self->{bg}}; 2232 glColor_premultiply @{$self->{bg}};
1715 } 2233 }
1716 2234
1717 glEnable GL_BLEND; 2235 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 2237 glBegin GL_QUADS;
1720 glVertex 0 , 0; 2238 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 2239 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 2240 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 2241 glVertex $self->{w}, 0;
… …
1734 utf8::encode $text; 2252 utf8::encode $text;
1735 2253
1736 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1737 } 2255 }
1738 2256
1739 glColor @{$self->{fg}};
1740 glBegin GL_LINES; 2257 glBegin GL_LINES;
1741 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1742 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1743 glEnd; 2260 glEnd;
1744 } 2261 }
1745} 2262}
1746 2263
2264#############################################################################
2265
1747package CFClient::UI::Entry; 2266package CFPlus::UI::Entry;
1748 2267
1749our @ISA = CFClient::UI::EntryBase::; 2268our @ISA = CFPlus::UI::EntryBase::;
1750 2269
1751use CFClient::OpenGL; 2270use CFPlus::OpenGL;
1752 2271
1753sub key_down { 2272sub invoke_key_down {
1754 my ($self, $ev) = @_; 2273 my ($self, $ev) = @_;
1755 2274
1756 my $sym = $ev->{sym}; 2275 my $sym = $ev->{sym};
1757 2276
1758 if ($sym == 13) { 2277 if ($ev->{uni} == 0x0d || $sym == 13) {
1759 unshift @{$self->{history}}, 2278 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 2279 my $txt = $self->get_text;
2280
1761 $self->{history_pointer} = -1; 2281 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 2282 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 2283 $self->emit (activate => $txt);
1764 $self->update; 2284 $self->update;
1765 2285
1766 } elsif ($sym == CFClient::SDLK_UP) { 2286 } elsif ($sym == CFPlus::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 2287 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 2288 $self->{history_saveback} = $self->get_text;
1769 } 2289 }
1770 if (@{$self->{history} || []} > 0) { 2290 if (@{$self->{history} || []} > 0) {
1771 $self->{history_pointer}++; 2291 $self->{history_pointer}++;
… …
1773 $self->{history_pointer} = @{$self->{history} || []} - 1; 2293 $self->{history_pointer} = @{$self->{history} || []} - 1;
1774 } 2294 }
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2295 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } 2296 }
1777 2297
1778 } elsif ($sym == CFClient::SDLK_DOWN) { 2298 } elsif ($sym == CFPlus::SDLK_DOWN) {
1779 $self->{history_pointer}--; 2299 $self->{history_pointer}--;
1780 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2300 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1781 2301
1782 if ($self->{history_pointer} >= 0) { 2302 if ($self->{history_pointer} >= 0) {
1783 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1784 } else { 2304 } else {
1785 $self->set_text ($self->{history_saveback}); 2305 $self->set_text ($self->{history_saveback});
1786 } 2306 }
1787 2307
1788 } else { 2308 } else {
1789 $self->SUPER::key_down ($ev); 2309 return $self->SUPER::invoke_key_down ($ev)
2310 }
2311
1790 } 2312 1
1791
1792} 2313}
1793 2314
1794############################################################################# 2315#############################################################################
1795 2316
2317package CFPlus::UI::TextEdit;
2318
2319our @ISA = CFPlus::UI::EntryBase::;
2320
2321use CFPlus::OpenGL;
2322
2323sub move_cursor_ver {
2324 my ($self, $dy) = @_;
2325
2326 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2327
2328 $y += $dy;
2329
2330 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2331 $self->{cursor} = $index;
2332 delete $self->{cur_h};
2333 $self->update;
2334 return;
2335 }
2336}
2337
2338sub invoke_key_down {
2339 my ($self, $ev) = @_;
2340
2341 my $sym = $ev->{sym};
2342
2343 if ($sym == CFPlus::SDLK_UP) {
2344 $self->move_cursor_ver (-1);
2345 } elsif ($sym == CFPlus::SDLK_DOWN) {
2346 $self->move_cursor_ver (+1);
2347 } else {
2348 return $self->SUPER::invoke_key_down ($ev)
2349 }
2350
2351 1
2352}
2353
2354#############################################################################
2355
1796package CFClient::UI::Button; 2356package CFPlus::UI::Button;
1797 2357
1798our @ISA = CFClient::UI::Label::; 2358our @ISA = CFPlus::UI::Label::;
1799 2359
1800use CFClient::OpenGL; 2360use CFPlus::OpenGL;
1801 2361
1802my @tex = 2362my @tex =
1803 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1804 qw(b1_button_active.png); 2364 qw(b1_button_inactive.png b1_button_active.png);
1805 2365
1806sub new { 2366sub new {
1807 my $class = shift; 2367 my $class = shift;
1808 2368
1809 $class->SUPER::new ( 2369 $class->SUPER::new (
1810 padding_x => 4, 2370 padding_x => 4,
1811 padding_y => 4, 2371 padding_y => 4,
1812 fg => [1, 1, 1], 2372 fg => [1.0, 1.0, 1.0],
1813 active_fg => [0, 0, 1], 2373 active_fg => [0.8, 0.8, 0.8],
1814 can_hover => 1, 2374 can_hover => 1,
1815 align => 0, 2375 align => 0,
1816 valign => 0, 2376 valign => 0,
1817 can_events => 1, 2377 can_events => 1,
1818 @_ 2378 @_
1819 ) 2379 )
1820} 2380}
1821 2381
1822sub activate { }
1823
1824sub button_up { 2382sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 2383 my ($self, $ev, $x, $y) = @_;
1826 2384
1827 $self->emit ("activate") 2385 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 2386 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 2387 && $y >= 0 && $y < $self->{h};
2388
2389 1
1830} 2390}
1831 2391
1832sub _draw { 2392sub _draw {
1833 my ($self) = @_; 2393 my ($self) = @_;
1834 2394
1835 local $self->{fg} = $self->{fg}; 2395 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 2396
1841 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
1844 2400
2401 my $tex = $tex[$GRAB == $self];
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 2403
1847 glDisable GL_TEXTURE_2D; 2404 glDisable GL_TEXTURE_2D;
1848 2405
1849 $self->SUPER::_draw; 2406 $self->SUPER::_draw;
1850} 2407}
1851 2408
1852############################################################################# 2409#############################################################################
1853 2410
1854package CFClient::UI::CheckBox; 2411package CFPlus::UI::CheckBox;
1855 2412
1856our @ISA = CFClient::UI::DrawBG::; 2413our @ISA = CFPlus::UI::DrawBG::;
1857 2414
1858my @tex = 2415my @tex =
1859 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2416 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1860 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2417 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1861 2418
1862use CFClient::OpenGL; 2419use CFPlus::OpenGL;
1863 2420
1864sub new { 2421sub new {
1865 my $class = shift; 2422 my $class = shift;
1866 2423
1867 $class->SUPER::new ( 2424 $class->SUPER::new (
… …
1881 my ($self) = @_; 2438 my ($self) = @_;
1882 2439
1883 (6) x 2 2440 (6) x 2
1884} 2441}
1885 2442
2443sub toggle {
2444 my ($self) = @_;
2445
2446 $self->{state} = !$self->{state};
2447 $self->emit (changed => $self->{state});
2448 $self->update;
2449}
2450
1886sub button_down { 2451sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2452 my ($self, $ev, $x, $y) = @_;
1888 2453
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2454 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2455 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2456 $self->toggle;
1892 $self->_emit (changed => $self->{state}); 2457 } else {
2458 return 0
2459 }
2460
1893 } 2461 1
1894} 2462}
1895 2463
1896sub _draw { 2464sub _draw {
1897 my ($self) = @_; 2465 my ($self) = @_;
1898 2466
… …
1913 glDisable GL_TEXTURE_2D; 2481 glDisable GL_TEXTURE_2D;
1914} 2482}
1915 2483
1916############################################################################# 2484#############################################################################
1917 2485
1918package CFClient::UI::Image; 2486package CFPlus::UI::Image;
1919 2487
1920our @ISA = CFClient::UI::Base::; 2488our @ISA = CFPlus::UI::Base::;
1921 2489
1922use CFClient::OpenGL; 2490use CFPlus::OpenGL;
1923use Carp qw/confess/;
1924 2491
1925our %loaded_images; 2492our %texture_cache;
1926 2493
1927sub new { 2494sub new {
1928 my $class = shift; 2495 my $class = shift;
1929 2496
1930 my $self = $class->SUPER::new (can_events => 0, @_); 2497 my $self = $class->SUPER::new (
2498 can_events => 0,
2499 @_,
2500 );
1931 2501
1932 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2502 $self->{path} || $self->{tex}
2503 or Carp::croak "'path' or 'tex' attributes required";
1933 2504
1934 $loaded_images{$self->{image}} ||= 2505 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1935 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2506 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1936 2507
1937 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2508 CFPlus::weaken $texture_cache{$self->{path}};
1938 2509
1939 Scalar::Util::weaken $loaded_images{$self->{image}}; 2510 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1940
1941 $self->{aspect} = $tex->{w} / $tex->{h};
1942 2511
1943 $self 2512 $self
1944} 2513}
1945 2514
2515sub STORABLE_freeze {
2516 my ($self, $cloning) = @_;
2517
2518 $self->{path}
2519 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2520
2521 $self->{path}
2522}
2523
2524sub STORABLE_attach {
2525 my ($self, $cloning, $path) = @_;
2526
2527 $self->new (path => $path)
2528}
2529
1946sub size_request { 2530sub size_request {
1947 my ($self) = @_; 2531 my ($self) = @_;
1948 2532
1949 ($self->{tex}->{w}, $self->{tex}->{h}) 2533 ($self->{tex}{w}, $self->{tex}{h})
1950} 2534}
1951 2535
1952sub _draw { 2536sub _draw {
1953 my ($self) = @_; 2537 my ($self) = @_;
1954 2538
… …
1964 } 2548 }
1965 2549
1966 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1968 2552
1969 $tex->draw_quad_alpha (0, 0, $w, $h); 2553 $tex->draw_quad (0, 0, $w, $h);
1970 2554
1971 glDisable GL_TEXTURE_2D; 2555 glDisable GL_TEXTURE_2D;
1972} 2556}
1973 2557
1974############################################################################# 2558#############################################################################
1975 2559
2560package CFPlus::UI::ImageButton;
2561
2562our @ISA = CFPlus::UI::Image::;
2563
2564use CFPlus::OpenGL;
2565
2566my %textures;
2567
2568sub new {
2569 my $class = shift;
2570
2571 my $self = $class->SUPER::new (
2572 padding_x => 4,
2573 padding_y => 4,
2574 fg => [1, 1, 1],
2575 active_fg => [0, 0, 1],
2576 can_hover => 1,
2577 align => 0,
2578 valign => 0,
2579 can_events => 1,
2580 @_
2581 );
2582}
2583
2584sub invoke_button_up {
2585 my ($self, $ev, $x, $y) = @_;
2586
2587 $self->emit ("activate")
2588 if $x >= 0 && $x < $self->{w}
2589 && $y >= 0 && $y < $self->{h};
2590
2591 1
2592}
2593
2594#############################################################################
2595
1976package CFClient::UI::VGauge; 2596package CFPlus::UI::VGauge;
1977 2597
1978our @ISA = CFClient::UI::Base::; 2598our @ISA = CFPlus::UI::Base::;
1979 2599
1980use List::Util qw(min max); 2600use List::Util qw(min max);
1981 2601
1982use CFClient::OpenGL; 2602use CFPlus::OpenGL;
1983 2603
1984my %tex = ( 2604my %tex = (
1985 food => [ 2605 food => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2606 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2607 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1988 ], 2608 ],
1989 grace => [ 2609 grace => [
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2610 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/ 2611 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1992 ], 2612 ],
1993 hp => [ 2613 hp => [
1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2614 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1995 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2615 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1996 ], 2616 ],
1997 mana => [ 2617 mana => [
1998 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2618 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/ 2619 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2000 ], 2620 ],
2001); 2621);
2002 2622
2003# eg. VGauge->new (gauge => 'food'), default gauge: food 2623# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2063 my $ycut1 = max 0, min 1, $ycut; 2683 my $ycut1 = max 0, min 1, $ycut;
2064 my $ycut2 = max 0, min 1, $ycut - 1; 2684 my $ycut2 = max 0, min 1, $ycut - 1;
2065 2685
2066 my $h1 = $self->{h} * (1 - $ycut1); 2686 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2687 my $h2 = $self->{h} * (1 - $ycut2);
2688 my $h3 = $self->{h};
2689
2690 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2068 2691
2069 glEnable GL_BLEND; 2692 glEnable GL_BLEND;
2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2693 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2694 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2697
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2698 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2699 glBegin GL_QUADS;
… …
2090 2714
2091 if ($t3) { 2715 if ($t3) {
2092 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2716 glBindTexture GL_TEXTURE_2D, $t3->{name};
2093 glBegin GL_QUADS; 2717 glBegin GL_QUADS;
2094 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2718 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2095 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2719 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2096 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2720 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2097 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2721 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2098 glEnd; 2722 glEnd;
2099 } 2723 }
2100 2724
2101 glDisable GL_BLEND; 2725 glDisable GL_BLEND;
2102 glDisable GL_TEXTURE_2D; 2726 glDisable GL_TEXTURE_2D;
2103} 2727}
2104 2728
2105############################################################################# 2729#############################################################################
2106 2730
2107package CFClient::UI::Gauge; 2731package CFPlus::UI::Gauge;
2108 2732
2109our @ISA = CFClient::UI::VBox::; 2733our @ISA = CFPlus::UI::VBox::;
2110 2734
2111sub new { 2735sub new {
2112 my ($class, %arg) = @_; 2736 my ($class, %arg) = @_;
2113 2737
2114 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
… …
2116 can_hover => 1, 2740 can_hover => 1,
2117 can_events => 1, 2741 can_events => 1,
2118 %arg, 2742 %arg,
2119 ); 2743 );
2120 2744
2121 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2745 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2122 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2746 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2123 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2747 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2124 2748
2125 $self 2749 $self
2126} 2750}
2127 2751
2128sub set_fontsize { 2752sub set_fontsize {
… …
2149 $self->{value}->set_text ($val); 2773 $self->{value}->set_text ($val);
2150} 2774}
2151 2775
2152############################################################################# 2776#############################################################################
2153 2777
2154package CFClient::UI::Slider; 2778package CFPlus::UI::Slider;
2155 2779
2156use strict; 2780use strict;
2157 2781
2158use CFClient::OpenGL; 2782use CFPlus::OpenGL;
2159 2783
2160our @ISA = CFClient::UI::DrawBG::; 2784our @ISA = CFPlus::UI::DrawBG::;
2161 2785
2162my @tex = 2786my @tex =
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2787 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2164 qw(s1_slider.png s1_slider_bg.png); 2788 qw(s1_slider.png s1_slider_bg.png);
2165 2789
2166sub new { 2790sub new {
2167 my $class = shift; 2791 my $class = shift;
2168 2792
… …
2189 $self->update; 2813 $self->update;
2190 2814
2191 $self 2815 $self
2192} 2816}
2193 2817
2194sub changed { }
2195
2196sub set_range { 2818sub set_range {
2197 my ($self, $range) = @_; 2819 my ($self, $range) = @_;
2198 2820
2199 ($range, $self->{range}) = ($self->{range}, $range); 2821 ($range, $self->{range}) = ($self->{range}, $range);
2200 2822
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2823 if ("@$range" ne "@{$self->{range}}") {
2824 $self->update;
2825 $self->set_value ($self->{range}[0]);
2826 }
2203} 2827}
2204 2828
2205sub set_value { 2829sub set_value {
2206 my ($self, $value) = @_; 2830 my ($self, $value) = @_;
2207 2831
… …
2218 if $unit; 2842 if $unit;
2219 2843
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2844 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2845
2222 if ($value != $old_value) { 2846 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2847 $self->emit (changed => $value);
2224 $self->update; 2848 $self->update;
2225 } 2849 }
2226} 2850}
2227 2851
2228sub size_request { 2852sub size_request {
2229 my ($self) = @_; 2853 my ($self) = @_;
2230 2854
2231 ($self->{req_w}, $self->{req_h}) 2855 ($self->{req_w}, $self->{req_h})
2232} 2856}
2233 2857
2234sub button_down { 2858sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2859 my ($self, $ev, $x, $y) = @_;
2236 2860
2237 $self->SUPER::button_down ($ev, $x, $y); 2861 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2862
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2863 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2864
2241 $self->mouse_motion ($ev, $x, $y); 2865 $self->invoke_mouse_motion ($ev, $x, $y)
2242} 2866}
2243 2867
2244sub mouse_motion { 2868sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2869 my ($self, $ev, $x, $y) = @_;
2246 2870
2247 if ($GRAB == $self) { 2871 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2872 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2873
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2874 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2875
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2876 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2877
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2878 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2879 } else {
2880 return 0;
2881 }
2882
2255 } 2883 1
2884}
2885
2886sub invoke_mouse_wheel {
2887 my ($self, $ev) = @_;
2888
2889 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2890
2891 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2892
2893 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894
2895 ! ! $delta
2256} 2896}
2257 2897
2258sub update { 2898sub update {
2259 my ($self) = @_; 2899 my ($self) = @_;
2260 2900
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2901 delete $self->{knob_w};
2902 $self->SUPER::update;
2903}
2904
2905sub _draw {
2906 my ($self) = @_;
2907
2908 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2909 $self->set_value ($self->{range}[0]);
2263 2910
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2911 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2912 my $range = ($hi - $page - $lo) || 1e-100;
2266 2913
… …
2272 $value = ($value - $lo) / $range; 2919 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2920 $value = $value * $self->{scale} + $self->{offset};
2274 2921
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2922 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2923 $self->{knob_w} = $knob_w;
2277 }); 2924 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2925
2285 $self->SUPER::_draw (); 2926 $self->SUPER::_draw ();
2286 2927
2287 glScale $self->{w}, $self->{h}; 2928 glScale $self->{w}, $self->{h};
2288 2929
… …
2308 glDisable GL_TEXTURE_2D; 2949 glDisable GL_TEXTURE_2D;
2309} 2950}
2310 2951
2311############################################################################# 2952#############################################################################
2312 2953
2313package CFClient::UI::ValSlider; 2954package CFPlus::UI::ValSlider;
2314 2955
2315our @ISA = CFClient::UI::HBox::; 2956our @ISA = CFPlus::UI::HBox::;
2316 2957
2317sub new { 2958sub new {
2318 my ($class, %arg) = @_; 2959 my ($class, %arg) = @_;
2319 2960
2320 my $range = delete $arg{range}; 2961 my $range = delete $arg{range};
2321 2962
2322 my $self = $class->SUPER::new ( 2963 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2964 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2965 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift }, 2966 to_value => sub { shift },
2326 from_value => sub { shift }, 2967 from_value => sub { shift },
2327 %arg, 2968 %arg,
2328 ); 2969 );
2329 2970
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2990sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2991sub set_value { shift->{slider}->set_value (@_) }
2351 2992
2352############################################################################# 2993#############################################################################
2353 2994
2354package CFClient::UI::TextView; 2995package CFPlus::UI::TextScroller;
2355 2996
2356our @ISA = CFClient::UI::HBox::; 2997our @ISA = CFPlus::UI::HBox::;
2357 2998
2358use CFClient::OpenGL; 2999use CFPlus::OpenGL;
2359 3000
2360sub new { 3001sub new {
2361 my $class = shift; 3002 my $class = shift;
2362 3003
2363 my $self = $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
2364 fontsize => 1, 3005 fontsize => 1,
2365 can_events => 0, 3006 can_events => 1,
3007 indent => 0,
2366 #font => default_font 3008 #font => default_font
2367 @_, 3009 @_,
2368 3010
2369 layout => (new CFClient::Layout 1), 3011 layout => (new CFPlus::Layout),
2370 par => [], 3012 par => [],
3013 max_par => 0,
2371 height => 0, 3014 height => 0,
2372 children => [ 3015 children => [
2373 (new CFClient::UI::Empty expand => 1), 3016 (new CFPlus::UI::Empty expand => 1),
2374 (new CFClient::UI::Slider vertical => 1), 3017 (new CFPlus::UI::Slider vertical => 1),
2375 ], 3018 ],
2376 ); 3019 );
2377 3020
2378 $self->{children}[1]->connect (changed => sub { $self->update }); 3021 $self->{children}[1]->connect (changed => sub { $self->update });
2379 3022
… …
2385 3028
2386 $self->{fontsize} = $fontsize; 3029 $self->{fontsize} = $fontsize;
2387 $self->reflow; 3030 $self->reflow;
2388} 3031}
2389 3032
3033sub size_request {
3034 my ($self) = @_;
3035
3036 my ($empty, $slider) = @{ $self->{children} };
3037
3038 local $self->{children} = [$empty, $slider];
3039 $self->SUPER::size_request
3040}
3041
2390sub size_allocate { 3042sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 3043 my ($self, $w, $h) = @_;
2392 3044
2393 $self->SUPER::size_allocate ($w, $h); 3045 my ($empty, $slider, @other) = @{ $self->{children} };
3046 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2394 3047
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3048 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 3050 $self->{layout}->set_width ($empty->{w});
3051 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 3052
2399 $self->reflow; 3053 $self->reflow;
2400}
2401 3054
2402sub text_size { 3055 local $self->{children} = [$empty, $slider];
3056 $self->SUPER::invoke_size_allocate ($w, $h)
3057}
3058
3059sub invoke_mouse_wheel {
2403 my ($self, $text, $indent) = @_; 3060 my ($self, $ev) = @_;
3061
3062 return 0 unless $ev->{dy}; # only vertical movements
3063
3064 $self->{children}[1]->emit (mouse_wheel => $ev);
3065
3066 1
3067}
3068
3069sub get_layout {
3070 my ($self, $para) = @_;
2404 3071
2405 my $layout = $self->{layout}; 3072 my $layout = $self->{layout};
2406 3073
3074 $layout->set_font ($self->{font}) if $self->{font};
3075 $layout->set_foreground (@{$para->{fg}});
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3076 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 3077 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3078 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 3079 $layout->set_markup ($para->{markup});
3080
3081 $layout->set_shapes (
3082 map
3083 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3084 @{$para->{widget}}
2410 3085 );
3086
2411 $layout->size 3087 $layout
2412} 3088}
2413 3089
2414sub reflow { 3090sub reflow {
2415 my ($self) = @_; 3091 my ($self) = @_;
2416 3092
… …
2423 3099
2424 # todo: base offset on lines or so, not on pixels 3100 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset); 3101 $self->{children}[1]->set_value ($offset);
2426} 3102}
2427 3103
3104sub current_paragraph {
3105 my ($self) = @_;
3106
3107 $self->{top_paragraph} - 1
3108}
3109
3110sub scroll_to {
3111 my ($self, $para) = @_;
3112
3113 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3114
3115 $self->{scroll_to} = $para;
3116 $self->update;
3117}
3118
2428sub clear { 3119sub clear {
2429 my ($self) = @_; 3120 my ($self) = @_;
3121
3122 my (undef, undef, @other) = @{ $self->{children} };
3123 $self->remove ($_) for @other;
2430 3124
2431 $self->{par} = []; 3125 $self->{par} = [];
2432 $self->{height} = 0; 3126 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3127 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434} 3128}
2435 3129
2436sub add_paragraph { 3130sub add_paragraph {
2437 my ($self, $color, $text, $indent) = @_; 3131 my $self = shift;
2438 3132
2439 for my $line (split /\n/, $text) { 3133 for my $para (@_) {
2440 my ($w, $h) = $self->text_size ($line); 3134 $para = {
3135 fg => [1, 1, 1, 1],
3136 indent => 0,
3137 markup => "",
3138 widget => [],
3139 ref $para ? %$para : (markup => $para),
3140 w => 1e10,
3141 wrapped => 1,
3142 };
3143
3144 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3145 push @{$self->{par}}, $para;
3146 }
3147
3148 if (my $max = $self->{max_par}) {
3149 shift @{$self->{par}} while @{$self->{par}} > $max;
3150 }
3151
3152 $self->{need_reflow}++;
3153 $self->update;
3154}
3155
3156sub scroll_to_bottom {
3157 my ($self) = @_;
3158
3159 $self->{scroll_to} = $#{$self->{par}};
3160 $self->update;
3161}
3162
3163sub force_uptodate {
3164 my ($self) = @_;
3165
3166 if (delete $self->{need_reflow}) {
3167 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3168
3169 my $height = 0;
3170
3171 for my $para (@{$self->{par}}) {
3172 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3173 my $layout = $self->get_layout ($para);
3174 my ($w, $h) = $layout->size;
3175
3176 $para->{w} = $w + $para->{indent};
3177 $para->{h} = $h;
3178 $para->{wrapped} = $layout->has_wrapped;
3179 }
3180
3181 $para->{y} = $height;
3182 $height += $para->{h};
3183 }
3184
2441 $self->{height} += $h; 3185 $self->{height} = $height;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3186 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2443 }
2444 3187
2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3188 delete $self->{texture};
3189 }
3190
3191 if (my $paridx = delete $self->{scroll_to}) {
3192 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3193 }
2446} 3194}
2447 3195
2448sub update { 3196sub update {
2449 my ($self) = @_; 3197 my ($self) = @_;
2450 3198
… …
2452 3200
2453 return unless $self->{h} > 0; 3201 return unless $self->{h} > 0;
2454 3202
2455 delete $self->{texture}; 3203 delete $self->{texture};
2456 3204
2457 $ROOT->on_post_alloc ($self, sub { 3205 $ROOT->on_post_alloc ($self => sub {
3206 $self->force_uptodate;
3207
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3208 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 3209
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 { 3210 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 3211 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 3212 glClear GL_COLOR_BUFFER_BIT;
2489 3213
3214 package CFPlus::UI::Base;
3215 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3216 (0, 0, $self->{w}, $self->{h});
3217
3218 my $top = int $self->{children}[1]{range}[0];
3219
3220 my $paridx = 0;
3221 my $top_paragraph;
2490 my $top = int $self->{children}[1]{range}[0]; 3222 my $top = int $self->{children}[1]{range}[0];
2491 3223
2492 my $y0 = $top; 3224 my $y0 = $top;
2493 my $y1 = $top + $H; 3225 my $y1 = $top + $H;
2494 3226
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}}) { 3227 for my $para (@{$self->{par}}) {
2506 my $h = $par->[1]; 3228 my $h = $para->{h};
3229 my $y = $para->{y};
2507 3230
2508 if ($y0 < $y + $h && $y < $y1) { 3231 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 3232 my $layout = $self->get_layout ($para);
2510 $layout->set_width ($W - $par->[3]);
2511 $layout->set_markup ($par->[4]);
2512 3233
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3234 $layout->render ($para->{indent}, $y - $y0);
2514 3235
2515 glRasterPos $par->[3], $y - $y0; 3236 if (my @w = @{ $para->{widget} }) {
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3237 my @s = $layout->get_shapes;
3238
3239 for (@w) {
3240 my ($dx, $dy) = splice @s, 0, 2, ();
3241
3242 $_->{x} = $dx + $para->{indent};
3243 $_->{y} = $dy + $y - $y0;
3244
3245 $_->draw;
3246 }
3247 }
2517 } 3248 }
2518 3249
2519 $y += $h; 3250 $paridx++;
3251 $top_paragraph ||= $paridx if $y >= $top;
2520 } 3252 }
2521 3253
2522 glDisable GL_BLEND; 3254 $self->{top_paragraph} = $top_paragraph;
2523 }; 3255 };
2524 }); 3256 });
2525} 3257}
2526 3258
3259sub reconfigure {
3260 my ($self) = @_;
3261
3262 $self->SUPER::reconfigure;
3263
3264 $_->{w} = 1e10 for @{ $self->{par} };
3265 $self->reflow;
3266}
3267
2527sub _draw { 3268sub _draw {
2528 my ($self) = @_; 3269 my ($self) = @_;
2529 3270
2530 glEnable GL_TEXTURE_2D; 3271 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3272 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 3273 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3274 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 3275 glDisable GL_TEXTURE_2D;
2535 3276
2536 $self->{children}[1]->draw; 3277 $self->{children}[1]->draw;
2537
2538} 3278}
2539 3279
2540############################################################################# 3280#############################################################################
2541 3281
2542package CFClient::UI::Animator; 3282package CFPlus::UI::Animator;
2543 3283
2544use CFClient::OpenGL; 3284use CFPlus::OpenGL;
2545 3285
2546our @ISA = CFClient::UI::Bin::; 3286our @ISA = CFPlus::UI::Bin::;
2547 3287
2548sub moveto { 3288sub moveto {
2549 my ($self, $x, $y) = @_; 3289 my ($self, $x, $y) = @_;
2550 3290
2551 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3291 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2579 glPopMatrix; 3319 glPopMatrix;
2580} 3320}
2581 3321
2582############################################################################# 3322#############################################################################
2583 3323
2584package CFClient::UI::Flopper; 3324package CFPlus::UI::Flopper;
2585 3325
2586our @ISA = CFClient::UI::Button::; 3326our @ISA = CFPlus::UI::Button::;
2587 3327
2588sub new { 3328sub new {
2589 my $class = shift; 3329 my $class = shift;
2590 3330
2591 my $self = $class->SUPER::new ( 3331 my $self = $class->SUPER::new (
… …
2603 $self->{other}->toggle_visibility; 3343 $self->{other}->toggle_visibility;
2604} 3344}
2605 3345
2606############################################################################# 3346#############################################################################
2607 3347
2608package CFClient::UI::Tooltip; 3348package CFPlus::UI::Tooltip;
2609 3349
2610our @ISA = CFClient::UI::Bin::; 3350our @ISA = CFPlus::UI::Bin::;
2611 3351
2612use CFClient::OpenGL; 3352use CFPlus::OpenGL;
2613 3353
2614sub new { 3354sub new {
2615 my $class = shift; 3355 my $class = shift;
2616 3356
2617 $class->SUPER::new ( 3357 $class->SUPER::new (
… …
2620 ) 3360 )
2621} 3361}
2622 3362
2623sub set_tooltip_from { 3363sub set_tooltip_from {
2624 my ($self, $widget) = @_; 3364 my ($self, $widget) = @_;
3365
3366 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3367 if $widget->{tooltip} =~ /^#(.*)$/;
2625 3368
2626 my $tooltip = $widget->{tooltip}; 3369 my $tooltip = $widget->{tooltip};
2627 3370
2628 if ($ENV{CFPLUS_DEBUG} & 2) { 3371 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 3372 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3373 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 3374 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 3375 . "visible $widget->{visible}";
2633 } 3376 }
2634 3377
3378 $tooltip =~ s/^\n+//;
3379 $tooltip =~ s/\n+$//;
3380
2635 $self->add (new CFClient::UI::Label 3381 $self->add (new CFPlus::UI::Label
2636 markup => $tooltip, 3382 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3383 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 3384 fontsize => 0.8,
2639 fg => [0, 0, 0, 1], 3385 style => 1, # FLAG_INVERSE
2640 ellipsise => 0, 3386 ellipsise => 0,
2641 font => ($widget->{tooltip_font} || $::FONT_PROP), 3387 font => ($widget->{tooltip_font} || $::FONT_PROP),
2642 ); 3388 );
2643} 3389}
2644 3390
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3394 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 3395
2650 ($w + 4, $h + 4) 3396 ($w + 4, $h + 4)
2651} 3397}
2652 3398
2653sub size_allocate { 3399sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 3400 my ($self, $w, $h) = @_;
2655 3401
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 3402 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 3403}
2658 3404
2659sub visibility_change { 3405sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 3406 my ($self, $visible) = @_;
2661 3407
2662 return unless $visible; 3408 return unless $visible;
2663 3409
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 3410 $self->{root}->on_post_alloc ("move_$self" => sub {
2665 my $widget = $self->{owner} 3411 my $widget = $self->{owner}
2666 or return; 3412 or return;
2667 3413
3414 if ($widget->{visible}) {
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3415 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 3416
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3417 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 3418 if $x + $self->{w} > $self->{root}{w};
2672 3419
2673 $self->move_abs ($x, $y); 3420 $self->move_abs ($x, $y);
3421 } else {
3422 $self->hide;
3423 }
2674 }); 3424 });
2675} 3425}
2676 3426
2677sub _draw { 3427sub _draw {
2678 my ($self) = @_; 3428 my ($self) = @_;
… …
2702 $self->SUPER::_draw; 3452 $self->SUPER::_draw;
2703} 3453}
2704 3454
2705############################################################################# 3455#############################################################################
2706 3456
2707package CFClient::UI::Face; 3457package CFPlus::UI::Face;
2708 3458
2709our @ISA = CFClient::UI::Base::; 3459our @ISA = CFPlus::UI::DrawBG::;
2710 3460
2711use CFClient::OpenGL; 3461use CFPlus::OpenGL;
2712 3462
2713sub new { 3463sub new {
2714 my $class = shift; 3464 my $class = shift;
2715 3465
2716 my $self = $class->SUPER::new ( 3466 my $self = $class->SUPER::new (
3467 size_w => 32,
3468 size_h => 8,
2717 aspect => 1, 3469 aspect => 1,
2718 can_events => 0, 3470 can_events => 0,
2719 @_, 3471 @_,
2720 ); 3472 );
2721 3473
2722 if ($self->{anim} && $self->{animspeed}) { 3474 if ($self->{anim} && $self->{animspeed}) {
2723 Scalar::Util::weaken (my $widget = $self); 3475 CFPlus::weaken (my $widget = $self);
2724 3476
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2725 $self->{timer} = Event->timer ( 3479 $self->{timer} = Event->timer (
2726 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2727 hard => 1, 3480 parked => 1,
2728 interval => $self->{animspeed},
2729 cb => sub { 3481 cb => sub {
3482 return unless $::CONN && $widget;
3483
2730 ++$widget->{frame}; 3484 ++$widget->{frame};
3485 $widget->update_face;
2731 $widget->update; 3486 $widget->update;
3487
3488 $widget->update_timer;
2732 }, 3489 },
2733 ); 3490 );
3491
3492 $self->update_face;
3493 $self->update_timer;
2734 } 3494 }
2735 3495
2736 $self 3496 $self
2737} 3497}
2738 3498
3499sub update_timer {
3500 my ($self) = @_;
3501
3502 return unless $self->{timer};
3503
3504 if ($self->{visible}) {
3505 $self->{timer}->at (
3506 $self->{anim_start}
3507 + $self->{animspeed}
3508 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3509 );
3510 $self->{timer}->start;
3511 } else {
3512 $self->{timer}->stop;
3513 }
3514}
3515
3516sub update_face {
3517 my ($self) = @_;
3518
3519 return unless $::CONN;
3520
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) {
3523 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3525 }
3526 }
3527}
3528
2739sub size_request { 3529sub size_request {
2740 (32, 8) 3530 my ($self) = @_;
3531
3532 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) {
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3536 } else {
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3538 $self->realloc;
3539 });
3540 }
3541 }
3542 }
3543
3544 ($self->{size_w} || 8, $self->{size_h} || 8)
2741} 3545}
2742 3546
2743sub update { 3547sub update {
2744 my ($self) = @_; 3548 my ($self) = @_;
2745 3549
2746 return unless $self->{visible}; 3550 return unless $self->{visible};
2747 3551
2748 $self->SUPER::update; 3552 $self->SUPER::update;
2749} 3553}
2750 3554
3555sub invoke_visibility_change {
3556 my ($self) = @_;
3557
3558 $self->update_timer;
3559
3560 0
3561}
3562
2751sub _draw { 3563sub _draw {
2752 my ($self) = @_; 3564 my ($self) = @_;
2753 3565
2754 return unless $::CONN; 3566 return unless $::CONN;
2755 3567
2756 my $face; 3568 $self->SUPER::_draw;
2757 3569
2758 if ($self->{frame}) {
2759 my $anim = $::CONN->{anim}[$self->{anim}]; 3570 my $faceid = $::CONN->{faceid}[$self->{face}]
2760 3571 or return;
2761 $face = $anim->[ $self->{frame} % @$anim ]
2762 if $anim && @$anim;
2763 }
2764 3572
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3573 my $tex = $::CONN->{texture}[$faceid];
2766 3574
2767 if ($tex) { 3575 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 3576 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 3578 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3579 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 3580 glDisable GL_TEXTURE_2D;
2773 } 3581 }
2774} 3582}
2775 3583
2776sub DESTROY { 3584sub destroy {
2777 my ($self) = @_; 3585 my ($self) = @_;
2778 3586
2779 $self->{timer}->cancel 3587 (delete $self->{timer})->cancel
2780 if $self->{timer}; 3588 if $self->{timer};
2781 3589
2782 $self->SUPER::DESTROY; 3590 $self->SUPER::destroy;
2783} 3591}
2784 3592
2785############################################################################# 3593#############################################################################
2786 3594
3595package CFPlus::UI::Buttonbar;
3596
3597our @ISA = CFPlus::UI::HBox::;
3598
3599# TODO: should actually wrap buttons and other goodies.
3600
3601#############################################################################
3602
2787package CFClient::UI::Menu; 3603package CFPlus::UI::Menu;
2788 3604
2789our @ISA = CFClient::UI::FancyFrame::; 3605our @ISA = CFPlus::UI::Toplevel::;
2790 3606
2791use CFClient::OpenGL; 3607use CFPlus::OpenGL;
2792 3608
2793sub new { 3609sub new {
2794 my $class = shift; 3610 my $class = shift;
2795 3611
2796 my $self = $class->SUPER::new ( 3612 my $self = $class->SUPER::new (
2797 items => [], 3613 items => [],
2798 z => 100, 3614 z => 100,
2799 @_, 3615 @_,
2800 ); 3616 );
2801 3617
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3618 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2803 3619
2804 for my $item (@{ $self->{items} }) { 3620 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3621 my ($widget, $cb, $tooltip) = @$item;
2806 3622
2807 # handle various types of items, only text for now 3623 # handle various types of items, only text for now
2808 if (!ref $widget) { 3624 if (!ref $widget) {
3625 if ($widget =~ /\t/) {
3626 my ($left, $right) = split /\t/, $widget, 2;
3627
2809 $widget = new CFClient::UI::Label 3628 $widget = new CFPlus::UI::HBox
2810 can_hover => 1, 3629 can_hover => 1,
2811 can_events => 1, 3630 can_events => 1,
3631 tooltip => $tooltip,
3632 children => [
3633 (new CFPlus::UI::Label markup => $left, expand => 1),
3634 (new CFPlus::UI::Label markup => $right, align => +1),
3635 ],
3636 ;
3637
3638 } else {
3639 $widget = new CFPlus::UI::Label
3640 can_hover => 1,
3641 can_events => 1,
2812 text => $widget; 3642 markup => $widget,
3643 tooltip => $tooltip;
3644 }
2813 } 3645 }
2814 3646
2815 $self->{item}{$widget} = $item; 3647 $self->{item}{$widget} = $item;
2816 3648
2817 $self->{vbox}->add ($widget); 3649 $self->{vbox}->add ($widget);
… …
2822 3654
2823# popup given the event (must be a mouse button down event currently) 3655# popup given the event (must be a mouse button down event currently)
2824sub popup { 3656sub popup {
2825 my ($self, $ev) = @_; 3657 my ($self, $ev) = @_;
2826 3658
2827 $self->_emit ("popdown"); 3659 $self->emit ("popdown");
2828 3660
2829 # maybe save $GRAB? must be careful about events... 3661 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3662 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3663 $self->{button} = $ev->{button};
2832 3664
2833 $self->show; 3665 $self->show;
2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3666 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2835} 3667}
2836 3668
2837sub mouse_motion { 3669sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3670 my ($self, $ev, $x, $y) = @_;
2839 3671
2840 # TODO: should use vbox->find_widget or so 3672 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3673 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3674 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3675
3676 0
3677}
3678
2845sub button_up { 3679sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3680 my ($self, $ev, $x, $y) = @_;
2847 3681
2848 if ($ev->{button} == $self->{button}) { 3682 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3683 undef $GRAB;
2850 $self->hide; 3684 $self->hide;
2851 3685
2852 $self->_emit ("popdown"); 3686 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3687 $self->{hover}[1]->() if $self->{hover};
3688 } else {
3689 return 0
3690 }
3691
2854 } 3692 1
2855} 3693}
2856 3694
2857############################################################################# 3695#############################################################################
2858 3696
2859package CFClient::UI::Statusbox; 3697package CFPlus::UI::Multiplexer;
2860 3698
2861our @ISA = CFClient::UI::VBox::; 3699our @ISA = CFPlus::UI::Container::;
2862 3700
2863sub new { 3701sub new {
2864 my $class = shift; 3702 my $class = shift;
2865 3703
2866 $class->SUPER::new ( 3704 my $self = $class->SUPER::new (
3705 @_,
3706 );
3707
3708 $self->{current} = $self->{children}[0]
3709 if @{ $self->{children} };
3710
3711 $self
3712}
3713
3714sub add {
3715 my ($self, @widgets) = @_;
3716
3717 $self->SUPER::add (@widgets);
3718
3719 $self->{current} = $self->{children}[0]
3720 if @{ $self->{children} };
3721}
3722
3723sub get_current_page {
3724 my ($self) = @_;
3725
3726 $self->{current}
3727}
3728
3729sub set_current_page {
3730 my ($self, $page_or_widget) = @_;
3731
3732 my $widget = ref $page_or_widget
3733 ? $page_or_widget
3734 : $self->{children}[$page_or_widget];
3735
3736 $self->{current} = $widget;
3737 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3738
3739 $self->emit (page_changed => $self->{current});
3740
3741 $self->realloc;
3742}
3743
3744sub visible_children {
3745 $_[0]{current}
3746}
3747
3748sub size_request {
3749 my ($self) = @_;
3750
3751 $self->{current}->size_request
3752}
3753
3754sub invoke_size_allocate {
3755 my ($self, $w, $h) = @_;
3756
3757 $self->{current}->configure (0, 0, $w, $h);
3758
3759 1
3760}
3761
3762sub _draw {
3763 my ($self) = @_;
3764
3765 $self->{current}->draw;
3766}
3767
3768#############################################################################
3769
3770package CFPlus::UI::Notebook;
3771
3772our @ISA = CFPlus::UI::VBox::;
3773
3774sub new {
3775 my $class = shift;
3776
3777 my $self = $class->SUPER::new (
3778 buttonbar => (new CFPlus::UI::Buttonbar),
3779 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3780 # filter => # will be put between multiplexer and $self
3781 @_,
3782 );
3783
3784 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3785 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3786
3787 $self
3788}
3789
3790sub add {
3791 my ($self, $title, $widget, $tooltip) = @_;
3792
3793 CFPlus::weaken $self;
3794
3795 $self->{buttonbar}->add (new CFPlus::UI::Button
3796 markup => $title,
3797 tooltip => $tooltip,
3798 on_activate => sub { $self->set_current_page ($widget) },
3799 );
3800
3801 $self->{multiplexer}->add ($widget);
3802}
3803
3804sub get_current_page {
3805 my ($self) = @_;
3806
3807 $self->{multiplexer}->get_current_page
3808}
3809
3810sub set_current_page {
3811 my ($self, $page) = @_;
3812
3813 $self->{multiplexer}->set_current_page ($page);
3814 $self->emit (page_changed => $self->{multiplexer}{current});
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::Selector;
3820
3821use utf8;
3822
3823our @ISA = CFPlus::UI::Button::;
3824
3825sub new {
3826 my $class = shift;
3827
3828 my $self = $class->SUPER::new (
3829 options => [], # [value, title, longdesc], ...
3830 value => undef,
3831 @_,
3832 );
3833
3834 $self->_set_value ($self->{value});
3835
3836 $self
3837}
3838
3839sub invoke_button_down {
3840 my ($self, $ev) = @_;
3841
3842 my @menu_items;
3843
3844 for (@{ $self->{options} }) {
3845 my ($value, $title, $tooltip) = @$_;
3846
3847 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3848 }
3849
3850 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3851}
3852
3853sub _set_value {
3854 my ($self, $value) = @_;
3855
3856 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3857 or return;
3858
3859 $self->{value} = $item->[0];
3860 $self->set_markup ("$item->[1] ⇓");
3861 $self->set_tooltip ($item->[2]);
3862}
3863
3864sub set_value {
3865 my ($self, $value) = @_;
3866
3867 return unless $self->{value} ne $value;
3868
3869 $self->_set_value ($value);
3870 $self->emit (changed => $value);
3871}
3872
3873#############################################################################
3874
3875package CFPlus::UI::Statusbox;
3876
3877our @ISA = CFPlus::UI::VBox::;
3878
3879sub new {
3880 my $class = shift;
3881
3882 my $self = $class->SUPER::new (
2867 fontsize => 0.8, 3883 fontsize => 0.8,
2868 @_, 3884 @_,
2869 ) 3885 );
3886
3887 CFPlus::weaken (my $this = $self);
3888
3889 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3890
3891 $self
2870} 3892}
2871 3893
2872sub reorder { 3894sub reorder {
2873 my ($self) = @_; 3895 my ($self) = @_;
2874 my $NOW = time; 3896 my $NOW = Time::HiRes::time;
3897
3898 # freeze display when hovering over any label
3899 return if $CFPlus::UI::TOOLTIP->{owner}
3900 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3901 values %{ $self->{item} };
2875 3902
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3903 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3904 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3905 }
2879 3906
… …
2882 my @items = sort { 3909 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3910 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3911 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3912 } values %{ $self->{item} };
2886 3913
3914 $self->{timer}->interval (1);
3915
2887 my $count = 10 + 1; 3916 my $count = 10 + 1;
2888 for my $item (@items) { 3917 for my $item (@items) {
2889 last unless --$count; 3918 last unless --$count;
2890 3919
2891 push @widgets, $item->{label} ||= do { 3920 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3921 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3922 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3923 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3924 : $item->{text};
2896 3925
2897 for ($short) { 3926 for ($short) {
2898 s/^\s+//; 3927 s/^\s+//;
2899 s/\s+/ /g; 3928 s/\s+/ /g;
2900 } 3929 }
2901 3930
2902 new CFClient::UI::Label 3931 new CFPlus::UI::Label
2903 markup => $short, 3932 markup => $short,
2904 tooltip => $item->{tooltip}, 3933 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3934 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3935 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3936 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3937 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3938 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3939 can_events => 1,
2911 can_hover => 1 3940 can_hover => 1
2912 }; 3941 };
3942
3943 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3944 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3945 $label->update;
3946 $label->set_max_size (undef, $label->{req_h} * $diff)
3947 if $diff < 1;
3948 $self->{timer}->interval (1/30);
3949 } else {
3950 $label->{fg}[3] = $item->{fg}[3] || 1;
3951 }
3952
3953 push @widgets, $label;
2913 } 3954 }
2914 3955
2915 $self->clear; 3956 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3957 $self->SUPER::add (reverse @widgets);
2917} 3958}
… …
2922 $text =~ s/^\s+//; 3963 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3964 $text =~ s/\s+$//;
2924 3965
2925 return unless $text; 3966 return unless $text;
2926 3967
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3968 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3969
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3971
2931 if (my $item = $self->{item}{$group}) { 3972 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3973 if ($item->{text} eq $text) {
2933 $item->{count}++; 3974 $item->{count}++;
2934 } else { 3975 } else {
2935 $item->{count} = 1; 3976 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3977 $item->{text} = $item->{tooltip} = $text;
2937 } 3978 }
2938 $item->{id} = ++$self->{id}; 3979 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3980 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3981 delete $item->{label};
2941 } else { 3982 } else {
2942 $self->{item}{$group} = { 3983 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3984 id => ++$self->{id},
… …
2949 count => 1, 3990 count => 1,
2950 %arg, 3991 %arg,
2951 }; 3992 };
2952 } 3993 }
2953 3994
3995 $ROOT->on_refresh (reorder => sub {
2954 $self->reorder; 3996 $self->reorder;
3997 });
2955} 3998}
2956 3999
2957sub reconfigure { 4000sub reconfigure {
2958 my ($self) = @_; 4001 my ($self) = @_;
2959 4002
… …
2962 4005
2963 $self->reorder; 4006 $self->reorder;
2964 $self->SUPER::reconfigure; 4007 $self->SUPER::reconfigure;
2965} 4008}
2966 4009
4010sub destroy {
4011 my ($self) = @_;
4012
4013 $self->{timer}->cancel;
4014
4015 $self->SUPER::destroy;
4016}
4017
2967############################################################################# 4018#############################################################################
2968 4019
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; 4020package CFPlus::UI::Root;
3261 4021
3262our @ISA = CFClient::UI::Container::; 4022our @ISA = CFPlus::UI::Container::;
3263 4023
4024use List::Util qw(min max);
4025
3264use CFClient::OpenGL; 4026use CFPlus::OpenGL;
3265 4027
3266sub new { 4028sub new {
3267 my $class = shift; 4029 my $class = shift;
3268 4030
3269 my $self = $class->SUPER::new ( 4031 my $self = $class->SUPER::new (
3270 visible => 1, 4032 visible => 1,
3271 @_, 4033 @_,
3272 ); 4034 );
3273 4035
3274 Scalar::Util::weaken ($self->{root} = $self); 4036 CFPlus::weaken ($self->{root} = $self);
3275 4037
3276 $self 4038 $self
3277} 4039}
3278 4040
3279sub size_request { 4041sub size_request {
… …
3294 $coord = $max - $size if $coord > $max - $size; 4056 $coord = $max - $size if $coord > $max - $size;
3295 4057
3296 int $coord + 0.5 4058 int $coord + 0.5
3297} 4059}
3298 4060
3299sub size_allocate { 4061sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 4062 my ($self, $w, $h) = @_;
3301 4063
3302 for my $child ($self->children) { 4064 for my $child ($self->children) {
3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3304 4066
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 4070 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 4071 $Y = _to_pixel $Y, $H, $self->{h};
3310 4072
3311 $child->configure ($X, $Y, $W, $H); 4073 $child->configure ($X, $Y, $W, $H);
3312 } 4074 }
4075
4076 1
3313} 4077}
3314 4078
3315sub coord2local { 4079sub coord2local {
3316 my ($self, $x, $y) = @_; 4080 my ($self, $x, $y) = @_;
3317 4081
… …
3402 4166
3403 delete $queue{$widget+0}; 4167 delete $queue{$widget+0};
3404 4168
3405 my ($w, $h) = $widget->size_request; 4169 my ($w, $h) = $widget->size_request;
3406 4170
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4171 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4172 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4173
4174 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4175 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409 4176
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 4177 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 4178 $h = $widget->{force_h} if exists $widget->{force_h};
3412 4179
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4180 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3441 4208
3442 $w = 0 if $w < 0; 4209 $w = 0 if $w < 0;
3443 $h = 0 if $h < 0; 4210 $h = 0 if $h < 0;
3444 4211
4212 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h;
4214
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220
3445 $w = int $w + 0.5; 4221 $w = int $w + 0.5;
3446 $h = int $h + 0.5; 4222 $h = int $h + 0.5;
3447 4223
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w}; 4225 $widget->{old_w} = $widget->{w};
… …
3459 4235
3460 while ($self->{post_alloc_hook}) { 4236 while ($self->{post_alloc_hook}) {
3461 $_->() 4237 $_->()
3462 for values %{delete $self->{post_alloc_hook}}; 4238 for values %{delete $self->{post_alloc_hook}};
3463 } 4239 }
3464
3465 4240
3466 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4241 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4242 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3468 glClear GL_COLOR_BUFFER_BIT; 4243 glClear GL_COLOR_BUFFER_BIT;
3469 4244
… …
3471 glLoadIdentity; 4246 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4247 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 4248 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 4249 glLoadIdentity;
3475 4250
4251 {
4252 package CFPlus::UI::Base;
4253
4254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4255 (0, 0, $self->{w}, $self->{h});
4256
3476 $self->_draw; 4257 $self->_draw;
4258 }
3477} 4259}
3478 4260
3479############################################################################# 4261#############################################################################
3480 4262
3481package CFClient::UI; 4263package CFPlus::UI;
3482 4264
3483$ROOT = new CFClient::UI::Root; 4265$ROOT = new CFPlus::UI::Root;
3484$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4266$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3485 4267
34861 42681
3487 4269

Diff Legend

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