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

Diff Legend

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