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.161 by root, Mon Apr 24 03:43:51 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_text ($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->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
57 90
58 $GRAB = $widget; 91 $GRAB = $widget;
59 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
60 93
61 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
83 118
84 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
85 } 120 }
86} 121}
87 122
88sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
89 my ($ev) = @_; 124 my ($ev) = @_;
… …
95 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
96 131
97 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 $TOOLTIP_WATCHER->start;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 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
119############################################################################# 196#############################################################################
120 197
121package CFClient::UI::Base; 198package CFClient::UI::Base;
122 199
123use strict; 200use strict;
… …
126 203
127sub new { 204sub new {
128 my $class = shift; 205 my $class = shift;
129 206
130 my $self = bless { 207 my $self = bless {
131 x => 0, 208 x => "center",
132 y => 0, 209 y => "center",
133 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
134 can_events => 1, 213 can_events => 1,
135 @_ 214 @_
136 }, $class; 215 }, $class;
137 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
138 for (keys %$self) { 219 for (keys %$self) {
139 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
141 } 222 }
142 } 223 }
143 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
144 $self 237 $self
145} 238}
146 239
147sub destroy { 240sub destroy {
148 my ($self) = @_; 241 my ($self) = @_;
… …
157 return if $self->{parent}; 250 return if $self->{parent};
158 251
159 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
160} 253}
161 254
255sub set_visible {
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};
279
280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self;
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
162sub hide { 308sub hide {
163 my ($self) = @_; 309 my ($self) = @_;
164 310
165 return unless $self->{parent}; 311 $self->set_invisible;
166 312
167 $self->{parent}->remove ($self); 313 $self->{parent}->remove ($self)
314 if $self->{parent};
168} 315}
169 316
170sub move { 317sub move_abs {
171 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
172 319
173 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
176 323
177 $self->update; 324 $self->update;
178} 325}
179 326
180sub set_size { 327sub set_size {
181 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
182 329
183 $self->{user_w} = $w; 330 $self->{force_w} = $w;
184 $self->{user_h} = $h; 331 $self->{force_h} = $h;
185 332
186 $self->check_size; 333 $self->realloc;
187} 334}
188 335
189sub size_request { 336sub size_request {
190 require Carp; 337 require Carp;
191 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
193 340
194sub configure { 341sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
196 343
197 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
200 349
201 # use alignment to adjust x, y 350 # use alignment to adjust x, y
202 351
203 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 354 }
208 355
209 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 357 $self->{x} = $x;
211 $self->{y} = $y; 358 $self->{y} = $y;
212 $self->update; 359 $self->update;
213 } 360 }
214 361
215 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
216 $self->{w} = $w; 365 $self->{alloc_w} = $w;
217 $self->{h} = $h; 366 $self->{alloc_h} = $h;
218 367
219 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 369 }
222} 370}
223 371
224sub size_allocate { 372sub size_allocate {
225 # nothing to be done 373 # nothing to be done
226} 374}
227 375
376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
228sub set_max_size { 384sub set_max_size {
229 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
230 386
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
233}
234 389
235# return top left coordinates 390 $self->realloc;
236sub _topleft { 391}
392
393sub set_tooltip {
237 my ($self, $x, $y) = @_; 394 my ($self, $tooltip) = @_;
238 395
239 $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 }
240} 407}
241 408
242# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
243sub coord2local { 410sub coord2local {
244 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
245 412
246 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 414}
249 415
250# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
251sub coord2global { 417sub coord2global {
252 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
253 419
254 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 421}
257 422
258sub focus_in { 423sub focus_in {
259 my ($self) = @_; 424 my ($self) = @_;
260 425
261 return if $FOCUS == $self; 426 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
263 428
264 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
265 430
266 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
267 432
268 $focus->update if $focus; 433 $focus->update if $focus;
269 $FOCUS->update; 434 $FOCUS->update;
270} 435}
271 436
… …
274 439
275 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
276 441
277 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
278 443
279 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
280 445
281 $focus->update if $focus; #? 446 $focus->update if $focus; #?
282}
283 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
284sub mouse_motion { } 452sub mouse_motion { 0 }
285sub button_up { } 453sub button_up { 0 }
286sub key_down { } 454sub key_down { 0 }
287sub key_up { } 455sub key_up { 0 }
288 456
289sub button_down { 457sub button_down {
290 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
291 459
292 $self->focus_in; 460 $self->focus_in;
293}
294 461
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
299sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
300
301sub draw {
302 my ($self) = @_;
303
304 return unless $self->{h} && $self->{w};
305
306 glPushMatrix;
307 glTranslate $self->{x}, $self->{y}, 0;
308 $self->_draw;
309 glPopMatrix;
310
311 if ($self == $HOVER && $self->{can_hover}) {
312 my ($x, $y) = @$self{qw(x y)};
313
314 glColor 1, 0.8, 0.5, 0.2;
315 glEnable GL_BLEND;
316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
317 glBegin GL_QUADS;
318 glVertex $x , $y;
319 glVertex $x + $self->{w}, $y;
320 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h};
322 glEnd;
323 glDisable GL_BLEND;
324 } 462 0
325}
326
327sub _draw {
328 my ($self) = @_;
329
330 warn "no draw defined for $self\n";
331} 463}
332 464
333sub find_widget { 465sub find_widget {
334 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
335 467
… …
344 476
345sub set_parent { 477sub set_parent {
346 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
347 479
348 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
349} 482}
350 483
351sub check_size { 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 {
352 my ($self) = @_; 504 #my ($self, $visible) = @_;
505}
353 506
354 $self->{parent} 507sub realloc {
355 or return 1; 508 my ($self) = @_;
356 509
357 my ($w, $h) = $self->{user_w} && $self->{user_h} 510 if ($self->{visible}) {
358 ? @$self{qw(user_w user_h)} 511 return if $self->{root}{realloc}{$self+0};
359 : $self->size_request;
360 512
361 if ($w != $self->{req_w} || $h != $self->{req_h}) { 513 $self->{root}{realloc}{$self+0} = $self;
362 $self->{req_w} = $w; 514 $self->{root}->update;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else { 515 } else {
373 0 516 delete $self->{req_w};
517 delete $self->{req_h};
374 } 518 }
375} 519}
376 520
377sub update { 521sub update {
378 my ($self) = @_; 522 my ($self) = @_;
379 523
380 $self->{parent}->update 524 $self->{parent}->update
381 if $self->{parent}; 525 if $self->{parent};
382} 526}
383 527
384sub connect { 528sub reconfigure {
385 my ($self, $signal, $cb) = @_; 529 my ($self) = @_;
386 530
387 push @{ $self->{signal_cb}{$signal} }, $cb; 531 $self->realloc;
532 $self->update;
388} 533}
389 534
390sub emit { 535# using global variables seems a bit hacky, but passing through all drawing
391 my ($self, $signal, @args) = @_; 536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
392 538
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 539sub draw {
394 $cb->($self, @args); 540 my ($self) = @_;
541
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);
553
554 glPushMatrix;
555 glTranslate $self->{x}, $self->{y}, 0;
556
557 if ($self == $HOVER && $self->{can_hover}) {
558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559 glEnable GL_BLEND;
560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561 glBegin GL_QUADS;
562 glVertex 0 , 0;
563 glVertex $self->{w}, 0;
564 glVertex $self->{w}, $self->{h};
565 glVertex 0 , $self->{h};
566 glEnd;
567 glDisable GL_BLEND;
395 } 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;
580 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 }
583
584 $self->_draw;
585 glPopMatrix;
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 warn "no draw defined for $self\n";
396} 592}
397 593
398sub DESTROY { 594sub DESTROY {
399 my ($self) = @_; 595 my ($self) = @_;
400 596
597 delete $WIDGET{$self+0};
401 #$self->deactivate; 598 #$self->deactivate;
402} 599}
403 600
404############################################################################# 601#############################################################################
405 602
… …
414 my $class = shift; 611 my $class = shift;
415 612
416 # range [value, low, high, page] 613 # range [value, low, high, page]
417 614
418 $class->SUPER::new ( 615 $class->SUPER::new (
419 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
420 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
421 @_ 618 @_
422 ) 619 )
423} 620}
424 621
425sub _draw { 622sub _draw {
426 my ($self) = @_; 623 my ($self) = @_;
427 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
428 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
429 631
430 glEnable GL_BLEND; 632 glEnable GL_BLEND;
431 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
432 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
433 635
434 glBegin GL_QUADS; 636 glBegin GL_QUADS;
435 glVertex 0 , 0; 637 glVertex 0 , 0;
436 glVertex 0 , $h; 638 glVertex 0 , $h;
437 glVertex $w, $h; 639 glVertex $w, $h;
438 glVertex $w, 0; 640 glVertex $w, 0;
439 glEnd; 641 glEnd;
440 642
441 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
442} 645}
443 646
444############################################################################# 647#############################################################################
445 648
446package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
451 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
452 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
453} 656}
454 657
455sub size_request { 658sub size_request {
456 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
457} 662}
458 663
459sub draw { } 664sub draw { }
460 665
461############################################################################# 666#############################################################################
… …
465our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
466 671
467sub new { 672sub new {
468 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
469 674
470 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
471 676
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 677 my $self = $class->SUPER::new (
678 children => [],
679 can_events => 0,
680 %arg,
681 );
682
473 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
474 685
475 $self 686 $self
476} 687}
477 688
478sub add { 689sub add {
479 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
480 691
481 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
482 694
483 use sort 'stable'; 695 use sort 'stable';
484 696
485 $self->{children} = [ 697 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
488 ]; 700 ];
489 701
490 $child->check_size; 702 $self->realloc;
703}
704
705sub children {
706 @{ $_[0]{children} }
491} 707}
492 708
493sub remove { 709sub remove {
494 my ($self, $child) = @_; 710 my ($self, $child) = @_;
495 711
496 delete $child->{parent}; 712 delete $child->{parent};
713 $child->hide;
497 714
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 716
500 $self->check_size; 717 $self->realloc;
501 $self->update; 718}
719
720sub clear {
721 my ($self) = @_;
722
723 my $children = delete $self->{children};
724 $self->{children} = [];
725
726 for (@$children) {
727 delete $_->{parent};
728 $_->hide;
729 }
730
731 $self->realloc;
502} 732}
503 733
504sub find_widget { 734sub find_widget {
505 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
506 736
507 $x -= $self->{x}; 737 $x -= $self->{x};
508 $y -= $self->{y}; 738 $y -= $self->{y};
509 739
510 my $res; 740 my $res;
511 741
512 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
513 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
514 and return $res; 744 and return $res;
515 } 745 }
516 746
517 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
566 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
567} 797}
568 798
569############################################################################# 799#############################################################################
570 800
801# back-buffered drawing area
802
571package CFClient::UI::Window; 803package CFClient::UI::Window;
572 804
573our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
574 806
575use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
581} 813}
582 814
583sub update { 815sub update {
584 my ($self) = @_; 816 my ($self) = @_;
585 817
586 # we want to do this delayed... 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 819 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 820}
600 821
601sub size_allocate { 822sub size_allocate {
602 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
603 824
604 $self->child->configure (0, 0, $w, $h); 825 $self->SUPER::size_allocate ($w, $h);
826 $self->update;
827}
605 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
606 $self->render_chld; 849 $self->_render;
850 };
607} 851}
608 852
609sub _draw { 853sub _draw {
610 my ($self) = @_; 854 my ($self) = @_;
611 855
612 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
613 857
614 my $tex = $self->{texture} 858 my $tex = $self->{texture}
615 or return; 859 or return;
616 860
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
620 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;
621 864
622 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 866
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
626} 868}
627 869
628############################################################################# 870#############################################################################
629 871
630package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
631 873
632our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
633
634sub new { die }
635
636sub size_request {
637 my ($self) = @_;
638
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
641
642 @$self{qw(child_w child_h)}
643}
644
645sub _draw {
646 my ($self) = @_;
647
648 $self->{children}[1]->draw;
649}
650
651
652#############################################################################
653
654package CFClient::UI::Frame;
655
656our @ISA = CFClient::UI::Bin::;
657
658use CFClient::OpenGL;
659 875
660sub new { 876sub new {
661 my $class = shift; 877 my $class = shift;
662 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
663 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
665 border_bg => [1, 1, 1, 1], 980 slider => $slider,
666 border => 0.8, 981 %arg,
667 @_
668 ); 982 );
669 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
670 $self 987 $self
671} 988}
672 989
673sub _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 {
674 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
675 1008
676 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
677 1010
678 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
679 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]);
680 glEnable GL_TEXTURE_2D;
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682
683# glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0;
686# glVertex 0 , $h;
687# glVertex $w, $h;
688# glVertex $w, 0;
689# glEnd;
690
691
692 $self->child->draw;
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D;
695} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
696 1017
697############################################################################# 1018#############################################################################
698 1019
699package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
700 1021
701our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
702 1023
703use CFClient::OpenGL; 1024use CFClient::OpenGL;
704
705my @tex =
706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
707 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
708 1025
709sub new { 1026sub new {
710 my $class = shift; 1027 my $class = shift;
711 1028
712 # 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};
713 1078
714 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
717 border => 0.8, 1082 border => 0.6,
718 can_events => 1, 1083 can_events => 1,
719 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
720 ); 1087 );
721 1088
722 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
723 align => 0, 1090 align => 0,
724 valign => 1, 1091 valign => 1,
725 text => $self->{title}, 1092 text => $title,
726 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
727 1095
728 $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};
729} 1104}
730 1105
731sub border { 1106sub border {
732 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
733} 1108}
734 1109
735sub size_request { 1110sub size_request {
736 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
737 1115
738 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
739 1117
740 ( 1118 (
741 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
744} 1122}
745 1123
746sub size_allocate { 1124sub size_allocate {
747 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
748 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
749 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
751 1137
752 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
753 if $self->{title};
754
755 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
756} 1139}
757 1140
758sub button_down { 1141sub button_down {
759 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
760 1143
1144 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 1145 my $border = $self->border;
762 1146
763 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
768 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
769 $self->{motion} = sub { 1158 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
771 1160
772 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
773 1163
774 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
776 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
777 }; 1169 };
778 1170
779 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
784 1174
785 $self->{motion} = sub { 1175 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
787 1177
788 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
789 1179
790 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
791 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
792 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
793 } 1188 1
794} 1189}
795 1190
796sub button_up { 1191sub button_up {
797 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
798 1193
799 delete $self->{motion}; 1194 !!delete $self->{motion}
800} 1195}
801 1196
802sub mouse_motion { 1197sub mouse_motion {
803 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
804 1199
805 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
806} 1203}
807 1204
808sub _draw { 1205sub _draw {
809 my ($self) = @_; 1206 my ($self) = @_;
810 1207
1208 my $child = $self->{children}[0];
1209
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
813 1212
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1215
819 my $border = $self->border; 1216 my $border = $self->border;
820 1217
821 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1223
827 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
828 1226
829 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
831 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
832 1230 $bg->{t} = $ch / $bg->{h};
833 glColor @{ $self->{bg} };
834
835 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
839 1233
840 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1235
843 $self->{title}->draw if $self->{title};
844 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
845} 1242}
846 1243
847############################################################################# 1244#############################################################################
848 1245
849package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
857sub new { 1254sub new {
858 my $class = shift; 1255 my $class = shift;
859 1256
860 $class->SUPER::new ( 1257 $class->SUPER::new (
861 col_expand => [], 1258 col_expand => [],
862 @_ 1259 @_,
863 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
864} 1265}
865 1266
866sub add { 1267sub add {
867 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
868 1269
869 $child->set_parent ($self); 1270 $child->set_parent ($self);
870 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
871 1272
872 $child->check_size; 1273 $self->realloc;
873} 1274}
874 1275
875# 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?
876sub clear { 1277sub clear {
877 my ($self) = @_; 1278 my ($self) = @_;
878 1279
1280 my @children = $self->children;
879 delete $self->{children}; 1281 delete $self->{children};
880 $self->update; 1282
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287
1288 $self->realloc;
881} 1289}
882 1290
883sub get_wh { 1291sub get_wh {
884 my ($self) = @_; 1292 my ($self) = @_;
885 1293
… …
916sub size_allocate { 1324sub size_allocate {
917 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
918 1326
919 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
920 1328
921 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
922 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
923 1331
924 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
925 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
926 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
927 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
981 } 1389 }
982} 1390}
983 1391
984############################################################################# 1392#############################################################################
985 1393
986package CFClient::UI::HBox; 1394package CFClient::UI::Box;
987
988# TODO: wrap into common Box base class
989 1395
990our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
991 1397
992sub size_request { 1398sub size_request {
993 my ($self) = @_; 1399 my ($self) = @_;
994 1400
995 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
996 1402 ? (
997 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
998 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
999 (List::Util::max map $_->[1], @alloc), 1405 )
1000 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1001} 1410}
1002 1411
1003sub size_allocate { 1412sub size_allocate {
1004 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1005 1414
1006 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1007
1008 my $children = $self->{children}; 1416 my $children = $self->{children};
1009 1417
1010 my @h = map $_->{req_w}, @$children; 1418 my @req;
1011 1419
1012 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1013 1421 @req = ($space / (@$children || 1)) x @$children;
1014 if ($req_h > $h) {
1015 # ah well, not enough space
1016 $_ *= $h / $req_h for @h;
1017 } 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 {
1018 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1019 $exp ||= 1;
1020 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1021 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1022 my $child = $children->[$_];
1023
1024 my $alloc_h = $h[$_];
1025 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1026 $h[$_] = $alloc_h;
1027 } 1436 }
1028 } 1437 }
1029 1438
1030 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1031 1440
1032 my $y = 0; 1441 my $pos = 0;
1033 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1034 my $child = $children->[$_];
1035 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1036 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1037 1445
1038 $y += $h; 1446 $pos += $alloc;
1039 } 1447 }
1040 1448
1041 1 1449 1
1042} 1450}
1043 1451
1044############################################################################# 1452#############################################################################
1045 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
1046package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1047 1470
1048# TODO: wrap into common Box base class
1049
1050our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1051 1472
1052sub size_request { 1473sub new {
1053 my ($self) = @_; 1474 my $class = shift;
1054 1475
1055 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1056 1477 vertical => 1,
1057 ( 1478 @_,
1058 (List::Util::max map $_->[0], @alloc),
1059 (List::Util::sum map $_->[1], @alloc),
1060 ) 1479 )
1061} 1480}
1062 1481
1063sub size_allocate {
1064 my ($self, $w, $h) = @_;
1065
1066 my $children = $self->{children};
1067
1068 my @h = map $_->{req_h}, @$children;
1069
1070 my $req_h = List::Util::sum @h;
1071
1072 if ($req_h > $h) {
1073 # ah well, not enough space
1074 $_ *= $h / $req_h for @h;
1075 } else {
1076 my $exp = List::Util::sum map $_->{expand}, @$children;
1077 $exp ||= 1;
1078
1079 for (0 .. $#$children) {
1080 my $child = $children->[$_];
1081
1082 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1083 }
1084 }
1085
1086 CFClient::UI::harmonize \@h;
1087
1088 my $y = 0;
1089 for (0 .. $#$children) {
1090 my $child = $children->[$_];
1091 my $h = $h[$_];
1092 $child->configure (0, $y, $w, $h);
1093
1094 $y += $h;
1095 }
1096
1097 1
1098}
1099
1100############################################################################# 1482#############################################################################
1101 1483
1102package CFClient::UI::Label; 1484package CFClient::UI::Label;
1103 1485
1104our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1105 1487
1106use CFClient::OpenGL; 1488use CFClient::OpenGL;
1107 1489
1108sub new { 1490sub new {
1109 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1110 1492
1111 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1113 #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),
1114 fontsize => 1, 1503 fontsize => 1,
1115 text => "",
1116 align => -1, 1504 align => -1,
1117 valign => -1, 1505 valign => -1,
1118 padding => 2, 1506 padding_x => 2,
1119 layout => new CFClient::Layout, 1507 padding_y => 2,
1120 can_events => 0, 1508 can_events => 0,
1121 %arg 1509 %arg
1122 ); 1510 );
1123 1511
1124 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1515 $self->{template} = $layout;
1128 } 1516 }
1129 1517
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1131 $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 }
1132 1523
1133 $self 1524 $self
1134} 1525}
1135 1526
1136sub escape_text { 1527sub escape($) {
1137 local $_ = $_[1]; 1528 local $_ = $_[0];
1138 1529
1139 s/&/&amp;/g; 1530 s/&/&amp;/g;
1140 s/>/&gt;/g; 1531 s/>/&gt;/g;
1141 s/</&lt;/g; 1532 s/</&lt;/g;
1142 1533
1143 $_[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;
1144} 1549}
1145 1550
1146sub set_text { 1551sub set_text {
1147 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1148 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;
1149 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1150 1559
1151 delete $self->{texture}; 1560 delete $self->{size_req};
1152 $self->check_size; 1561 $self->realloc;
1153 $self->update; 1562 $self->update;
1154} 1563}
1155 1564
1156sub set_markup { 1565sub set_markup {
1157 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1158 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;
1159 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1160 1575
1161 delete $self->{texture}; 1576 delete $self->{size_req};
1162 $self->check_size; 1577 $self->realloc;
1163 $self->update; 1578 $self->update;
1164} 1579}
1165 1580
1166sub size_request { 1581sub size_request {
1167 my ($self) = @_; 1582 my ($self) = @_;
1168 1583
1584 $self->{size_req} ||= do {
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $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});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1590
1173 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1174 1592
1175 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1176 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1177 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1178 1596
1179 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1180 1598
1181 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1182 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1183 } 1604 };
1184 1605
1185 ( 1606 @{ $self->{size_req} }
1186 $w + $self->{padding} * 2,
1187 $h + $self->{padding} * 2,
1188 )
1189} 1607}
1190 1608
1191sub size_allocate { 1609sub size_allocate {
1192 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1193 1611
1612 delete $self->{ox};
1613
1194 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1195} 1616}
1196 1617
1197sub set_fontsize { 1618sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1199 1620
1200 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1622 delete $self->{texture};
1202 $self->check_size; 1623
1203 $self->update; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1204} 1633}
1205 1634
1206sub _draw { 1635sub _draw {
1207 my ($self) = @_; 1636 my ($self) = @_;
1208 1637
1638 $self->SUPER::_draw; # draw background, if applicable
1639
1209 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $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});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647
1213 new_from_layout CFClient::Texture $self->{layout} 1648 new_from_layout CFClient::Texture $self->{layout}
1214 }; 1649 };
1215 1650
1216 glEnable GL_BLEND; 1651 unless (exists $self->{ox}) {
1217 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
1218 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 {
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220
1221 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1236 1671
1237 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1673}
1240 1674
1241############################################################################# 1675#############################################################################
1242 1676
1243package CFClient::UI::EntryBase; 1677package CFClient::UI::EntryBase;
… …
1248 1682
1249sub new { 1683sub new {
1250 my $class = shift; 1684 my $class = shift;
1251 1685
1252 $class->SUPER::new ( 1686 $class->SUPER::new (
1253 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1688 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1689 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1690 active_fg => [0, 0, 0],
1257 can_hover => 1, 1691 can_hover => 1,
1258 can_focus => 1, 1692 can_focus => 1,
1259 valign => 0, 1693 valign => 0,
1260 can_events => 1, 1694 can_events => 1,
1695 #text => ...
1696 #hidden => "*",
1261 @_ 1697 @_
1262 ) 1698 )
1263} 1699}
1264 1700
1265sub _set_text { 1701sub _set_text {
… …
1267 1703
1268 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1269 1705
1270 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1271 1707
1272 delete $self->{texture};
1273
1274 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1275 $self->{text} = $text; 1709 $self->{text} = $text;
1276 1710
1277 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1278 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1279 1714
1280 $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);
1281} 1726}
1282 1727
1283sub get_text { 1728sub get_text {
1284 $_[0]{text} 1729 $_[0]{text}
1285} 1730}
… …
1288 my ($self) = @_; 1733 my ($self) = @_;
1289 1734
1290 my ($w, $h) = $self->SUPER::size_request; 1735 my ($w, $h) = $self->SUPER::size_request;
1291 1736
1292 ($w + 1, $h) # add 1 for cursor 1737 ($w + 1, $h) # add 1 for cursor
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1738}
1308 1739
1309sub key_down { 1740sub key_down {
1310 my ($self, $ev) = @_; 1741 my ($self, $ev) = @_;
1311 1742
… …
1313 my $sym = $ev->{sym}; 1744 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1745 my $uni = $ev->{unicode};
1315 1746
1316 my $text = $self->get_text; 1747 my $text = $self->get_text;
1317 1748
1318 if ($sym == 8) { 1749 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1751 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1752 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1753 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1754 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1755 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1756 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1757 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1758 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1759 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1761 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1762 $self->_emit ('escape');
1332 } elsif ($uni) { 1763 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1334 } 1767 }
1335 1768
1336 $self->_set_text ($text); 1769 $self->_set_text ($text);
1337 $self->update; 1770
1771 $self->realloc;
1772
1773 1
1338} 1774}
1339 1775
1340sub focus_in { 1776sub focus_in {
1341 my ($self) = @_; 1777 my ($self) = @_;
1342 1778
… …
1357 utf8::encode $text; 1793 utf8::encode $text;
1358 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1359 1795
1360 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1361 $self->update; 1797 $self->update;
1798
1799 1
1362} 1800}
1363 1801
1364sub mouse_motion { 1802sub mouse_motion {
1365 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1366# 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
1367} 1807}
1368 1808
1369sub _draw { 1809sub _draw {
1370 my ($self) = @_; 1810 my ($self) = @_;
1371 1811
1372 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1373 1813
1374 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1375 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1376 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1377 } else { 1817 } else {
1378 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1379 } 1819 }
1380 1820
1381 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1382 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1383 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1384 glVertex 0 , 0; 1824 glVertex 0 , 0;
1385 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1386 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1387 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1418 my ($self, $ev) = @_; 1858 my ($self, $ev) = @_;
1419 1859
1420 my $sym = $ev->{sym}; 1860 my $sym = $ev->{sym};
1421 1861
1422 if ($sym == 13) { 1862 if ($sym == 13) {
1863 unshift @{$self->{history}},
1864 my $txt = $self->get_text;
1865 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1867 $self->_emit (activate => $txt);
1424 $self->update; 1868 $self->update;
1425 1869
1870 } elsif ($sym == CFClient::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text;
1873 }
1874 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++;
1876 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1877 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 }
1881
1882 } elsif ($sym == CFClient::SDLK_DOWN) {
1883 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885
1886 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else {
1889 $self->set_text ($self->{history_saveback});
1890 }
1891
1426 } else { 1892 } else {
1427 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1428 } 1896 1
1429
1430} 1897}
1431 1898
1432############################################################################# 1899#############################################################################
1433 1900
1434package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1443 1910
1444sub new { 1911sub new {
1445 my $class = shift; 1912 my $class = shift;
1446 1913
1447 $class->SUPER::new ( 1914 $class->SUPER::new (
1448 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1449 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1452 can_hover => 1, 1919 can_hover => 1,
1453 align => 0, 1920 align => 0,
1454 valign => 0, 1921 valign => 0,
1455 can_events => 1, 1922 can_events => 1,
1456 @_ 1923 @_
1457 ) 1924 )
1458} 1925}
1459 1926
1927sub activate { }
1928
1460sub button_up { 1929sub button_up {
1461 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1462 1931
1932 $self->emit ("activate")
1463 if ($x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1464 && $y >= 0 && $y < $self->{h}) { 1934 && $y >= 0 && $y < $self->{h};
1465 $self->emit ("activate"); 1935
1466 } 1936 1
1467} 1937}
1468 1938
1469sub _draw { 1939sub _draw {
1470 my ($self) = @_; 1940 my ($self) = @_;
1471 1941
1472 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1473 1943
1474 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg};
1476 }
1477
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1483 1947
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1949
1486 glDisable GL_TEXTURE_2D; 1950 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1951
1489 $self->SUPER::_draw; 1952 $self->SUPER::_draw;
1490} 1953}
1491 1954
1492############################################################################# 1955#############################################################################
… …
1503 1966
1504sub new { 1967sub new {
1505 my $class = shift; 1968 my $class = shift;
1506 1969
1507 $class->SUPER::new ( 1970 $class->SUPER::new (
1508 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1509 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1510 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],
1511 state => 0, 1977 state => 0,
1512 can_hover => 1, 1978 can_hover => 1,
1513 @_ 1979 @_
1514 ) 1980 )
1515} 1981}
1516 1982
1517sub size_request { 1983sub size_request {
1518 my ($self) = @_; 1984 my ($self) = @_;
1519 1985
1520 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1521} 1987}
1522 1988
1523sub button_down { 1989sub button_down {
1524 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1525 1991
1526 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1527 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1528 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1529 $self->emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1530 } 2000 1
1531} 2001}
1532 2002
1533sub _draw { 2003sub _draw {
1534 my ($self) = @_; 2004 my ($self) = @_;
1535 2005
1536 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1537 2007
1538 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1539 2009
1540 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;
1541 2013
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 2015
1544 glEnable GL_BLEND; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
2017
1545 glEnable GL_TEXTURE_2D; 2018 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 2019 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 2020 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 2021}
1555 2022
1556############################################################################# 2023#############################################################################
1557 2024
1558package CFClient::UI::Image; 2025package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 2068 glTranslate 0, -$self->{w}, 0;
1602 2069
1603 ($w, $h) = ($h, $w); 2070 ($w, $h) = ($h, $w);
1604 } 2071 }
1605 2072
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 2073 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 2075
1611 $tex->draw_quad (0, 0, $w, $h); 2076 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 2077
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 2078 glDisable GL_TEXTURE_2D;
1615} 2079}
1616 2080
1617############################################################################# 2081#############################################################################
1618 2082
… …
1666} 2130}
1667 2131
1668sub set_max { 2132sub set_max {
1669 my ($self, $max) = @_; 2133 my ($self, $max) = @_;
1670 2134
2135 return if $self->{max_val} == $max;
2136
1671 $self->{max_val} = $max; 2137 $self->{max_val} = $max;
2138 $self->update;
1672} 2139}
1673 2140
1674sub set_value { 2141sub set_value {
1675 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1676 2143
1677 $self->set_max ($max) 2144 $self->set_max ($max)
1678 if defined $max; 2145 if defined $max;
1679 2146
1680 $max = $self->{max_val}; 2147 return if $self->{val} == $val;
2148
1681 $self->{val} = $val; 2149 $self->{val} = $val;
1682
1683 $self->update; 2150 $self->update;
1684} 2151}
1685 2152
1686sub _draw { 2153sub _draw {
1687 my ($self) = @_; 2154 my ($self) = @_;
… …
1705 2172
1706 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
1707 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
1708 2175
1709 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
1710 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;
1711 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
1712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1713 2181
1714 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
1715 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
1750 2218
1751sub new { 2219sub new {
1752 my ($class, %arg) = @_; 2220 my ($class, %arg) = @_;
1753 2221
1754 my $self = $class->SUPER::new ( 2222 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2223 tooltip => $arg{type},
2224 can_hover => 1,
1756 can_events => 1, 2225 can_events => 1,
1757 can_hover => 1,
1758 %arg, 2226 %arg,
1759 ); 2227 );
1760 2228
1761 $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");
1762 $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);
… …
1770 2238
1771 $self->{value}->set_fontsize ($fsize); 2239 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 2240 $self->{max} ->set_fontsize ($fsize);
1773} 2241}
1774 2242
2243sub set_max {
2244 my ($self, $max) = @_;
2245
2246 $self->{gauge}->set_max ($max);
2247 $self->{max}->set_text ($max);
2248}
2249
1775sub set_value { 2250sub set_value {
1776 my ($self, $val, $max) = @_; 2251 my ($self, $val, $max) = @_;
1777 2252
1778 $self->set_max ($max) 2253 $self->set_max ($max)
1779 if defined $max; 2254 if defined $max;
1780 2255
1781 $self->{gauge}->set_value ($val, $max); 2256 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2257 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 2258}
1791 2259
1792############################################################################# 2260#############################################################################
1793 2261
1794package CFClient::UI::Slider; 2262package CFClient::UI::Slider;
… …
1804 qw(s1_slider.png s1_slider_bg.png); 2272 qw(s1_slider.png s1_slider_bg.png);
1805 2273
1806sub new { 2274sub new {
1807 my $class = shift; 2275 my $class = shift;
1808 2276
1809 # range [value, low, high, page] 2277 # range [value, low, high, page, unit]
1810 2278
1811 # TODO: 0-width page 2279 # TODO: 0-width page
1812 # TODO: req_w/h are wrong with vertical 2280 # TODO: req_w/h are wrong with vertical
1813 # TODO: calculations are off 2281 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
1816 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],
1817 range => [0, 0, 100, 10], 2287 range => [0, 0, 100, 10, 0],
1818 req_w => 20, 2288 min_w => $::WIDTH / 80,
1819 req_h => 20, 2289 min_h => $::WIDTH / 80,
1820 vertical => 0, 2290 vertical => 0,
1821 can_hover => 1, 2291 can_hover => 1,
1822 inner_pad => 5, 2292 inner_pad => 0.02,
1823 @_ 2293 @_
1824 ); 2294 );
1825 2295
2296 $self->set_value ($self->{range}[0]);
2297 $self->update;
2298
1826 $self 2299 $self
1827} 2300}
1828 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
1829sub size_request { 2336sub size_request {
1830 my ($self) = @_; 2337 my ($self) = @_;
1831 2338
1832 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
1833 my $h = $self->{req_h};
1834
1835 $self->{vertical} ? ($h, $w) : ($w, $h)
1836} 2340}
1837 2341
1838sub button_down { 2342sub button_down {
1839 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
1840 2344
1841 $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
1842 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
1843} 2350}
1844 2351
1845sub mouse_motion { 2352sub mouse_motion {
1846 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
1847 2354
1848 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
1849 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2384 my $range = ($hi - $page - $lo) || 1e-100;
1850 2385
1851 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2386 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1852 2387
1853 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2388 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1854 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2389 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1855 2390
1856 $x -= $inner_pad_px; # substract the padding 2391 $value = ($value - $lo) / $range;
1857 $x = $x * ($hi - $lo) / $inner_w + $lo; 2392 $value = $value * $self->{scale} + $self->{offset};
1858 $x = $lo if $x < $lo;
1859 $x = $hi - $page if $x > $hi - $page;
1860 $self->{range}[0] = $x;
1861 2393
1862 $self->emit (changed => $x); 2394 $self->{knob_x} = $value - $knob_w * 0.5;
1863 $self->update; 2395 $self->{knob_w} = $knob_w;
1864 } 2396 }
1865}
1866
1867# the inner_* stuff is for generating a padding for the slider handle,
1868# so that the handle doesn't leave the texture. This calculation isn't 100%
1869# correct propably, but it does the job for now
1870sub _calc_inner_pad_px {
1871 my ($self, $w) = @_;
1872 ($w / 100) * $self->{inner_pad} # % to pixels
1873}
1874
1875sub _draw {
1876 my ($self) = @_;
1877 2397
1878 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
1879 2399
1880 my ($w, $h) = @$self{qw(w h)}; 2400 glScale $self->{w}, $self->{h};
1881 2401
1882 if ($self->{vertical}) { 2402 if ($self->{vertical}) {
1883 # draw a vertical slider like a rotated horizontal slider 2403 # draw a vertical slider like a rotated horizontal slider
1884 2404
2405 glTranslate 1, 0, 0;
1885 glRotate 90, 0, 0, 1; 2406 glRotate 90, 0, 0, 1;
1886 glTranslate 0, -$self->{w}, 0;
1887
1888 ($w, $h) = ($h, $w);
1889 } 2407 }
1890 2408
1891 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2409 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2410 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893 2411
1894 my ($value, $lo, $hi, $page) = @{$self->{range}};
1895
1896 $hi = $value + 1 if $lo == $hi;
1897
1898 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1899 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1900
1901 $page = int $page * $inner_w / ($hi - $lo);
1902 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1903
1904 $w -= $page;
1905 $page &= ~1;
1906 glTranslate $page * 0.5, 0, 0;
1907 $page ||= 2;
1908
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2412 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2414
1917 # draw background 2415 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2416 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919 2417
1920 # draw handle 2418 # draw handle
1921 $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);
1922 2420
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
1925} 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 (@_) }
1926 2464
1927############################################################################# 2465#############################################################################
1928 2466
1929package CFClient::UI::TextView; 2467package CFClient::UI::TextView;
1930 2468
… …
1934 2472
1935sub new { 2473sub new {
1936 my $class = shift; 2474 my $class = shift;
1937 2475
1938 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
1939 fontsize => 1, 2477 fontsize => 1,
2478 can_events => 0,
1940 #font => default_font 2479 #font => default_font
1941 @_, 2480 @_,
1942 2481
1943 layout => (new CFClient::Layout), 2482 layout => (new CFClient::Layout 1),
1944 par => [], 2483 par => [],
1945 height => 0, 2484 height => 0,
1946 children => [ 2485 children => [
1947 (new CFClient::UI::Empty expand => 1), 2486 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2487 (new CFClient::UI::Slider vertical => 1),
1949 ], 2488 ],
1950 ); 2489 );
1951 2490
1952 $self->{children}[1]->connect (changed => sub { 2491 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2492
1956 $self 2493 $self
1957} 2494}
1958 2495
1959sub set_fontsize { 2496sub set_fontsize {
1960 my ($self, $fontsize) = @_; 2497 my ($self, $fontsize) = @_;
1961 2498
1962 $self->{fontsize} = $fontsize; 2499 $self->{fontsize} = $fontsize;
1963 $self->reflow; 2500 $self->reflow;
1964}
1965
1966sub text_height {
1967 my ($self, $text) = @_;
1968
1969 my $layout = $self->{layout};
1970
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w});
1973 $layout->set_text ($text);
1974
1975 ($layout->size)[1]
1976}
1977
1978sub reflow {
1979 my ($self) = @_;
1980
1981 $self->{need_reflow}++;
1982 $self->update;
1983} 2501}
1984 2502
1985sub size_allocate { 2503sub size_allocate {
1986 my ($self, $w, $h) = @_; 2504 my ($self, $w, $h) = @_;
1987 2505
… …
1992 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
1993 2511
1994 $self->reflow; 2512 $self->reflow;
1995} 2513}
1996 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
1997sub add_paragraph { 2549sub add_paragraph {
1998 my ($self, $color, $text) = @_; 2550 my ($self, $color, $text, $indent) = @_;
1999 2551
2000 #TODO: intelligently "reformat" paragraph 2552 for my $line (split /\n/, $text) {
2001 2553 my ($w, $h) = $self->text_size ($line);
2002 my $height = $self->text_height ($text);
2003
2004 $self->{height} += $height; 2554 $self->{height} += $h;
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2556 }
2005 2557
2006 push @{$self->{par}}, [$height, $color, $text];
2007
2008 $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]);
2009 $self->{children}[1]->update;
2010} 2559}
2011 2560
2012sub update { 2561sub update {
2013 my ($self) = @_; 2562 my ($self) = @_;
2014 2563
… …
2016 2565
2017 return unless $self->{h} > 0; 2566 return unless $self->{h} > 0;
2018 2567
2019 delete $self->{texture}; 2568 delete $self->{texture};
2020 2569
2021 $ROOT->on_refresh ($self, sub { 2570 $ROOT->on_post_alloc ($self, sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572
2022 if (delete $self->{need_reflow}) { 2573 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2574 my $height = 0;
2024 2575
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2026 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 }
2027 2591
2028 $self->{height} = $height; 2592 $self->{height} = $height;
2029 2593
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2031 2595
2032 delete $self->{texture}; 2596 delete $self->{texture};
2033 } 2597 }
2034 2598
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2036 glClearColor 0, 0, 0, 1; 2600 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2601 glClear GL_COLOR_BUFFER_BIT;
2038 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
2039 glEnable GL_BLEND; 2614 glEnable GL_BLEND;
2615 #TODO# not correct in windows where rgba is forced off
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2616 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043
2044 my $top = int $self->{children}[1]{range}[0];
2045
2046 my $y0 = $top;
2047 my $y1 = $top + $self->{h};
2048
2049 my $y = 0;
2050
2051 my $layout = $self->{layout};
2052
2053 $layout->set_font ($self->{font}) if $self->{font};
2054 2617
2055 for my $par (@{$self->{par}}) { 2618 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2619 my $h = $par->[1];
2057 2620
2058 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]);
2059 $layout->set_text ($par->[2]); 2624 $layout->set_markup ($par->[4]);
2060 2625
2061 glColor @{ $par->[1] }; 2626 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062 my ($W, $H) = $layout->size; 2627
2063 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;
2064 } 2630 }
2065 2631
2066 $y += $h; 2632 $y += $h;
2067 } 2633 }
2068 2634
2069 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND; 2635 glDisable GL_BLEND;
2071 }; 2636 };
2072 }); 2637 });
2073} 2638}
2074 2639
2075sub _draw { 2640sub _draw {
2076 my ($self) = @_; 2641 my ($self) = @_;
2077 2642
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2643 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2647 glDisable GL_TEXTURE_2D;
2083 }
2084 2648
2085 $self->{children}[1]->draw; 2649 $self->{children}[1]->draw;
2086 2650
2087} 2651}
2088 2652
… …
2136 2700
2137sub new { 2701sub new {
2138 my $class = shift; 2702 my $class = shift;
2139 2703
2140 my $self = $class->SUPER::new ( 2704 my $self = $class->SUPER::new (
2141 state => 0, 2705 state => 0,
2142 connect_activate => \&toggle_flopper, 2706 on_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2707 @_
2145 ); 2708 );
2146 2709
2147 if ($self->{state}) {
2148 $self->{state} = 0;
2149 $self->toggle_flopper;
2150 }
2151
2152 $self 2710 $self
2153} 2711}
2154 2712
2155sub toggle_flopper { 2713sub toggle_flopper {
2156 my ($self) = @_; 2714 my ($self) = @_;
2157 2715
2158 # TODO: use animation 2716 $self->{other}->toggle_visibility;
2159 if ($self->{state} = !$self->{state}) {
2160 $CFClient::UI::ROOT->add ($self->{other});
2161 $self->{other}->move ($self->coord2global (0, $self->{h}));
2162 $self->emit ("open");
2163 } else {
2164 $CFClient::UI::ROOT->remove ($self->{other});
2165 $self->emit ("close");
2166 }
2167
2168 $self->emit (changed => $self->{state});
2169} 2717}
2170 2718
2171############################################################################# 2719#############################################################################
2172 2720
2173package CFClient::UI::Tooltip; 2721package CFClient::UI::Tooltip;
… …
2183 @_, 2731 @_,
2184 can_events => 0, 2732 can_events => 0,
2185 ) 2733 )
2186} 2734}
2187 2735
2188sub set_text { 2736sub set_tooltip_from {
2189 my ($self, $text) = @_; 2737 my ($self, $widget) = @_;
2190 2738
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2739 my $tooltip = $widget->{tooltip};
2192 $self->{label}->set_text ($text); 2740
2193 $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 );
2194} 2756}
2195 2757
2196sub size_request { 2758sub size_request {
2197 my ($self) = @_; 2759 my ($self) = @_;
2198 2760
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2761 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2762
2203 ($w + 4, $h + 4) 2763 ($w + 4, $h + 4)
2204} 2764}
2205 2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 $self->SUPER::size_allocate ($w - 4, $h - 4);
2770}
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
2206sub _draw { 2790sub _draw {
2207 my ($self) = @_; 2791 my ($self) = @_;
2208 2792
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2793 glTranslate 0.375, 0.375;
2211 2794
2212 my ($w, $h) = @$self{qw(w h)}; 2795 my ($w, $h) = @$self{qw(w h)};
2213 2796
2214 glColor 1, 0.8, 0.4; 2797 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2808 glVertex 0 , $h;
2226 glVertex $w, $h; 2809 glVertex $w, $h;
2227 glVertex $w, 0; 2810 glVertex $w, 0;
2228 glEnd; 2811 glEnd;
2229 2812
2230 glPopMatrix; 2813 glTranslate 2 - 0.375, 2 - 0.375;
2231 2814
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2815 $self->SUPER::_draw;
2234} 2816}
2235 2817
2236############################################################################# 2818#############################################################################
2237 2819
2820package CFClient::UI::Face;
2821
2822our @ISA = CFClient::UI::Base::;
2823
2824use CFClient::OpenGL;
2825
2826sub new {
2827 my $class = shift;
2828
2829 my $self = $class->SUPER::new (
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 => [],
3543 @_,
3544 )
3545}
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
2238package CFClient::UI::Root; 3617package CFClient::UI::Root;
2239 3618
2240our @ISA = CFClient::UI::Container::; 3619our @ISA = CFClient::UI::Container::;
2241 3620
3621use List::Util qw(min max);
3622
2242use CFClient::OpenGL; 3623use CFClient::OpenGL;
2243 3624
2244sub check_size { 3625sub new {
2245 my ($self) = @_; 3626 my $class = shift;
2246 3627
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3628 my $self = $class->SUPER::new (
3629 visible => 1,
3630 @_,
3631 );
3632
3633 Scalar::Util::weaken ($self->{root} = $self);
3634
3635 $self
2248} 3636}
2249 3637
2250sub size_request { 3638sub size_request {
2251 ($::WIDTH, $::HEIGHT) 3639 my ($self) = @_;
2252}
2253 3640
2254sub configure { 3641 ($self->{w}, $self->{h})
3642}
3643
3644sub _to_pixel {
3645 my ($coord, $size, $max) = @_;
3646
3647 $coord =
3648 $coord eq "center" ? ($max - $size) * 0.5
3649 : $coord eq "max" ? $max
3650 : $coord;
3651
3652 $coord = 0 if $coord < 0;
3653 $coord = $max - $size if $coord > $max - $size;
3654
3655 int $coord + 0.5
3656}
3657
3658sub size_allocate {
2255 my ($self, $x, $y, $w, $h) = @_; 3659 my ($self, $w, $h) = @_;
2256 3660
2257 $self->SUPER::configure ($x, $y, $w, $h);
2258
2259 for my $child (@{$self->{children}}) { 3661 for my $child ($self->children) {
2260 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)};
2261 3663
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3664 $X = $child->{force_x} if exists $child->{force_x};
2263 $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
2264 $child->configure ($X, $Y, $W,$H); 3670 $child->configure ($X, $Y, $W, $H);
2265 } 3671 }
2266} 3672}
2267 3673
2268sub _topleft { 3674sub coord2local {
2269 my ($self, $x, $y) = @_; 3675 my ($self, $x, $y) = @_;
2270 3676
2271 ($x, $y) 3677 ($x, $y)
2272} 3678}
2273 3679
3680sub coord2global {
3681 my ($self, $x, $y) = @_;
3682
3683 ($x, $y)
3684}
3685
2274sub update { 3686sub update {
2275 my ($self) = @_; 3687 my ($self) = @_;
2276 3688
2277 $self->check_size; 3689 $::WANT_REFRESH++;
2278 ::refresh ();
2279} 3690}
2280 3691
2281sub add { 3692sub add {
2282 my ($self, $child) = @_; 3693 my ($self, @children) = @_;
2283 3694
2284 # integerize window positions 3695 $_->{is_toplevel} = 1
2285 $child->{x} = int $child->{x}; 3696 for @children;
2286 $child->{y} = int $child->{y};
2287 3697
2288 $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 }
2289} 3714}
2290 3715
2291sub on_refresh { 3716sub on_refresh {
2292 my ($self, $id, $cb) = @_; 3717 my ($self, $id, $cb) = @_;
2293 3718
2294 $self->{refresh_hook}{$id} = $cb; 3719 $self->{refresh_hook}{$id} = $cb;
2295} 3720}
2296 3721
3722sub on_post_alloc {
3723 my ($self, $id, $cb) = @_;
3724
3725 $self->{post_alloc_hook}{$id} = $cb;
3726}
3727
2297sub draw { 3728sub draw {
2298 my ($self) = @_; 3729 my ($self) = @_;
2299 3730
2300 while (my $rcb = delete $self->{refresh_hook}) { 3731 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 3732 $_->()
3733 for values %{delete $self->{refresh_hook}};
2302 } 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
2303 3827
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3828 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3829 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 3830 glClear GL_COLOR_BUFFER_BIT;
2307 3831
2308 glMatrixMode GL_PROJECTION; 3832 glMatrixMode GL_PROJECTION;
2309 glLoadIdentity; 3833 glLoadIdentity;
2310 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311 glMatrixMode GL_MODELVIEW; 3835 glMatrixMode GL_MODELVIEW;
2312 glLoadIdentity; 3836 glLoadIdentity;
2313 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
2314 $self->_draw; 3845 $self->_draw;
2315} 3846}
2316 3847
2317############################################################################# 3848#############################################################################
2318 3849
2319package CFClient::UI; 3850package CFClient::UI;
2320 3851
2321$ROOT = new CFClient::UI::Root; 3852$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 3853$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323 3854
23241 38551
2325 3856

Diff Legend

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