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

Diff Legend

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