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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
8use Event;
7 9
8use CFClient; 10use CFClient;
11use CFClient::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
23 32
24 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
25 34
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 36
28 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 38 $TOOLTIP->show;
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
36 } 44 }
37 45
38 $TOOLTIP->hide; 46 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 76 if $FOCUS;
46} 77}
47 78
48sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 81 if $FOCUS;
51} 82}
52 83
53sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
54 my ($ev) = @_; 85 my ($ev) = @_;
… …
58 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
59 90
60 $GRAB = $widget; 91 $GRAB = $widget;
61 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
62 93
63 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
64 } 95 }
65 96
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 98
68 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 101}
73 102
74sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
75 my ($ev) = @_; 104 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
77 106
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 108
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 110
82 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 113
87 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 116 $grab->update if $grab;
90 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
91 118
92 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
93 } 120 }
94} 121}
95 122
96sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
97 my ($ev) = @_; 124 my ($ev) = @_;
… …
103 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
104 131
105 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 134
108 check_tooltip; 135 $TOOLTIP_WATCHER->start;
109 } 136 }
110 137
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 139 if $HOVER;
115} 140}
116 141
117# convert position array to integers 142# convert position array to integers
118sub harmonize { 143sub harmonize {
119 my ($vals) = @_; 144 my ($vals) = @_;
… …
125 $rem += $_ - $i; 150 $rem += $_ - $i;
126 $_ = $i; 151 $_ = $i;
127 } 152 }
128} 153}
129 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
130############################################################################# 196#############################################################################
131 197
132package CFClient::UI::Base; 198package CFClient::UI::Base;
133 199
134use strict; 200use strict;
… …
137 203
138sub new { 204sub new {
139 my $class = shift; 205 my $class = shift;
140 206
141 my $self = bless { 207 my $self = bless {
142 x => 0, 208 x => "center",
143 y => 0, 209 y => "center",
144 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
145 can_events => 1, 213 can_events => 1,
146 @_ 214 @_
147 }, $class; 215 }, $class;
148 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
149 for (keys %$self) { 219 for (keys %$self) {
150 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
152 } 222 }
153 } 223 }
154 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
155 $self 237 $self
156} 238}
157 239
158sub destroy { 240sub destroy {
159 my ($self) = @_; 241 my ($self) = @_;
… …
168 return if $self->{parent}; 250 return if $self->{parent};
169 251
170 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
171} 253}
172 254
173sub hide { 255sub set_visible {
174 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
175 279
176 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
178 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
179 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
180 if $self->{parent}; 314 if $self->{parent};
181} 315}
182 316
183sub move { 317sub move_abs {
184 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
185 319
186 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
189 323
190 $self->update; 324 $self->update;
191} 325}
192 326
193sub set_size { 327sub set_size {
194 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
195 329
196 $self->{user_w} = $w; 330 $self->{force_w} = $w;
197 $self->{user_h} = $h; 331 $self->{force_h} = $h;
198 332
199 $self->check_size; 333 $self->realloc;
200} 334}
201 335
202sub size_request { 336sub size_request {
203 require Carp; 337 require Carp;
204 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
206 340
207sub configure { 341sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
209 343
210 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
213 349
214 # use alignment to adjust x, y 350 # use alignment to adjust x, y
215 351
216 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 354 }
221 355
222 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 357 $self->{x} = $x;
224 $self->{y} = $y; 358 $self->{y} = $y;
225 $self->update; 359 $self->update;
226 } 360 }
227 361
228 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
229 $self->{w} = $w; 365 $self->{alloc_w} = $w;
230 $self->{h} = $h; 366 $self->{alloc_h} = $h;
231 367
232 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 369 }
235} 370}
236 371
237sub size_allocate { 372sub size_allocate {
238 # nothing to be done 373 # nothing to be done
239} 374}
240 375
376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
241sub set_max_size { 384sub set_max_size {
242 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
243 386
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
246}
247 389
248# return top left coordinates 390 $self->realloc;
249sub _topleft { 391}
392
393sub set_tooltip {
250 my ($self, $x, $y) = @_; 394 my ($self, $tooltip) = @_;
251 395
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
253} 407}
254 408
255# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
256sub coord2local { 410sub coord2local {
257 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
258 412
259 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 414}
262 415
263# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
264sub coord2global { 417sub coord2global {
265 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
266 419
267 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 421}
270 422
271sub focus_in { 423sub focus_in {
272 my ($self) = @_; 424 my ($self) = @_;
273 425
274 return if $FOCUS == $self; 426 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
276 428
277 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
278 430
279 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
280 432
281 $focus->update if $focus; 433 $focus->update if $focus;
282 $FOCUS->update; 434 $FOCUS->update;
283} 435}
284 436
… …
287 439
288 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
289 441
290 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
291 443
292 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
293 445
294 $focus->update if $focus; #? 446 $focus->update if $focus; #?
295}
296 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
297sub mouse_motion { } 452sub mouse_motion { 0 }
298sub button_up { } 453sub button_up { 0 }
299sub key_down { } 454sub key_down { 0 }
300sub key_up { } 455sub key_up { 0 }
301 456
302sub button_down { 457sub button_down {
303 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
304 459
305 $self->focus_in; 460 $self->focus_in;
306}
307 461
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
312sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
313 538
314sub draw { 539sub draw {
315 my ($self) = @_; 540 my ($self) = @_;
316 541
317 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
318 553
319 glPushMatrix; 554 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw;
322 glPopMatrix;
323 556
324 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
325 my ($x, $y) = @$self{qw(x y)};
326
327 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
328 glEnable GL_BLEND; 559 glEnable GL_BLEND;
329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
330 glBegin GL_QUADS; 561 glBegin GL_QUADS;
331 glVertex $x , $y;
332 glVertex $x + $self->{w}, $y;
333 glVertex $x + $self->{w}, $y + $self->{h};
334 glVertex $x , $y + $self->{h};
335 glEnd;
336 glDisable GL_BLEND;
337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 562 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
348 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
349 glPopMatrix; 580 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
352} 586}
353 587
354sub _draw { 588sub _draw {
355 my ($self) = @_; 589 my ($self) = @_;
356 590
357 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
358} 592}
359 593
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 594sub DESTROY {
424 my ($self) = @_; 595 my ($self) = @_;
425 596
597 delete $WIDGET{$self+0};
426 #$self->deactivate; 598 #$self->deactivate;
427} 599}
428 600
429############################################################################# 601#############################################################################
430 602
… …
439 my $class = shift; 611 my $class = shift;
440 612
441 # range [value, low, high, page] 613 # range [value, low, high, page]
442 614
443 $class->SUPER::new ( 615 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
446 @_ 618 @_
447 ) 619 )
448} 620}
449 621
450sub _draw { 622sub _draw {
451 my ($self) = @_; 623 my ($self) = @_;
452 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
454 631
455 glEnable GL_BLEND; 632 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
458 635
459 glBegin GL_QUADS; 636 glBegin GL_QUADS;
460 glVertex 0 , 0; 637 glVertex 0 , 0;
461 glVertex 0 , $h; 638 glVertex 0 , $h;
462 glVertex $w, $h; 639 glVertex $w, $h;
463 glVertex $w, 0; 640 glVertex $w, 0;
464 glEnd; 641 glEnd;
465 642
466 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
467} 645}
468 646
469############################################################################# 647#############################################################################
470 648
471package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
478} 656}
479 657
480sub size_request { 658sub size_request {
481 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
482} 662}
483 663
484sub draw { } 664sub draw { }
485 665
486############################################################################# 666#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
491 671
492sub new { 672sub new {
493 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
494 674
495 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
496 676
497 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
498 children => [], 678 children => [],
499 can_events => 0, 679 can_events => 0,
500 %arg, 680 %arg,
501 ); 681 );
682
502 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
503 685
504 $self 686 $self
505} 687}
506 688
507sub add { 689sub add {
508 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
509 691
510 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
511 694
512 use sort 'stable'; 695 use sort 'stable';
513 696
514 $self->{children} = [ 697 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
517 ]; 700 ];
518 701
519 $child->check_size; 702 $self->realloc;
703}
704
705sub children {
706 @{ $_[0]{children} }
520} 707}
521 708
522sub remove { 709sub remove {
523 my ($self, $child) = @_; 710 my ($self, $child) = @_;
524 711
525 delete $child->{parent}; 712 delete $child->{parent};
526 $child->hide; 713 $child->hide;
527 714
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 716
530 $self->check_size; 717 $self->realloc;
531 $self->update;
532} 718}
533 719
534sub clear { 720sub clear {
535 my ($self) = @_; 721 my ($self) = @_;
536 722
… …
539 725
540 for (@$children) { 726 for (@$children) {
541 delete $_->{parent}; 727 delete $_->{parent};
542 $_->hide; 728 $_->hide;
543 } 729 }
730
731 $self->realloc;
544} 732}
545 733
546sub find_widget { 734sub find_widget {
547 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
548 736
549 $x -= $self->{x}; 737 $x -= $self->{x};
550 $y -= $self->{y}; 738 $y -= $self->{y};
551 739
552 my $res; 740 my $res;
553 741
554 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
555 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
556 and return $res; 744 and return $res;
557 } 745 }
558 746
559 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
608 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
609} 797}
610 798
611############################################################################# 799#############################################################################
612 800
801# back-buffered drawing area
802
613package CFClient::UI::Window; 803package CFClient::UI::Window;
614 804
615our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
616 806
617use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
623} 813}
624 814
625sub update { 815sub update {
626 my ($self) = @_; 816 my ($self) = @_;
627 817
628 # we want to do this delayed... 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 819 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 820}
642 821
643sub size_allocate { 822sub size_allocate {
644 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
645 824
646 $self->child->configure (0, 0, $w, $h); 825 $self->SUPER::size_allocate ($w, $h);
826 $self->update;
827}
647 828
829sub _render {
830 my ($self) = @_;
831
832 $self->{children}[0]->draw;
833}
834
835sub render_child {
836 my ($self) = @_;
837
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT;
841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
648 $self->render_chld; 849 $self->_render;
850 };
649} 851}
650 852
651sub _draw { 853sub _draw {
652 my ($self) = @_; 854 my ($self) = @_;
653 855
654 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
655 857
656 my $tex = $self->{texture} 858 my $tex = $self->{texture}
657 or return; 859 or return;
658 860
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1;
663 864
664 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 866
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
668} 868}
669 869
670############################################################################# 870#############################################################################
671 871
672package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
673 873
674our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 875
702sub new { 876sub new {
703 my $class = shift; 877 my $class = shift;
704 878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
886sub size_request {
887 my ($self) = @_;
888
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890
891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
895}
896
897sub size_allocate {
898 my ($self, $w, $h) = @_;
899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
906 $self->update;
907}
908
909sub set_offset {
910 my ($self, $x, $y) = @_;
911
912 $self->{view_x} = int $x;
913 $self->{view_y} = int $y;
914
915 $self->update;
916}
917
918# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local {
920 my ($self, $x, $y) = @_;
921
922 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
923}
924
925sub coord2global {
926 my ($self, $x, $y) = @_;
927
928 $x = List::Util::min $self->{w}, $x - $self->{view_x};
929 $y = List::Util::min $self->{h}, $y - $self->{view_y};
930
931 $self->SUPER::coord2global ($x, $y)
932}
933
934sub find_widget {
935 my ($self, $x, $y) = @_;
936
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y)
943 }
944}
945
946sub _render {
947 my ($self) = @_;
948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953
954 $self->SUPER::_render;
955}
956
957#############################################################################
958
959package CFClient::UI::ScrolledWindow;
960
961our @ISA = CFClient::UI::HBox::;
962
963sub new {
964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
967
968 my $self;
969
970 my $slider = new CFClient::UI::Slider
971 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]);
975 },
976 ;
977
705 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 980 slider => $slider,
708 border => 0.8, 981 %arg,
709 @_
710 ); 982 );
711 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
712 $self 987 $self
713} 988}
714 989
715sub _draw { 990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
716 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
717 1008
718 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
719 1010
720 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
738 1017
739############################################################################# 1018#############################################################################
740 1019
741package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
742 1021
743our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
744 1023
745use CFClient::OpenGL; 1024use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750 1025
751sub new { 1026sub new {
752 my $class = shift; 1027 my $class = shift;
753 1028
754 # TODO: user_x, user_y, overwrite moveto? 1029 $class->SUPER::new (
1030 bg => undef,
1031 @_,
1032 )
1033}
1034
1035sub _draw {
1036 my ($self) = @_;
1037
1038 if ($self->{bg}) {
1039 my ($w, $h) = @$self{qw(w h)};
1040
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1043 glColor_premultiply @{ $self->{bg} };
1044
1045 glBegin GL_QUADS;
1046 glVertex 0 , 0;
1047 glVertex 0 , $h;
1048 glVertex $w, $h;
1049 glVertex $w, 0;
1050 glEnd;
1051
1052 glDisable GL_BLEND;
1053 }
1054
1055 $self->SUPER::_draw;
1056}
1057
1058#############################################################################
1059
1060package CFClient::UI::FancyFrame;
1061
1062our @ISA = CFClient::UI::Bin::;
1063
1064use CFClient::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073
1074sub new {
1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
755 1078
756 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1082 border => 0.6,
760 can_events => 1, 1083 can_events => 1,
761 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
762 ); 1087 );
763 1088
764 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
765 align => 0, 1090 align => 0,
766 valign => 1, 1091 valign => 1,
767 text => $self->{title}, 1092 text => $title,
768 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
769 1095
770 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
771} 1104}
772 1105
773sub border { 1106sub border {
774 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
775} 1108}
776 1109
777sub size_request { 1110sub size_request {
778 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
779 1115
780 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
781 1117
782 ( 1118 (
783 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
786} 1122}
787 1123
788sub size_allocate { 1124sub size_allocate {
789 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
790 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
791 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
793 1137
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
798} 1139}
799 1140
800sub button_down { 1141sub button_down {
801 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
802 1143
1144 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1145 my $border = $self->border;
804 1146
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
811 $self->{motion} = sub { 1158 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
813 1160
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
815 1163
816 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
819 }; 1169 };
820 1170
821 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
826 1174
827 $self->{motion} = sub { 1175 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
829 1177
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
831 1179
832 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
834 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
835 } 1188 1
836} 1189}
837 1190
838sub button_up { 1191sub button_up {
839 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
840 1193
841 delete $self->{motion}; 1194 !!delete $self->{motion}
842} 1195}
843 1196
844sub mouse_motion { 1197sub mouse_motion {
845 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
846 1199
847 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
848} 1203}
849 1204
850sub _draw { 1205sub _draw {
851 my ($self) = @_; 1206 my ($self) = @_;
852 1207
1208 my $child = $self->{children}[0];
1209
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
855 1212
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1215
861 my $border = $self->border; 1216 my $border = $self->border;
862 1217
863 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1223
869 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
870 1226
871 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
873 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
874 1230 $bg->{t} = $ch / $bg->{h};
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
881 1233
882 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1235
885 $self->{title}->draw if $self->{title};
886 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
887} 1242}
888 1243
889############################################################################# 1244#############################################################################
890 1245
891package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
899sub new { 1254sub new {
900 my $class = shift; 1255 my $class = shift;
901 1256
902 $class->SUPER::new ( 1257 $class->SUPER::new (
903 col_expand => [], 1258 col_expand => [],
904 @_ 1259 @_,
905 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1265}
907 1266
908sub add { 1267sub add {
909 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
910 1269
911 $child->set_parent ($self); 1270 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
913 1272
914 $child->check_size; 1273 $self->realloc;
915} 1274}
916 1275
917# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
918sub clear { 1277sub clear {
919 my ($self) = @_; 1278 my ($self) = @_;
920 1279
921 my $children = delete $self->{children}; 1280 my @children = $self->children;
1281 delete $self->{children};
922 1282
923 for (grep $_, map @$_, grep $_, @$children) { 1283 for (@children) {
924 delete $_->{parent}; 1284 delete $_->{parent};
925 $_->hide; 1285 $_->hide;
926 } 1286 }
927 1287
928 $self->update; 1288 $self->realloc;
929} 1289}
930 1290
931sub get_wh { 1291sub get_wh {
932 my ($self) = @_; 1292 my ($self) = @_;
933 1293
… …
964sub size_allocate { 1324sub size_allocate {
965 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
966 1326
967 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
968 1328
969 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
971 1331
972 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1029 } 1389 }
1030} 1390}
1031 1391
1032############################################################################# 1392#############################################################################
1033 1393
1034package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1035
1036# TODO: wrap into common Box base class
1037 1395
1038our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1039 1397
1040sub size_request { 1398sub size_request {
1041 my ($self) = @_; 1399 my ($self) = @_;
1042 1400
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1044 1402 ? (
1045 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1046 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1047 (List::Util::max map $_->[1], @alloc), 1405 )
1048 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1049} 1410}
1050 1411
1051sub size_allocate { 1412sub size_allocate {
1052 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1053 1414
1054 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1055
1056 my $children = $self->{children}; 1416 my $children = $self->{children};
1057 1417
1058 my @h = map $_->{req_w}, @$children; 1418 my @req;
1059 1419
1060 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1061 1421 @req = ($space / (@$children || 1)) x @$children;
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1066 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1067 $exp ||= 1;
1068 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1069 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
1075 } 1436 }
1076 } 1437 }
1077 1438
1078 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1079 1440
1080 my $y = 0; 1441 my $pos = 0;
1081 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1082 my $child = $children->[$_];
1083 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1084 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1085 1445
1086 $y += $h; 1446 $pos += $alloc;
1087 } 1447 }
1088 1448
1089 1 1449 1
1090} 1450}
1091 1451
1092############################################################################# 1452#############################################################################
1093 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1094package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1095 1470
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1099 1472
1100sub size_request { 1473sub new {
1101 my ($self) = @_; 1474 my $class = shift;
1102 1475
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1104 1477 vertical => 1,
1105 ( 1478 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1479 )
1109} 1480}
1110 1481
1111sub size_allocate {
1112 my ($self, $w, $h) = @_;
1113
1114 my $children = $self->{children};
1115
1116 my @h = map $_->{req_h}, @$children;
1117
1118 my $req_h = List::Util::sum @h;
1119
1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
1125 $exp ||= 1;
1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131 }
1132 }
1133
1134 CFClient::UI::harmonize \@h;
1135
1136 my $y = 0;
1137 for (0 .. $#$children) {
1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
1141
1142 $y += $h;
1143 }
1144
1145 1
1146}
1147
1148############################################################################# 1482#############################################################################
1149 1483
1150package CFClient::UI::Label; 1484package CFClient::UI::Label;
1151 1485
1152our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1153 1487
1154use CFClient::OpenGL; 1488use CFClient::OpenGL;
1155 1489
1156sub new { 1490sub new {
1157 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1158 1492
1159 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1161 #font => default_font 1497 #font => default_font
1498 #text => initial text
1499 #markup => initial narkup
1500 #max_w => maximum pixel width
1501 ellipsise => 3, # end
1502 layout => (new CFClient::Layout),
1162 fontsize => 1, 1503 fontsize => 1,
1163 text => "",
1164 align => -1, 1504 align => -1,
1165 valign => -1, 1505 valign => -1,
1166 padding => 2, 1506 padding_x => 2,
1167 layout => new CFClient::Layout, 1507 padding_y => 2,
1168 can_events => 0, 1508 can_events => 0,
1169 %arg 1509 %arg
1170 ); 1510 );
1171 1511
1172 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1515 $self->{template} = $layout;
1176 } 1516 }
1177 1517
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1519 $self->set_markup (delete $self->{markup});
1520 } else {
1521 $self->set_text (delete $self->{text});
1522 }
1180 1523
1181 $self 1524 $self
1182} 1525}
1183 1526
1184sub escape { 1527sub escape($) {
1185 local $_ = $_[1]; 1528 local $_ = $_[0];
1186 1529
1187 s/&/&amp;/g; 1530 s/&/&amp;/g;
1188 s/>/&gt;/g; 1531 s/>/&gt;/g;
1189 s/</&lt;/g; 1532 s/</&lt;/g;
1190 1533
1191 $_[1] 1534 $_
1535}
1536
1537sub update {
1538 my ($self) = @_;
1539
1540 delete $self->{texture};
1541 $self->SUPER::update;
1542}
1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1192} 1549}
1193 1550
1194sub set_text { 1551sub set_text {
1195 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1196 1553
1554 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text";
1556
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1198 1559
1199 delete $self->{texture}; 1560 delete $self->{size_req};
1200 $self->check_size; 1561 $self->realloc;
1201 $self->update; 1562 $self->update;
1202} 1563}
1203 1564
1204sub set_markup { 1565sub set_markup {
1205 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1206 1567
1568 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup";
1570
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1208 1575
1209 delete $self->{texture}; 1576 delete $self->{size_req};
1210 $self->check_size; 1577 $self->realloc;
1211 $self->update; 1578 $self->update;
1212} 1579}
1213 1580
1214sub size_request { 1581sub size_request {
1215 my ($self) = @_; 1582 my ($self) = @_;
1216 1583
1584 $self->{size_req} ||= do {
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1590
1221 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1222 1592
1223 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226 1596
1227 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1228 1598
1229 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1231 } 1604 };
1232 1605
1233 ( 1606 @{ $self->{size_req} }
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237} 1607}
1238 1608
1239sub size_allocate { 1609sub size_allocate {
1240 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1241 1611
1612 delete $self->{ox};
1613
1242 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1243} 1616}
1244 1617
1245sub set_fontsize { 1618sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1247 1620
1248 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1622 delete $self->{texture};
1250 $self->check_size; 1623
1251 $self->update; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1252} 1633}
1253 1634
1254sub _draw { 1635sub _draw {
1255 my ($self) = @_; 1636 my ($self) = @_;
1256 1637
1638 $self->SUPER::_draw; # draw background, if applicable
1639
1257 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647
1261 new_from_layout CFClient::Texture $self->{layout} 1648 new_from_layout CFClient::Texture $self->{layout}
1262 }; 1649 };
1263 1650
1264 glEnable GL_BLEND; 1651 unless (exists $self->{ox}) {
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5);
1655
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5);
1659 };
1660
1266 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662
1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268
1269 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1284 1671
1285 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1673}
1288 1674
1289############################################################################# 1675#############################################################################
1290 1676
1291package CFClient::UI::EntryBase; 1677package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1690 active_fg => [0, 0, 0],
1305 can_hover => 1, 1691 can_hover => 1,
1306 can_focus => 1, 1692 can_focus => 1,
1307 valign => 0, 1693 valign => 0,
1308 can_events => 1, 1694 can_events => 1,
1695 #text => ...
1696 #hidden => "*",
1309 @_ 1697 @_
1310 ) 1698 )
1311} 1699}
1312 1700
1313sub _set_text { 1701sub _set_text {
… …
1315 1703
1316 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1317 1705
1318 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1319 1707
1320 delete $self->{texture};
1321
1322 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1323 $self->{text} = $text; 1709 $self->{text} = $text;
1324 1710
1325 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1327 1714
1328 $self->emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1719}
1720
1721sub set_text {
1722 my ($self, $text) = @_;
1723
1724 $self->{cursor} = length $text;
1725 $self->_set_text ($text);
1329} 1726}
1330 1727
1331sub get_text { 1728sub get_text {
1332 $_[0]{text} 1729 $_[0]{text}
1333} 1730}
… …
1336 my ($self) = @_; 1733 my ($self) = @_;
1337 1734
1338 my ($w, $h) = $self->SUPER::size_request; 1735 my ($w, $h) = $self->SUPER::size_request;
1339 1736
1340 ($w + 1, $h) # add 1 for cursor 1737 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1738}
1356 1739
1357sub key_down { 1740sub key_down {
1358 my ($self, $ev) = @_; 1741 my ($self, $ev) = @_;
1359 1742
… …
1361 my $sym = $ev->{sym}; 1744 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1745 my $uni = $ev->{unicode};
1363 1746
1364 my $text = $self->get_text; 1747 my $text = $self->get_text;
1365 1748
1366 if ($sym == 8) { 1749 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1751 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1752 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1753 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1754 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1755 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1756 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1757 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1758 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1759 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1761 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1762 $self->_emit ('escape');
1380 } elsif ($uni) { 1763 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1382 } 1767 }
1383 1768
1384 $self->_set_text ($text); 1769 $self->_set_text ($text);
1385 $self->update; 1770
1771 $self->realloc;
1772
1773 1
1386} 1774}
1387 1775
1388sub focus_in { 1776sub focus_in {
1389 my ($self) = @_; 1777 my ($self) = @_;
1390 1778
… …
1405 utf8::encode $text; 1793 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1407 1795
1408 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1409 $self->update; 1797 $self->update;
1798
1799 1
1410} 1800}
1411 1801
1412sub mouse_motion { 1802sub mouse_motion {
1413 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1414# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1415} 1807}
1416 1808
1417sub _draw { 1809sub _draw {
1418 my ($self) = @_; 1810 my ($self) = @_;
1419 1811
1420 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1421 1813
1422 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1423 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1424 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1425 } else { 1817 } else {
1426 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1427 } 1819 }
1428 1820
1429 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1431 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1432 glVertex 0 , 0; 1824 glVertex 0 , 0;
1433 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1434 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1435 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1469 1861
1470 if ($sym == 13) { 1862 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1863 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1864 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1865 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1867 $self->_emit (activate => $txt);
1475 $self->update; 1868 $self->update;
1476 1869
1477 } elsif ($sym == CFClient::SDLK_UP) { 1870 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1871 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1872 $self->{history_saveback} = $self->get_text;
1480 } 1873 }
1874 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1875 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1876 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1877 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1880 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1881
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1882 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1883 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1885
… …
1493 } else { 1888 } else {
1494 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1495 } 1890 }
1496 1891
1497 } else { 1892 } else {
1498 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1499 } 1896 1
1500
1501} 1897}
1502 1898
1503############################################################################# 1899#############################################################################
1504 1900
1505package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1514 1910
1515sub new { 1911sub new {
1516 my $class = shift; 1912 my $class = shift;
1517 1913
1518 $class->SUPER::new ( 1914 $class->SUPER::new (
1519 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1520 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1523 can_hover => 1, 1919 can_hover => 1,
1524 align => 0, 1920 align => 0,
1525 valign => 0, 1921 valign => 0,
1526 can_events => 1, 1922 can_events => 1,
1527 @_ 1923 @_
1528 ) 1924 )
1529} 1925}
1530 1926
1927sub activate { }
1928
1531sub button_up { 1929sub button_up {
1532 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1533 1931
1932 $self->emit ("activate")
1534 if ($x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1535 && $y >= 0 && $y < $self->{h}) { 1934 && $y >= 0 && $y < $self->{h};
1536 $self->emit ("activate"); 1935
1537 } 1936 1
1538} 1937}
1539 1938
1540sub _draw { 1939sub _draw {
1541 my ($self) = @_; 1940 my ($self) = @_;
1542 1941
1543 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1544 1943
1545 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg};
1547 }
1548
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1554 1947
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1949
1557 glDisable GL_TEXTURE_2D; 1950 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1951
1560 $self->SUPER::_draw; 1952 $self->SUPER::_draw;
1561} 1953}
1562 1954
1563############################################################################# 1955#############################################################################
… …
1574 1966
1575sub new { 1967sub new {
1576 my $class = shift; 1968 my $class = shift;
1577 1969
1578 $class->SUPER::new ( 1970 $class->SUPER::new (
1579 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1580 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1581 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1975 bg => [0, 0, 0, 0.2],
1976 active_bg => [1, 1, 1, 0.5],
1582 state => 0, 1977 state => 0,
1583 can_hover => 1, 1978 can_hover => 1,
1584 @_ 1979 @_
1585 ) 1980 )
1586} 1981}
1587 1982
1588sub size_request { 1983sub size_request {
1589 my ($self) = @_; 1984 my ($self) = @_;
1590 1985
1591 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1592} 1987}
1593 1988
1594sub button_down { 1989sub button_down {
1595 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1596 1991
1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1599 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1600 $self->emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1601 } 2000 1
1602} 2001}
1603 2002
1604sub _draw { 2003sub _draw {
1605 my ($self) = @_; 2004 my ($self) = @_;
1606 2005
1607 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1608 2007
1609 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1610 2009
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1612 2013
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 2015
1615 glEnable GL_BLEND; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
2017
1616 glEnable GL_TEXTURE_2D; 2018 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 2019 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 2020 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 2021}
1626 2022
1627############################################################################# 2023#############################################################################
1628 2024
1629package CFClient::UI::Image; 2025package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 2068 glTranslate 0, -$self->{w}, 0;
1673 2069
1674 ($w, $h) = ($h, $w); 2070 ($w, $h) = ($h, $w);
1675 } 2071 }
1676 2072
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 2073 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 2075
1682 $tex->draw_quad (0, 0, $w, $h); 2076 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 2077
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 2078 glDisable GL_TEXTURE_2D;
1686} 2079}
1687 2080
1688############################################################################# 2081#############################################################################
1689 2082
… …
1737} 2130}
1738 2131
1739sub set_max { 2132sub set_max {
1740 my ($self, $max) = @_; 2133 my ($self, $max) = @_;
1741 2134
2135 return if $self->{max_val} == $max;
2136
1742 $self->{max_val} = $max; 2137 $self->{max_val} = $max;
2138 $self->update;
1743} 2139}
1744 2140
1745sub set_value { 2141sub set_value {
1746 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1747 2143
1748 $self->set_max ($max) 2144 $self->set_max ($max)
1749 if defined $max; 2145 if defined $max;
1750 2146
1751 $max = $self->{max_val}; 2147 return if $self->{val} == $val;
2148
1752 $self->{val} = $val; 2149 $self->{val} = $val;
1753
1754 $self->update; 2150 $self->update;
1755} 2151}
1756 2152
1757sub _draw { 2153sub _draw {
1758 my ($self) = @_; 2154 my ($self) = @_;
… …
1776 2172
1777 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
1779 2175
1780 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784 2181
1785 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
1786 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
1821 2218
1822sub new { 2219sub new {
1823 my ($class, %arg) = @_; 2220 my ($class, %arg) = @_;
1824 2221
1825 my $self = $class->SUPER::new ( 2222 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 2223 tooltip => $arg{type},
1827 can_hover => 1, 2224 can_hover => 1,
2225 can_events => 1,
1828 %arg, 2226 %arg,
1829 ); 2227 );
1830 2228
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2229 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2230 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 2238
1841 $self->{value}->set_fontsize ($fsize); 2239 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2240 $self->{max} ->set_fontsize ($fsize);
1843} 2241}
1844 2242
2243sub set_max {
2244 my ($self, $max) = @_;
2245
2246 $self->{gauge}->set_max ($max);
2247 $self->{max}->set_text ($max);
2248}
2249
1845sub set_value { 2250sub set_value {
1846 my ($self, $val, $max) = @_; 2251 my ($self, $val, $max) = @_;
1847 2252
1848 $self->set_max ($max) 2253 $self->set_max ($max)
1849 if defined $max; 2254 if defined $max;
1850 2255
1851 $self->{gauge}->set_value ($val, $max); 2256 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2257 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2258}
1861 2259
1862############################################################################# 2260#############################################################################
1863 2261
1864package CFClient::UI::Slider; 2262package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2272 qw(s1_slider.png s1_slider_bg.png);
1875 2273
1876sub new { 2274sub new {
1877 my $class = shift; 2275 my $class = shift;
1878 2276
1879 # range [value, low, high, page] 2277 # range [value, low, high, page, unit]
1880 2278
1881 # TODO: 0-width page 2279 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2280 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2281 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2285 bg => [0, 0, 0, 0.2],
2286 active_bg => [1, 1, 1, 0.5],
1887 range => [0, 0, 100, 10], 2287 range => [0, 0, 100, 10, 0],
1888 req_w => 20, 2288 min_w => $::WIDTH / 80,
1889 req_h => 20, 2289 min_h => $::WIDTH / 80,
1890 vertical => 0, 2290 vertical => 0,
1891 can_hover => 1, 2291 can_hover => 1,
1892 inner_pad => 5, 2292 inner_pad => 0.02,
1893 @_ 2293 @_
1894 ); 2294 );
1895 2295
2296 $self->set_value ($self->{range}[0]);
2297 $self->update;
2298
1896 $self 2299 $self
1897} 2300}
1898 2301
2302sub changed { }
2303
2304sub set_range {
2305 my ($self, $range) = @_;
2306
2307 ($range, $self->{range}) = ($self->{range}, $range);
2308
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}";
2311}
2312
2313sub set_value {
2314 my ($self, $value) = @_;
2315
2316 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2317
2318 $hi = $lo + 1 if $hi <= $lo;
2319
2320 $page = $hi - $lo if $page > $hi - $lo;
2321
2322 $value = $lo if $value < $lo;
2323 $value = $hi - $page if $value > $hi - $page;
2324
2325 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2326 if $unit;
2327
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329
2330 if ($value != $old_value) {
2331 $self->_emit (changed => $value);
2332 $self->update;
2333 }
2334}
2335
1899sub size_request { 2336sub size_request {
1900 my ($self) = @_; 2337 my ($self) = @_;
1901 2338
1902 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
1903 my $h = $self->{req_h};
1904
1905 $self->{vertical} ? ($h, $w) : ($w, $h)
1906} 2340}
1907 2341
1908sub button_down { 2342sub button_down {
1909 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
1910 2344
1911 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2346
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348
1912 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
1913} 2350}
1914 2351
1915sub mouse_motion { 2352sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
1917 2354
1918 if ($GRAB == $self) { 2355 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357
2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2359
2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2361
2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2367 1
2368}
2369
2370sub update {
2371 my ($self) = @_;
2372
2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2381 $self->set_value ($self->{range}[0]);
2382
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2384 my $range = ($hi - $page - $lo) || 1e-100;
1920 2385
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2386 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922 2387
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2388 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2389 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925 2390
1926 $x -= $inner_pad_px; # substract the padding 2391 $value = ($value - $lo) / $range;
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2392 $value = $value * $self->{scale} + $self->{offset};
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2393
1932 $self->emit (changed => $x); 2394 $self->{knob_x} = $value - $knob_w * 0.5;
1933 $self->update; 2395 $self->{knob_w} = $knob_w;
1934 } 2396 }
1935}
1936
1937# the inner_* stuff is for generating a padding for the slider handle,
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943}
1944
1945sub _draw {
1946 my ($self) = @_;
1947 2397
1948 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
1949 2399
1950 my ($w, $h) = @$self{qw(w h)}; 2400 glScale $self->{w}, $self->{h};
1951 2401
1952 if ($self->{vertical}) { 2402 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2403 # draw a vertical slider like a rotated horizontal slider
1954 2404
2405 glTranslate 1, 0, 0;
1955 glRotate 90, 0, 0, 1; 2406 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2407 }
1960 2408
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2409 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2410 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2411
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2412 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2414
1987 # draw background 2415 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2416 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2417
1990 # draw handle 2418 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2419 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992 2420
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
1995} 2422}
2423
2424#############################################################################
2425
2426package CFClient::UI::ValSlider;
2427
2428our @ISA = CFClient::UI::HBox::;
2429
2430sub new {
2431 my ($class, %arg) = @_;
2432
2433 my $range = delete $arg{range};
2434
2435 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift },
2439 from_value => sub { shift },
2440 %arg,
2441 );
2442
2443 $self->{slider}->connect (changed => sub {
2444 my ($self, $value) = @_;
2445 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2446 $self->{parent}->emit (changed => $value);
2447 });
2448
2449# $self->{entry}->connect (changed => sub {
2450# my ($self, $value) = @_;
2451# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2452# $self->{parent}->emit (changed => $value);
2453# });
2454
2455 $self->add ($self->{slider}, $self->{entry});
2456
2457 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2458
2459 $self
2460}
2461
2462sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) }
1996 2464
1997############################################################################# 2465#############################################################################
1998 2466
1999package CFClient::UI::TextView; 2467package CFClient::UI::TextView;
2000 2468
… …
2009 fontsize => 1, 2477 fontsize => 1,
2010 can_events => 0, 2478 can_events => 0,
2011 #font => default_font 2479 #font => default_font
2012 @_, 2480 @_,
2013 2481
2014 layout => (new CFClient::Layout), 2482 layout => (new CFClient::Layout 1),
2015 par => [], 2483 par => [],
2016 height => 0, 2484 height => 0,
2017 children => [ 2485 children => [
2018 (new CFClient::UI::Empty expand => 1), 2486 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2487 (new CFClient::UI::Slider vertical => 1),
2020 ], 2488 ],
2021 ); 2489 );
2022 2490
2023 $self->{children}[1]->connect (changed => sub { 2491 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2492
2027 $self 2493 $self
2028} 2494}
2029 2495
2030sub set_fontsize { 2496sub set_fontsize {
2031 my ($self, $fontsize) = @_; 2497 my ($self, $fontsize) = @_;
2032 2498
2033 $self->{fontsize} = $fontsize; 2499 $self->{fontsize} = $fontsize;
2034 $self->reflow; 2500 $self->reflow;
2035}
2036
2037sub text_height {
2038 my ($self, $text) = @_;
2039
2040 my $layout = $self->{layout};
2041
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w});
2044 $layout->set_text ($text);
2045
2046 ($layout->size)[1]
2047}
2048
2049sub reflow {
2050 my ($self) = @_;
2051
2052 $self->{need_reflow}++;
2053 $self->update;
2054} 2501}
2055 2502
2056sub size_allocate { 2503sub size_allocate {
2057 my ($self, $w, $h) = @_; 2504 my ($self, $w, $h) = @_;
2058 2505
… …
2063 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2064 2511
2065 $self->reflow; 2512 $self->reflow;
2066} 2513}
2067 2514
2515sub text_size {
2516 my ($self, $text, $indent) = @_;
2517
2518 my $layout = $self->{layout};
2519
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $layout->set_width ($self->{children}[0]{w} - $indent);
2522 $layout->set_markup ($text);
2523
2524 $layout->size
2525}
2526
2527sub reflow {
2528 my ($self) = @_;
2529
2530 $self->{need_reflow}++;
2531 $self->update;
2532}
2533
2534sub set_offset {
2535 my ($self, $offset) = @_;
2536
2537 # todo: base offset on lines or so, not on pixels
2538 $self->{children}[1]->set_value ($offset);
2539}
2540
2541sub clear {
2542 my ($self) = @_;
2543
2544 $self->{par} = [];
2545 $self->{height} = 0;
2546 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2547}
2548
2068sub add_paragraph { 2549sub add_paragraph {
2069 my ($self, $color, $text) = @_; 2550 my ($self, $color, $text, $indent) = @_;
2070 2551
2071 #TODO: intelligently "reformat" paragraph 2552 for my $line (split /\n/, $text) {
2072 2553 my ($w, $h) = $self->text_size ($line);
2073 my $height = $self->text_height ($text);
2074
2075 $self->{height} += $height; 2554 $self->{height} += $h;
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2556 }
2076 2557
2077 push @{$self->{par}}, [$height, $color, $text];
2078
2079 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2558 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2080 $self->{children}[1]->update;
2081} 2559}
2082 2560
2083sub update { 2561sub update {
2084 my ($self) = @_; 2562 my ($self) = @_;
2085 2563
… …
2087 2565
2088 return unless $self->{h} > 0; 2566 return unless $self->{h} > 0;
2089 2567
2090 delete $self->{texture}; 2568 delete $self->{texture};
2091 2569
2092 $ROOT->on_refresh ($self, sub { 2570 $ROOT->on_post_alloc ($self, sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572
2093 if (delete $self->{need_reflow}) { 2573 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2574 my $height = 0;
2095 2575
2096 $height += $_->[0] = $self->text_height ($_->[2]) 2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2097 for @{$self->{par}}; 2580 for (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2582 $layout->set_width ($W - $_->[3]);
2583 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3];
2586 $_->[1] = $h;
2587 }
2588
2589 $height += $_->[1];
2590 }
2098 2591
2099 $self->{height} = $height; 2592 $self->{height} = $height;
2100 2593
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2102 2595
2103 delete $self->{texture}; 2596 delete $self->{texture};
2104 } 2597 }
2105 2598
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2107 glClearColor 0, 0, 0, 1; 2600 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2601 glClear GL_COLOR_BUFFER_BIT;
2109 2602
2603 my $top = int $self->{children}[1]{range}[0];
2604
2605 my $y0 = $top;
2606 my $y1 = $top + $H;
2607
2608 my $y = 0;
2609
2610 my $layout = $self->{layout};
2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613
2110 glEnable GL_BLEND; 2614 glEnable GL_BLEND;
2615 #TODO# not correct in windows where rgba is forced off
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2616 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125 2617
2126 for my $par (@{$self->{par}}) { 2618 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2619 my $h = $par->[1];
2128 2620
2129 if ($y0 < $y + $h && $y < $y1) { 2621 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] });
2623 $layout->set_width ($W - $par->[3]);
2130 $layout->set_text ($par->[2]); 2624 $layout->set_markup ($par->[4]);
2131 2625
2132 glColor @{ $par->[1] }; 2626 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133 my ($W, $H) = $layout->size; 2627
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2628 glRasterPos $par->[3], $y - $y0;
2629 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2135 } 2630 }
2136 2631
2137 $y += $h; 2632 $y += $h;
2138 } 2633 }
2139 2634
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND; 2635 glDisable GL_BLEND;
2142 }; 2636 };
2143 }); 2637 });
2144} 2638}
2145 2639
2146sub _draw { 2640sub _draw {
2147 my ($self) = @_; 2641 my ($self) = @_;
2148 2642
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2643 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2645 glColor 0, 0, 0, 1;
2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153 glDisable GL_TEXTURE_2D; 2647 glDisable GL_TEXTURE_2D;
2154 }
2155 2648
2156 $self->{children}[1]->draw; 2649 $self->{children}[1]->draw;
2157 2650
2158} 2651}
2159 2652
… …
2207 2700
2208sub new { 2701sub new {
2209 my $class = shift; 2702 my $class = shift;
2210 2703
2211 my $self = $class->SUPER::new ( 2704 my $self = $class->SUPER::new (
2212 state => 0, 2705 state => 0,
2213 connect_activate => \&toggle_flopper, 2706 on_activate => \&toggle_flopper,
2214 @_ 2707 @_
2215 ); 2708 );
2216 2709
2217 if ($self->{state}) {
2218 $self->{state} = 0;
2219 $self->toggle_flopper;
2220 }
2221
2222 $self 2710 $self
2223} 2711}
2224 2712
2225sub toggle_flopper { 2713sub toggle_flopper {
2226 my ($self) = @_; 2714 my ($self) = @_;
2227 2715
2228 # TODO: use animation 2716 $self->{other}->toggle_visibility;
2229 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open");
2233 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239} 2717}
2240 2718
2241############################################################################# 2719#############################################################################
2242 2720
2243package CFClient::UI::Tooltip; 2721package CFClient::UI::Tooltip;
… …
2253 @_, 2731 @_,
2254 can_events => 0, 2732 can_events => 0,
2255 ) 2733 )
2256} 2734}
2257 2735
2258sub set_markup { 2736sub set_tooltip_from {
2259 my ($self, $text) = @_; 2737 my ($self, $widget) = @_;
2260 2738
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2739 my $tooltip = $widget->{tooltip};
2262 $self->{label}->set_markup ($text); 2740
2263 $self->add ($self->{label}); 2741 if ($ENV{CFPLUS_DEBUG} & 2) {
2742 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}";
2746 }
2747
2748 $self->add (new CFClient::UI::Label
2749 markup => $tooltip,
2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751 fontsize => 0.8,
2752 fg => [0, 0, 0, 1],
2753 ellipsise => 0,
2754 font => ($widget->{tooltip_font} || $::FONT_PROP),
2755 );
2264} 2756}
2265 2757
2266sub size_request { 2758sub size_request {
2267 my ($self) = @_; 2759 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2760
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2761 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2762
2273 ($w + 4, $h + 4) 2763 ($w + 4, $h + 4)
2274} 2764}
… …
2277 my ($self, $w, $h) = @_; 2767 my ($self, $w, $h) = @_;
2278 2768
2279 $self->SUPER::size_allocate ($w - 4, $h - 4); 2769 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280} 2770}
2281 2771
2772sub visibility_change {
2773 my ($self, $visible) = @_;
2774
2775 return unless $visible;
2776
2777 $self->{root}->on_post_alloc ("move_$self" => sub {
2778 my $widget = $self->{owner}
2779 or return;
2780
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH;
2785
2786 $self->move_abs ($x, $y);
2787 });
2788}
2789
2282sub _draw { 2790sub _draw {
2283 my ($self) = @_; 2791 my ($self) = @_;
2284 2792
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2793 glTranslate 0.375, 0.375;
2287 2794
2288 my ($w, $h) = @$self{qw(w h)}; 2795 my ($w, $h) = @$self{qw(w h)};
2289 2796
2290 glColor 1, 0.8, 0.4; 2797 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2808 glVertex 0 , $h;
2302 glVertex $w, $h; 2809 glVertex $w, $h;
2303 glVertex $w, 0; 2810 glVertex $w, 0;
2304 glEnd; 2811 glEnd;
2305 2812
2306 glPopMatrix; 2813 glTranslate 2 - 0.375, 2 - 0.375;
2307 2814
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2815 $self->SUPER::_draw;
2310} 2816}
2311 2817
2312############################################################################# 2818#############################################################################
2313 2819
… …
2318use CFClient::OpenGL; 2824use CFClient::OpenGL;
2319 2825
2320sub new { 2826sub new {
2321 my $class = shift; 2827 my $class = shift;
2322 2828
2323 $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2324 aspect => 1, 2830 aspect => 1,
2831 can_events => 0,
2832 @_,
2833 );
2834
2835 if ($self->{anim} && $self->{animspeed}) {
2836 Scalar::Util::weaken (my $widget = $self);
2837
2838 $self->{timer} = Event->timer (
2839 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2840 hard => 1,
2841 interval => $self->{animspeed},
2842 cb => sub {
2843 ++$widget->{frame};
2844 $widget->update;
2845 },
2846 );
2847 }
2848
2849 $self
2850}
2851
2852sub size_request {
2853 (32, 8)
2854}
2855
2856sub update {
2857 my ($self) = @_;
2858
2859 return unless $self->{visible};
2860
2861 $self->SUPER::update;
2862}
2863
2864sub _draw {
2865 my ($self) = @_;
2866
2867 return unless $::CONN;
2868
2869 my $face;
2870
2871 if ($self->{frame}) {
2872 my $anim = $::CONN->{anim}[$self->{anim}];
2873
2874 $face = $anim->[ $self->{frame} % @$anim ]
2875 if $anim && @$anim;
2876 }
2877
2878 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2879
2880 if ($tex) {
2881 glEnable GL_TEXTURE_2D;
2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2883 glColor 0, 0, 0, 1;
2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885 glDisable GL_TEXTURE_2D;
2886 }
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 $self->{timer}->cancel
2893 if $self->{timer};
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898#############################################################################
2899
2900package CFClient::UI::Buttonbar;
2901
2902our @ISA = CFClient::UI::HBox::;
2903
2904# TODO: should actualyl wrap buttons and other goodies.
2905
2906#############################################################################
2907
2908package CFClient::UI::Menu;
2909
2910our @ISA = CFClient::UI::FancyFrame::;
2911
2912use CFClient::OpenGL;
2913
2914sub new {
2915 my $class = shift;
2916
2917 my $self = $class->SUPER::new (
2918 items => [],
2919 z => 100,
2920 @_,
2921 );
2922
2923 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2924
2925 for my $item (@{ $self->{items} }) {
2926 my ($widget, $cb, $tooltip) = @$item;
2927
2928 # handle various types of items, only text for now
2929 if (!ref $widget) {
2930 $widget = new CFClient::UI::Label
2931 can_hover => 1,
2932 can_events => 1,
2933 text => $widget,
2934 tooltip => $tooltip
2935 }
2936
2937 $self->{item}{$widget} = $item;
2938
2939 $self->{vbox}->add ($widget);
2940 }
2941
2942 $self
2943}
2944
2945# popup given the event (must be a mouse button down event currently)
2946sub popup {
2947 my ($self, $ev) = @_;
2948
2949 $self->_emit ("popdown");
2950
2951 # maybe save $GRAB? must be careful about events...
2952 $GRAB = $self;
2953 $self->{button} = $ev->{button};
2954
2955 $self->show;
2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2957}
2958
2959sub mouse_motion {
2960 my ($self, $ev, $x, $y) = @_;
2961
2962 # TODO: should use vbox->find_widget or so
2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2964 $self->{hover} = $self->{item}{$HOVER};
2965
2966 0
2967}
2968
2969sub button_up {
2970 my ($self, $ev, $x, $y) = @_;
2971
2972 if ($ev->{button} == $self->{button}) {
2973 undef $GRAB;
2974 $self->hide;
2975
2976 $self->_emit ("popdown");
2977 $self->{hover}[1]->() if $self->{hover};
2978 } else {
2979 return 0
2980 }
2981
2982 1
2983}
2984
2985#############################################################################
2986
2987package CFClient::UI::Multiplexer;
2988
2989our @ISA = CFClient::UI::Container::;
2990
2991sub new {
2992 my $class = shift;
2993
2994 my $self = $class->SUPER::new (
2995 @_,
2996 );
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000
3001 $self
3002}
3003
3004sub add {
3005 my ($self, @widgets) = @_;
3006
3007 $self->SUPER::add (@widgets);
3008
3009 $self->{current} = $self->{children}[0]
3010 if @{ $self->{children} };
3011}
3012
3013sub set_current_page {
3014 my ($self, $page_or_widget) = @_;
3015
3016 my $widget = ref $page_or_widget
3017 ? $page_or_widget
3018 : $self->{children}[$page_or_widget];
3019
3020 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022
3023 $self->_emit (page_changed => $self->{current});
3024
3025 $self->realloc;
3026}
3027
3028sub visible_children {
3029 $_[0]{current}
3030}
3031
3032sub size_request {
3033 my ($self) = @_;
3034
3035 $self->{current}->size_request
3036}
3037
3038sub size_allocate {
3039 my ($self, $w, $h) = @_;
3040
3041 $self->{current}->configure (0, 0, $w, $h);
3042}
3043
3044sub _draw {
3045 my ($self) = @_;
3046
3047 $self->{current}->draw;
3048}
3049
3050#############################################################################
3051
3052package CFClient::UI::Notebook;
3053
3054our @ISA = CFClient::UI::VBox::;
3055
3056sub new {
3057 my $class = shift;
3058
3059 my $self = $class->SUPER::new (
3060 buttonbar => (new CFClient::UI::Buttonbar),
3061 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3062 # filter => # will be put between multiplexer and $self
3063 @_,
3064 );
3065
3066 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3067 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3068
3069 $self
3070}
3071
3072sub add {
3073 my ($self, $title, $widget, $tooltip) = @_;
3074
3075 Scalar::Util::weaken $self;
3076
3077 $self->{buttonbar}->add (new CFClient::UI::Button
3078 markup => $title,
3079 tooltip => $tooltip,
3080 on_activate => sub { $self->set_current_page ($widget) },
3081 );
3082
3083 $self->{multiplexer}->add ($widget);
3084}
3085
3086sub set_current_page {
3087 my ($self, $page) = @_;
3088
3089 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current});
3091}
3092
3093#############################################################################
3094
3095package CFClient::UI::Combobox;
3096
3097use utf8;
3098
3099our @ISA = CFClient::UI::Button::;
3100
3101sub new {
3102 my $class = shift;
3103
3104 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ...
3106 value => undef,
3107 @_,
3108 );
3109
3110 $self->_set_value ($self->{value});
3111
3112 $self
3113}
3114
3115sub button_down {
3116 my ($self, $ev) = @_;
3117
3118 my @menu_items;
3119
3120 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_;
3122
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3124 }
3125
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127}
3128
3129sub _set_value {
3130 my ($self, $value) = @_;
3131
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3133 or return;
3134
3135 $self->{value} = $item->[1];
3136 $self->set_markup ("$item->[0] ⇓");
3137 $self->set_tooltip ($item->[2]);
3138}
3139
3140sub set_value {
3141 my ($self, $value) = @_;
3142
3143 return unless $self->{value} ne $value;
3144
3145 $self->_set_value ($value);
3146 $self->_emit (changed => $value);
3147}
3148
3149#############################################################################
3150
3151package CFClient::UI::Statusbox;
3152
3153our @ISA = CFClient::UI::VBox::;
3154
3155sub new {
3156 my $class = shift;
3157
3158 my $self = $class->SUPER::new (
3159 fontsize => 0.8,
3160 @_,
3161 );
3162
3163 Scalar::Util::weaken (my $this = $self);
3164
3165 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3166
3167 $self
3168}
3169
3170sub reorder {
3171 my ($self) = @_;
3172 my $NOW = Time::HiRes::time;
3173
3174 # freeze display when hovering over any label
3175 return if $CFClient::UI::TOOLTIP->{owner}
3176 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3177 values %{ $self->{item} };
3178
3179 while (my ($k, $v) = each %{ $self->{item} }) {
3180 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3181 }
3182
3183 my @widgets;
3184
3185 my @items = sort {
3186 $a->{pri} <=> $b->{pri}
3187 or $b->{id} <=> $a->{id}
3188 } values %{ $self->{item} };
3189
3190 $self->{timer}->interval (1);
3191
3192 my $count = 10 + 1;
3193 for my $item (@items) {
3194 last unless --$count;
3195
3196 my $label = $item->{label} ||= do {
3197 # TODO: doesn't handle markup well (read as: at all)
3198 my $short = $item->{count} > 1
3199 ? "<b>$item->{count} ×</b> $item->{text}"
3200 : $item->{text};
3201
3202 for ($short) {
3203 s/^\s+//;
3204 s/\s+/ /g;
3205 }
3206
3207 new CFClient::UI::Label
3208 markup => $short,
3209 tooltip => $item->{tooltip},
3210 tooltip_font => $::FONT_PROP,
3211 tooltip_width => 0.67,
3212 fontsize => $item->{fontsize} || $self->{fontsize},
3213 max_w => $::WIDTH * 0.44,
3214 fg => [@{ $item->{fg} }],
3215 can_events => 1,
3216 can_hover => 1
3217 };
3218
3219 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3220 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3221 $label->update;
3222 $label->set_max_size (undef, $label->{req_h} * $diff)
3223 if $diff < 1;
3224 $self->{timer}->interval (1/30);
3225 } else {
3226 $label->{fg}[3] = $item->{fg}[3] || 1;
3227 }
3228
3229 push @widgets, $label;
3230 }
3231
3232 $self->clear;
3233 $self->SUPER::add (reverse @widgets);
3234}
3235
3236sub add {
3237 my ($self, $text, %arg) = @_;
3238
3239 $text =~ s/^\s+//;
3240 $text =~ s/\s+$//;
3241
3242 return unless $text;
3243
3244 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3245
3246 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3247
3248 if (my $item = $self->{item}{$group}) {
3249 if ($item->{text} eq $text) {
3250 $item->{count}++;
3251 } else {
3252 $item->{count} = 1;
3253 $item->{text} = $item->{tooltip} = $text;
3254 }
3255 $item->{id} = ++$self->{id};
3256 $item->{timeout} = $timeout;
3257 delete $item->{label};
3258 } else {
3259 $self->{item}{$group} = {
3260 id => ++$self->{id},
3261 text => $text,
3262 timeout => $timeout,
3263 tooltip => $text,
3264 fg => [0.8, 0.8, 0.8, 0.8],
3265 pri => 0,
3266 count => 1,
3267 %arg,
3268 };
3269 }
3270
3271 $self->reorder;
3272}
3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 delete $_->{label}
3278 for values %{ $self->{item} || {} };
3279
3280 $self->reorder;
3281 $self->SUPER::reconfigure;
3282}
3283
3284sub DESTROY {
3285 my ($self) = @_;
3286
3287 $self->{timer}->cancel;
3288
3289 $self->SUPER::DESTROY;
3290}
3291
3292#############################################################################
3293
3294package CFClient::UI::Inventory;
3295
3296our @ISA = CFClient::UI::ScrolledWindow::;
3297
3298sub new {
3299 my $class = shift;
3300
3301 my $self = $class->SUPER::new (
3302 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3303 @_,
3304 );
3305
3306 $self
3307}
3308
3309sub set_items {
3310 my ($self, $items) = @_;
3311
3312 $self->{child}->clear;
3313 return unless $items;
3314
3315 my @items = sort {
3316 ($a->{type} <=> $b->{type})
3317 or ($a->{name} cmp $b->{name})
3318 } @$items;
3319
3320 $self->{real_items} = \@items;
3321
3322 my $row = 0;
3323 for my $item (@items) {
3324 CFClient::Item::update_widgets $item;
3325
3326 $self->{child}->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget});
3329
3330 $row++;
3331 }
3332}
3333
3334#############################################################################
3335
3336package CFClient::UI::BindEditor;
3337
3338our @ISA = CFClient::UI::FancyFrame::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345 $self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349 text => "start recording",
3350 tooltip => "Start/Stops recording of actions."
3351 ."All subsequent actions after the recording started will be captured."
3352 ."The actions are displayed after the record was stopped."
3353 ."To bind the action you have to click on the 'Bind' button",
3354 on_activate => sub {
3355 unless ($self->{recording}) {
3356 $self->start;
3357 } else {
3358 $self->stop;
3359 }
3360 });
3361
3362 $vb->add (new CFClient::UI::Label text => "Actions:");
3363 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3366 $vb->add (my $hb = new CFClient::UI::HBox);
3367 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368 $hb->add (new CFClient::UI::Button
3369 text => "bind",
3370 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371 on_activate => sub {
3372 $self->ask_for_bind;
3373 });
3374
3375 $vb->add (my $hb = new CFClient::UI::HBox);
3376 $hb->add (new CFClient::UI::Button
3377 text => "ok",
3378 expand => 1,
3379 tooltip => "This closes the binding editor and saves the binding",
3380 on_activate => sub {
3381 $self->hide;
3382 $self->commit;
3383 });
3384
3385 $hb->add (new CFClient::UI::Button
3386 text => "cancel",
3387 expand => 1,
3388 tooltip => "This closes the binding editor without saving",
3389 on_activate => sub {
3390 $self->hide;
3391 $self->{binding_cancel}->()
3392 if $self->{binding_cancel};
3393 });
3394
3395 $self->update_binding_widgets;
3396
3397 $self
3398}
3399
3400sub commit {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 if ($sym != 0 && @$cmds > 0) {
3404 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405 ."'. Don't forget 'Save Config'!");
3406 $self->{binding_change}->($mod, $sym, $cmds)
3407 if $self->{binding_change};
3408 } else {
3409 $::STATUSBOX->add ("No action bound, no key or action specified!");
3410 $self->{binding_cancel}->()
3411 if $self->{binding_cancel};
3412 }
3413}
3414
3415sub start {
3416 my ($self) = @_;
3417
3418 $self->{rec_btn}->set_text ("stop recording");
3419 $self->{recording} = 1;
3420 $self->clear_command_list;
3421 $::CONN->start_record if $::CONN;
3422}
3423
3424sub stop {
3425 my ($self) = @_;
3426
3427 $self->{rec_btn}->set_text ("start recording");
3428 $self->{recording} = 0;
3429
3430 my $rec;
3431 $rec = $::CONN->stop_record if $::CONN;
3432 return unless ref $rec eq 'ARRAY';
3433 $self->set_command_list ($rec);
3434}
3435
3436
3437sub ask_for_bind_and_commit {
3438 my ($self) = @_;
3439 $self->ask_for_bind (1);
3440}
3441
3442sub ask_for_bind {
3443 my ($self, $commit) = @_;
3444
3445 CFClient::Binder::open_binding_dialog (sub {
3446 my ($mod, $sym) = @_;
3447 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448 $self->update_binding_widgets;
3449 $self->commit if $commit;
3450 });
3451}
3452
3453# $mod and $sym are the modifiers and key symbol
3454# $cmds is a array ref of strings (the commands)
3455# $cb is the callback that is executed on OK
3456# $ccb is the callback that is executed on CANCEL and
3457# when the binding was unsuccessful on OK
3458sub set_binding {
3459 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461 $self->clear_command_list;
3462 $self->{recording} = 0;
3463 $self->{rec_btn}->set_text ("start recording");
3464
3465 $self->{binding} = [$mod, $sym];
3466 $self->{commands} = $cmds;
3467
3468 $self->{binding_change} = $cb;
3469 $self->{binding_cancel} = $ccb;
3470
3471 $self->update_binding_widgets;
3472}
3473
3474# this is a shortcut method that asks for a binding
3475# and then just binds it.
3476sub do_quick_binding {
3477 my ($self, $cmds) = @_;
3478 $self->set_binding (undef, undef, $cmds, sub {
3479 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480 });
3481 $self->ask_for_bind (1);
3482}
3483
3484sub update_binding_widgets {
3485 my ($self) = @_;
3486 my ($mod, $sym, $cmds) = $self->get_binding;
3487 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488 $self->set_command_list ($cmds);
3489}
3490
3491sub get_binding {
3492 my ($self) = @_;
3493 return (
3494 $self->{binding}->[0],
3495 $self->{binding}->[1],
3496 [ grep { defined $_ } @{$self->{commands}} ]
3497 );
3498}
3499
3500sub clear_command_list {
3501 my ($self) = @_;
3502 $self->{cmdbox}->clear ();
3503}
3504
3505sub set_command_list {
3506 my ($self, $cmds) = @_;
3507
3508 $self->{cmdbox}->clear ();
3509 $self->{commands} = $cmds;
3510
3511 my $idx = 0;
3512
3513 for (@$cmds) {
3514 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516 my $i = $idx;
3517 $hb->add (new CFClient::UI::Label text => $_);
3518 $hb->add (new CFClient::UI::Button
3519 text => "delete",
3520 tooltip => "Deletes the action from the record",
3521 on_activate => sub {
3522 $self->{cmdbox}->remove ($hb);
3523 $cmds->[$i] = undef;
3524 });
3525
3526
3527 $idx++
3528 }
3529}
3530
3531#############################################################################
3532
3533package CFClient::UI::SpellList;
3534
3535our @ISA = CFClient::UI::Table::;
3536
3537sub new {
3538 my $class = shift;
3539
3540 my $self = $class->SUPER::new (
3541 binding => [],
3542 commands => [],
2325 @_, 3543 @_,
2326 ) 3544 )
2327} 3545}
2328 3546
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3553
3554sub rebuild_spell_list {
3555 my ($self) = @_;
3556
3557 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear;
3559
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564
3565 my $row = 0;
3566
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_};
3569
3570 $row++;
3571
3572 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $spell->{message},
3577 );
3578
3579 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1,
3581 text => $spell->{name},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 }
3598 });
3599}
3600
3601sub add_spell {
3602 my ($self, $spell) = @_;
3603
3604 $self->{spell}->{$spell->{name}} = $spell;
3605 $self->rebuild_spell_list;
3606}
3607
3608sub remove_spell {
3609 my ($self, $spell) = @_;
3610
3611 delete $self->{spell}->{$spell->{name}};
3612 $self->rebuild_spell_list;
3613}
3614
3615#############################################################################
3616
3617package CFClient::UI::Root;
3618
3619our @ISA = CFClient::UI::Container::;
3620
3621use List::Util qw(min max);
3622
3623use CFClient::OpenGL;
3624
3625sub new {
3626 my $class = shift;
3627
3628 my $self = $class->SUPER::new (
3629 visible => 1,
3630 @_,
3631 );
3632
3633 Scalar::Util::weaken ($self->{root} = $self);
3634
3635 $self
3636}
3637
2329sub size_request { 3638sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_; 3639 my ($self) = @_;
2335 3640
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3641 ($self->{w}, $self->{h})
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348} 3642}
2349 3643
2350############################################################################# 3644sub _to_pixel {
3645 my ($coord, $size, $max) = @_;
2351 3646
2352package CFClient::UI::Root; 3647 $coord =
3648 $coord eq "center" ? ($max - $size) * 0.5
3649 : $coord eq "max" ? $max
3650 : $coord;
2353 3651
2354our @ISA = CFClient::UI::Container::; 3652 $coord = 0 if $coord < 0;
3653 $coord = $max - $size if $coord > $max - $size;
2355 3654
2356use CFClient::OpenGL; 3655 int $coord + 0.5
2357
2358sub check_size {
2359 my ($self) = @_;
2360
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2362} 3656}
2363 3657
2364sub size_request { 3658sub size_allocate {
2365 ($::WIDTH, $::HEIGHT)
2366}
2367
2368sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 3659 my ($self, $w, $h) = @_;
2370 3660
2371 $self->SUPER::configure ($x, $y, $w, $h);
2372
2373 for my $child (@{$self->{children}}) { 3661 for my $child ($self->children) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375 3663
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3664 $X = $child->{force_x} if exists $child->{force_x};
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3665 $Y = $child->{force_y} if exists $child->{force_y};
3666
3667 $X = _to_pixel $X, $W, $self->{w};
3668 $Y = _to_pixel $Y, $H, $self->{h};
3669
2378 $child->configure ($X, $Y, $W,$H); 3670 $child->configure ($X, $Y, $W, $H);
2379 } 3671 }
2380} 3672}
2381 3673
2382sub _topleft { 3674sub coord2local {
2383 my ($self, $x, $y) = @_; 3675 my ($self, $x, $y) = @_;
2384 3676
2385 ($x, $y) 3677 ($x, $y)
2386} 3678}
2387 3679
3680sub coord2global {
3681 my ($self, $x, $y) = @_;
3682
3683 ($x, $y)
3684}
3685
2388sub update { 3686sub update {
2389 my ($self) = @_; 3687 my ($self) = @_;
2390 3688
2391 $self->check_size; 3689 $::WANT_REFRESH++;
2392 ::refresh ();
2393} 3690}
2394 3691
2395sub add { 3692sub add {
2396 my ($self, $child) = @_; 3693 my ($self, @children) = @_;
2397 3694
2398 # integerize window positions 3695 $_->{is_toplevel} = 1
2399 $child->{x} = int $child->{x}; 3696 for @children;
2400 $child->{y} = int $child->{y};
2401 3697
2402 $self->SUPER::add ($child); 3698 $self->SUPER::add (@children);
3699}
3700
3701sub remove {
3702 my ($self, @children) = @_;
3703
3704 $self->SUPER::remove (@children);
3705
3706 delete $self->{is_toplevel}
3707 for @children;
3708
3709 while (@children) {
3710 my $w = pop @children;
3711 push @children, $w->children;
3712 $w->set_invisible;
3713 }
2403} 3714}
2404 3715
2405sub on_refresh { 3716sub on_refresh {
2406 my ($self, $id, $cb) = @_; 3717 my ($self, $id, $cb) = @_;
2407 3718
2408 $self->{refresh_hook}{$id} = $cb; 3719 $self->{refresh_hook}{$id} = $cb;
2409} 3720}
2410 3721
3722sub on_post_alloc {
3723 my ($self, $id, $cb) = @_;
3724
3725 $self->{post_alloc_hook}{$id} = $cb;
3726}
3727
2411sub draw { 3728sub draw {
2412 my ($self) = @_; 3729 my ($self) = @_;
2413 3730
2414 while (my $rcb = delete $self->{refresh_hook}) { 3731 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 3732 $_->()
3733 for values %{delete $self->{refresh_hook}};
2416 } 3734 }
3735
3736 if ($self->{realloc}) {
3737 my %queue;
3738 my @queue;
3739 my $widget;
3740
3741 outer:
3742 while () {
3743 if (my $realloc = delete $self->{realloc}) {
3744 for $widget (values %$realloc) {
3745 $widget->{visible} or next; # do not resize invisible widgets
3746
3747 $queue{$widget+0}++ and next; # duplicates are common
3748
3749 push @{ $queue[$widget->{visible}] }, $widget;
3750 }
3751 }
3752
3753 while () {
3754 @queue or last outer;
3755
3756 $widget = pop @{ $queue[-1] || [] }
3757 and last;
3758
3759 pop @queue;
3760 }
3761
3762 delete $queue{$widget+0};
3763
3764 my ($w, $h) = $widget->size_request;
3765
3766 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3767 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3768
3769 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3770 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3771
3772 $w = $widget->{force_w} if exists $widget->{force_w};
3773 $h = $widget->{force_h} if exists $widget->{force_h};
3774
3775 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3776 || delete $widget->{force_realloc}) {
3777 $widget->{req_w} = $w;
3778 $widget->{req_h} = $h;
3779
3780 $self->{size_alloc}{$widget+0} = $widget;
3781
3782 if (my $parent = $widget->{parent}) {
3783 $self->{realloc}{$parent+0} = $parent
3784 unless $queue{$parent+0};
3785
3786 $parent->{force_size_alloc} = 1;
3787 $self->{size_alloc}{$parent+0} = $parent;
3788 }
3789 }
3790
3791 delete $self->{realloc}{$widget+0};
3792 }
3793 }
3794
3795 while (my $size_alloc = delete $self->{size_alloc}) {
3796 my @queue = sort { $b->{visible} <=> $a->{visible} }
3797 values %$size_alloc;
3798
3799 while () {
3800 my $widget = pop @queue || last;
3801
3802 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3803
3804 $w = 0 if $w < 0;
3805 $h = 0 if $h < 0;
3806
3807 $w = int $w + 0.5;
3808 $h = int $h + 0.5;
3809
3810 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3811 $widget->{old_w} = $widget->{w};
3812 $widget->{old_h} = $widget->{h};
3813
3814 $widget->{w} = $w;
3815 $widget->{h} = $h;
3816
3817 $widget->emit (size_allocate => $w, $h);
3818 }
3819 }
3820 }
3821
3822 while ($self->{post_alloc_hook}) {
3823 $_->()
3824 for values %{delete $self->{post_alloc_hook}};
3825 }
3826
2417 3827
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3828 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3829 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 3830 glClear GL_COLOR_BUFFER_BIT;
2421 3831
2422 glMatrixMode GL_PROJECTION; 3832 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity; 3833 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425 glMatrixMode GL_MODELVIEW; 3835 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity; 3836 glLoadIdentity;
2427 3837
3838 {
3839 package CFClient::UI::Base;
3840
3841 ($draw_x, $draw_y, $draw_w, $draw_h) =
3842 (0, 0, $self->{w}, $self->{h});
3843 }
3844
2428 $self->_draw; 3845 $self->_draw;
2429} 3846}
2430 3847
2431############################################################################# 3848#############################################################################
2432 3849
2433package CFClient::UI; 3850package CFClient::UI;
2434 3851
2435$ROOT = new CFClient::UI::Root; 3852$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip; 3853$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437 3854
24381 38551
2439 3856

Diff Legend

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