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

Diff Legend

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