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.162 by root, Mon Apr 24 06:05:35 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->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
45} 76}
46 77
47sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
49} 81}
50 82
51sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
52 my ($ev) = @_; 84 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 93 check_tooltip;
62 } 94 }
63 95
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 97
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
67} 100}
68 101
69sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
70 my ($ev) = @_; 103 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
72 105
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 107
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 109
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
78 112
79 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 115 $grab->update if $grab;
82 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 133
100 check_tooltip; 134 check_tooltip;
101 } 135 }
102 136
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
104} 139}
105 140
106# convert position array to integers 141# convert position array to integers
107sub harmonize { 142sub harmonize {
108 my ($vals) = @_; 143 my ($vals) = @_;
… …
114 $rem += $_ - $i; 149 $rem += $_ - $i;
115 $_ = $i; 150 $_ = $i;
116 } 151 }
117} 152}
118 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
119############################################################################# 195#############################################################################
120 196
121package CFClient::UI::Base; 197package CFClient::UI::Base;
122 198
123use strict; 199use strict;
… …
126 202
127sub new { 203sub new {
128 my $class = shift; 204 my $class = shift;
129 205
130 my $self = bless { 206 my $self = bless {
131 x => 0, 207 x => "center",
132 y => 0, 208 y => "center",
133 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
134 can_events => 1, 212 can_events => 1,
135 @_ 213 @_
136 }, $class; 214 }, $class;
137 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
138 for (keys %$self) { 218 for (keys %$self) {
139 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
141 } 221 }
142 } 222 }
143 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
144 $self 236 $self
145} 237}
146 238
147sub destroy { 239sub destroy {
148 my ($self) = @_; 240 my ($self) = @_;
… …
157 return if $self->{parent}; 249 return if $self->{parent};
158 250
159 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
160} 252}
161 253
254sub set_visible {
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};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
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
162sub hide { 307sub hide {
163 my ($self) = @_; 308 my ($self) = @_;
164 309
165 return unless $self->{parent}; 310 $self->set_invisible;
166 311
167 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
168} 314}
169 315
170sub move { 316sub move_abs {
171 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
172 318
173 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
176 322
177 $self->update; 323 $self->update;
178} 324}
179 325
180sub set_size { 326sub set_size {
181 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
182 328
183 $self->{user_w} = $w; 329 $self->{force_w} = $w;
184 $self->{user_h} = $h; 330 $self->{force_h} = $h;
185 331
186 $self->check_size; 332 $self->realloc;
187} 333}
188 334
189sub size_request { 335sub size_request {
190 require Carp; 336 require Carp;
191 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
193 339
194sub configure { 340sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
196 342
197 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
200 348
201 # use alignment to adjust x, y 349 # use alignment to adjust x, y
202 350
203 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 353 }
208 354
209 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 356 $self->{x} = $x;
211 $self->{y} = $y; 357 $self->{y} = $y;
212 $self->update; 358 $self->update;
213 } 359 }
214 360
215 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
216 $self->{w} = $w; 364 $self->{alloc_w} = $w;
217 $self->{h} = $h; 365 $self->{alloc_h} = $h;
218 366
219 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 368 }
222} 369}
223 370
224sub size_allocate { 371sub size_allocate {
225 # nothing to be done 372 # nothing to be done
226} 373}
227 374
375sub children {
376}
377
228sub set_max_size { 378sub set_max_size {
229 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
230 380
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 383}
234 384
235# return top left coordinates 385sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
238 387
239 $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 }
240} 399}
241 400
242# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
243sub coord2local { 402sub coord2local {
244 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
245 404
246 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 406}
249 407
250# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
251sub coord2global { 409sub coord2global {
252 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
253 411
254 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 413}
257 414
258sub focus_in { 415sub focus_in {
259 my ($self) = @_; 416 my ($self) = @_;
260 417
261 return if $FOCUS == $self; 418 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
263 420
264 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
265 422
266 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
267 424
268 $focus->update if $focus; 425 $focus->update if $focus;
269 $FOCUS->update; 426 $FOCUS->update;
270} 427}
271 428
… …
274 431
275 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
276 433
277 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
278 435
279 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
280 437
281 $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;
282} 442}
283 443
284sub mouse_motion { } 444sub mouse_motion { }
285sub button_up { } 445sub button_up { }
286sub key_down { } 446sub key_down { }
287sub key_up { } 447sub key_up { }
288 448
289sub button_down { 449sub button_down {
290 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
291 451
292 $self->focus_in; 452 $self->focus_in;
… …
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
299sub 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}
300 530
301sub draw { 531sub draw {
302 my ($self) = @_; 532 my ($self) = @_;
303 533
304 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
321 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
322 glEnd; 552 glEnd;
323 glDisable GL_BLEND; 553 glDisable GL_BLEND;
324 } 554 }
325 555
326 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
327 glPushMatrix; 557 glPushMatrix;
328 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
329 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
330 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
331 glVertex 0 , 0; 561 glVertex 0 , 0;
332 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
333 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
334 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
335 glEnd; 565 glEnd;
336 glPopMatrix; 566 glPopMatrix;
337 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;
338 } 568 }
339} 569}
340 570
341sub _draw { 571sub _draw {
342 my ($self) = @_; 572 my ($self) = @_;
343 573
344 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
345} 575}
346 576
347sub find_widget {
348 my ($self, $x, $y) = @_;
349
350 return () unless $self->{can_events};
351
352 return $self
353 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
354 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
355
356 ()
357}
358
359sub set_parent {
360 my ($self, $parent) = @_;
361
362 Scalar::Util::weaken ($self->{parent} = $parent);
363}
364
365sub check_size {
366 my ($self) = @_;
367
368 $self->{parent}
369 or return 1;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389}
390
391sub update {
392 my ($self) = @_;
393
394 $self->{parent}->update
395 if $self->{parent};
396}
397
398sub connect {
399 my ($self, $signal, $cb) = @_;
400
401 push @{ $self->{signal_cb}{$signal} }, $cb;
402}
403
404sub emit {
405 my ($self, $signal, @args) = @_;
406
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
408 $cb->($self, @args);
409 }
410}
411
412sub DESTROY { 577sub DESTROY {
413 my ($self) = @_; 578 my ($self) = @_;
414 579
580 delete $WIDGET{$self+0};
415 #$self->deactivate; 581 #$self->deactivate;
416} 582}
417 583
418############################################################################# 584#############################################################################
419 585
… …
428 my $class = shift; 594 my $class = shift;
429 595
430 # range [value, low, high, page] 596 # range [value, low, high, page]
431 597
432 $class->SUPER::new ( 598 $class->SUPER::new (
433 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
434 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
435 @_ 601 @_
436 ) 602 )
437} 603}
438 604
439sub _draw { 605sub _draw {
440 my ($self) = @_; 606 my ($self) = @_;
441 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
442 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
443 614
444 glEnable GL_BLEND; 615 glEnable GL_BLEND;
445 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
447 618
448 glBegin GL_QUADS; 619 glBegin GL_QUADS;
449 glVertex 0 , 0; 620 glVertex 0 , 0;
450 glVertex 0 , $h; 621 glVertex 0 , $h;
451 glVertex $w, $h; 622 glVertex $w, $h;
452 glVertex $w, 0; 623 glVertex $w, 0;
453 glEnd; 624 glEnd;
454 625
455 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
456} 628}
457 629
458############################################################################# 630#############################################################################
459 631
460package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
465 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
467} 639}
468 640
469sub size_request { 641sub size_request {
470 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
471} 645}
472 646
473sub draw { } 647sub draw { }
474 648
475############################################################################# 649#############################################################################
… …
481sub new { 655sub new {
482 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
483 657
484 my $children = delete $arg{children} || []; 658 my $children = delete $arg{children} || [];
485 659
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 660 my $self = $class->SUPER::new (
661 children => [],
662 can_events => 0,
663 %arg,
664 );
487 $self->add ($_) for @$children; 665 $self->add ($_) for @$children;
488 666
489 $self 667 $self
490} 668}
491 669
492sub add { 670sub add {
493 my ($self, $child) = @_; 671 my ($self, @widgets) = @_;
494 672
495 $child->set_parent ($self); 673 $_->set_parent ($self)
674 for @widgets;
496 675
497 use sort 'stable'; 676 use sort 'stable';
498 677
499 $self->{children} = [ 678 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 680 @{$self->{children}}, @widgets
502 ]; 681 ];
503 682
504 $child->check_size; 683 $self->realloc;
684}
685
686sub children {
687 @{ $_[0]{children} }
505} 688}
506 689
507sub remove { 690sub remove {
508 my ($self, $child) = @_; 691 my ($self, $child) = @_;
509 692
510 delete $child->{parent}; 693 delete $child->{parent};
694 $child->hide;
511 695
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 697
514 $self->check_size; 698 $self->realloc;
515 $self->update;
516} 699}
517 700
518sub clear { 701sub clear {
519 my ($self) = @_; 702 my ($self) = @_;
520 703
521 delete $_->{parent} 704 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 705 $self->{children} = [];
706
707 for (@$children) {
708 delete $_->{parent};
709 $_->hide;
710 }
711
712 $self->realloc;
525} 713}
526 714
527sub find_widget { 715sub find_widget {
528 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
529 717
… …
604} 792}
605 793
606sub update { 794sub update {
607 my ($self) = @_; 795 my ($self) = @_;
608 796
609 # we want to do this delayed... 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 798 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 799}
623 800
624sub size_allocate { 801sub size_allocate {
625 my ($self, $w, $h) = @_; 802 my ($self, $w, $h) = @_;
626 803
627 $self->child->configure (0, 0, $w, $h); 804 $self->SUPER::size_allocate ($w, $h);
805 $self->update;
806}
628 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
629 $self->render_chld; 819 $self->_render;
820 };
630} 821}
631 822
632sub _draw { 823sub _draw {
633 my ($self) = @_; 824 my ($self) = @_;
634 825
635 my ($w, $h) = ($self->w, $self->h); 826 my ($w, $h) = ($self->w, $self->h);
636 827
637 my $tex = $self->{texture} 828 my $tex = $self->{texture}
638 or return; 829 or return;
639 830
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
643 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;
644 834
645 $tex->draw_quad (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 836
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
649} 838}
650 839
651############################################################################# 840#############################################################################
652 841
653package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
654 843
655our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
656
657sub new { die }
658
659sub size_request {
660 my ($self) = @_;
661
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
664
665 @$self{qw(child_w child_h)}
666}
667
668sub _draw {
669 my ($self) = @_;
670
671 $self->{children}[1]->draw;
672}
673
674
675#############################################################################
676
677package CFClient::UI::Frame;
678
679our @ISA = CFClient::UI::Bin::;
680
681use CFClient::OpenGL;
682 845
683sub new { 846sub new {
684 my $class = shift; 847 my $class = shift;
685 848
686 my $self = $class->SUPER::new ( 849 $class->SUPER::new (
687 bg => [1, 1, 1, 1], 850 scroll_x => 0,
688 border_bg => [1, 1, 1, 1], 851 scroll_y => 1,
689 border => 0.8,
690 @_ 852 @_,
691 ); 853 )
692
693 $self
694} 854}
695 855
696sub _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 {
697 my ($self) = @_; 868 my ($self, $w, $h) = @_;
698 869
699 my ($w, $h) = ($self->{w}, $self->{h}); 870 my $child = $self->child;
700 871
701 glEnable GL_BLEND; 872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
703 glEnable GL_TEXTURE_2D;
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 874
706# glBegin GL_QUADS; 875 $self->child->configure (0, 0, $w, $h);
707# glColor 0, 0, 0, 0; 876 $self->update;
708# glVertex 0 , 0; 877}
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713 878
879sub set_offset {
880 my ($self, $x, $y) = @_;
714 881
715 $self->child->draw; 882 $self->{view_x} = int $x;
716 glDisable GL_BLEND; 883 $self->{view_y} = int $y;
717 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;
718} 922}
719 923
720############################################################################# 924#############################################################################
721 925
722package CFClient::UI::FancyFrame; 926package CFClient::UI::ScrolledWindow;
723 927
724our @ISA = CFClient::UI::Bin::; 928our @ISA = CFClient::UI::HBox::;
725
726use CFClient::OpenGL;
727
728my @tex =
729 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
730 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
731 929
732sub new { 930sub new {
733 my $class = shift; 931 my $class = shift;
734 932
735 # 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;
736 1036
737 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
740 border => 0.8, 1040 border => 0.6,
741 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
742 @_ 1044 @_
743 ); 1045 );
744 1046
745 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 1048 align => 0,
747 valign => 1, 1049 valign => 1,
748 text => $self->{title}, 1050 text => $self->{title},
749 fontsize => 1; 1051 fontsize => $self->{border};
750 1052
751 $self 1053 $self
752} 1054}
753 1055
754sub border { 1056sub border {
… …
770 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
771 1073
772 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
774 1076
775 $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)
776 if $self->{title}; 1078 if $self->{title};
777 1079
778 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
779} 1081}
780 1082
781sub button_down { 1083sub button_down {
782 my ($self, $ev, $x, $y) = @_; 1084 my ($self, $ev, $x, $y) = @_;
783 1085
1086 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 1087 my $border = $self->border;
785 1088
786 if ($x < $self->{w} && $x >= $self->{w} - $border 1089 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 1090 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 1091
1092 if ($lr & $td) {
1093 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1094 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 1095 my ($bw, $bh) = ($self->{w}, $self->{h});
791 1096
1097 my $mx = $x < $border;
1098 my $my = $y < $border;
1099
792 $self->{motion} = sub { 1100 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
794 1102
795 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 my $dx = $ev->{x} - $ox;
1104 my $dy = $ev->{y} - $oy;
796 1105
797 $self->{user_w} = $bw + $x - $ox; 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
799 $self->check_size; 1108
1109 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
800 }; 1111 };
801 1112
802 } elsif ($x >= 0 && $x < $self->{w} 1113 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
807 1116
808 $self->{motion} = sub { 1117 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
810 1119
811 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
812 1121
813 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
814 $self->update;
815 }; 1123 };
816 } 1124 }
817} 1125}
818 1126
819sub button_up { 1127sub button_up {
… …
832 my ($self) = @_; 1140 my ($self) = @_;
833 1141
834 my ($w, $h ) = ($self->{w}, $self->{h}); 1142 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 1144
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 1145 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 1147
842 my $border = $self->border; 1148 my $border = $self->border;
843 1149
844 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
849 1155
850 my $bg = $tex[0]; 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1157 glColor @{ $self->{bg} };
851 1158
852 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1160 # solve this better(?)
854 my $rep_y = $ch / $bg->{h}; 1161 $bg->{s} = $cw / $bg->{w};
855 1162 $bg->{t} = $ch / $bg->{h};
856 glColor @{ $self->{bg} };
857
858 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 }
862 1165
863 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 1167
866 $self->{title}->draw if $self->{title}; 1168 $self->{title}->draw if $self->{title};
1169
867 $self->child->draw; 1170 $self->child->draw;
868} 1171}
869 1172
870############################################################################# 1173#############################################################################
871 1174
… …
880sub new { 1183sub new {
881 my $class = shift; 1184 my $class = shift;
882 1185
883 $class->SUPER::new ( 1186 $class->SUPER::new (
884 col_expand => [], 1187 col_expand => [],
885 @_ 1188 @_,
886 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
887} 1194}
888 1195
889sub add { 1196sub add {
890 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
891 1198
892 $child->set_parent ($self); 1199 $child->set_parent ($self);
893 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
894 1201
895 $child->check_size; 1202 $self->realloc;
896} 1203}
897 1204
898# 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?
899sub clear { 1206sub clear {
900 my ($self) = @_; 1207 my ($self) = @_;
901 1208
1209 my @children = $self->children;
902 delete $self->{children}; 1210 delete $self->{children};
903 $self->update; 1211
1212 for (@children) {
1213 delete $_->{parent};
1214 $_->hide;
1215 }
1216
1217 $self->realloc;
904} 1218}
905 1219
906sub get_wh { 1220sub get_wh {
907 my ($self) = @_; 1221 my ($self) = @_;
908 1222
… …
939sub size_allocate { 1253sub size_allocate {
940 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
941 1255
942 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
943 1257
944 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
945 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
946 1260
947 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
948 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
949 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
950 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1004 } 1318 }
1005} 1319}
1006 1320
1007############################################################################# 1321#############################################################################
1008 1322
1009package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1010
1011# TODO: wrap into common Box base class
1012 1324
1013our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1014 1326
1015sub size_request { 1327sub size_request {
1016 my ($self) = @_; 1328 my ($self) = @_;
1017 1329
1018 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1019 1331 ? (
1020 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1021 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1022 (List::Util::max map $_->[1], @alloc), 1334 )
1023 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1024} 1339}
1025 1340
1026sub size_allocate { 1341sub size_allocate {
1027 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1028 1343
1029 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1030
1031 my $children = $self->{children}; 1345 my $children = $self->{children};
1032 1346
1033 my @h = map $_->{req_w}, @$children; 1347 my @req;
1034 1348
1035 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1036 1350 @req = ($space / (@$children || 1)) x @$children;
1037 if ($req_h > $h) {
1038 # ah well, not enough space
1039 $_ *= $h / $req_h for @h;
1040 } 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 {
1041 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1042 $exp ||= 1;
1043 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1044 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1045 my $child = $children->[$_];
1046
1047 my $alloc_h = $h[$_];
1048 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1049 $h[$_] = $alloc_h;
1050 } 1365 }
1051 } 1366 }
1052 1367
1053 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1054 1369
1055 my $y = 0; 1370 my $pos = 0;
1056 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1057 my $child = $children->[$_];
1058 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1059 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1060 1374
1061 $y += $h; 1375 $pos += $alloc;
1062 } 1376 }
1063 1377
1064 1 1378 1
1065} 1379}
1066 1380
1067############################################################################# 1381#############################################################################
1068 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
1069package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1070 1399
1071# TODO: wrap into common Box base class
1072
1073our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1074 1401
1075sub size_request { 1402sub new {
1076 my ($self) = @_; 1403 my $class = shift;
1077 1404
1078 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1079 1406 vertical => 1,
1080 ( 1407 @_,
1081 (List::Util::max map $_->[0], @alloc),
1082 (List::Util::sum map $_->[1], @alloc),
1083 ) 1408 )
1084} 1409}
1085 1410
1086sub size_allocate {
1087 my ($self, $w, $h) = @_;
1088
1089 my $children = $self->{children};
1090
1091 my @h = map $_->{req_h}, @$children;
1092
1093 my $req_h = List::Util::sum @h;
1094
1095 if ($req_h > $h) {
1096 # ah well, not enough space
1097 $_ *= $h / $req_h for @h;
1098 } else {
1099 my $exp = List::Util::sum map $_->{expand}, @$children;
1100 $exp ||= 1;
1101
1102 for (0 .. $#$children) {
1103 my $child = $children->[$_];
1104
1105 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1106 }
1107 }
1108
1109 CFClient::UI::harmonize \@h;
1110
1111 my $y = 0;
1112 for (0 .. $#$children) {
1113 my $child = $children->[$_];
1114 my $h = $h[$_];
1115 $child->configure (0, $y, $w, $h);
1116
1117 $y += $h;
1118 }
1119
1120 1
1121}
1122
1123############################################################################# 1411#############################################################################
1124 1412
1125package CFClient::UI::Label; 1413package CFClient::UI::Label;
1126 1414
1127our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1128 1416
1129use CFClient::OpenGL; 1417use CFClient::OpenGL;
1130 1418
1131sub new { 1419sub new {
1132 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1133 1421
1134 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
1425 #active_bg => none
1136 #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),
1137 fontsize => 1, 1432 fontsize => 1,
1138 text => "",
1139 align => -1, 1433 align => -1,
1140 valign => -1, 1434 valign => -1,
1141 padding => 2, 1435 padding_x => 2,
1142 layout => new CFClient::Layout, 1436 padding_y => 2,
1143 can_events => 0, 1437 can_events => 0,
1144 %arg 1438 %arg
1145 ); 1439 );
1146 1440
1147 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1444 $self->{template} = $layout;
1151 } 1445 }
1152 1446
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1154 $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 }
1155 1452
1156 $self 1453 $self
1157} 1454}
1158 1455
1159sub escape { 1456sub escape($) {
1160 local $_ = $_[1]; 1457 local $_ = $_[0];
1161 1458
1162 s/&/&amp;/g; 1459 s/&/&amp;/g;
1163 s/>/&gt;/g; 1460 s/>/&gt;/g;
1164 s/</&lt;/g; 1461 s/</&lt;/g;
1165 1462
1166 $_[1] 1463 $_
1464}
1465
1466sub update {
1467 my ($self) = @_;
1468
1469 delete $self->{texture};
1470 $self->SUPER::update;
1167} 1471}
1168 1472
1169sub set_text { 1473sub set_text {
1170 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1171 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;
1172 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1173 1481
1174 delete $self->{texture}; 1482 $self->realloc;
1175 $self->check_size;
1176 $self->update; 1483 $self->update;
1177} 1484}
1178 1485
1179sub set_markup { 1486sub set_markup {
1180 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1181 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;
1182 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1183 1496
1184 delete $self->{texture}; 1497 $self->realloc;
1185 $self->check_size;
1186 $self->update; 1498 $self->update;
1187} 1499}
1188 1500
1189sub size_request { 1501sub size_request {
1190 my ($self) = @_; 1502 my ($self) = @_;
1191 1503
1192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $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});
1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195 1509
1196 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1197 1511
1198 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1203 1517
1204 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1205 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1206 } 1520 }
1207 1521
1208 ( 1522 ($w, $h)
1209 $w + $self->{padding} * 2,
1210 $h + $self->{padding} * 2,
1211 )
1212} 1523}
1213 1524
1214sub size_allocate { 1525sub size_allocate {
1215 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1216 1527
1217 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1218} 1530}
1219 1531
1220sub set_fontsize { 1532sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1222 1534
1223 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1536 delete $self->{texture};
1225 $self->check_size; 1537
1226 $self->update; 1538 $self->realloc;
1227} 1539}
1228 1540
1229sub _draw { 1541sub _draw {
1230 my ($self) = @_; 1542 my ($self) = @_;
1231 1543
1544 $self->SUPER::_draw; # draw background, if applicable
1545
1232 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $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});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553
1236 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
1237 }; 1565 };
1238 1566
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1569
1570 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1571 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $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 }
1259 1576
1260 glDisable GL_TEXTURE_2D; 1577 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1578}
1263 1579
1264############################################################################# 1580#############################################################################
1265 1581
1266package CFClient::UI::EntryBase; 1582package CFClient::UI::EntryBase;
… …
1271 1587
1272sub new { 1588sub new {
1273 my $class = shift; 1589 my $class = shift;
1274 1590
1275 $class->SUPER::new ( 1591 $class->SUPER::new (
1276 fg => [1, 1, 1], 1592 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1593 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1594 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1280 can_hover => 1, 1596 can_hover => 1,
1281 can_focus => 1, 1597 can_focus => 1,
1282 valign => 0, 1598 valign => 0,
1283 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1284 @_ 1601 @_
1285 ) 1602 )
1286} 1603}
1287 1604
1288sub _set_text { 1605sub _set_text {
… …
1298 $self->{text} = $text; 1615 $self->{text} = $text;
1299 1616
1300 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1301 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1302 1619
1303 $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;
1304} 1630}
1305 1631
1306sub get_text { 1632sub get_text {
1307 $_[0]{text} 1633 $_[0]{text}
1308} 1634}
… …
1311 my ($self) = @_; 1637 my ($self) = @_;
1312 1638
1313 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1314 1640
1315 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text {
1325 my ($self, $text) = @_;
1326
1327 $self->{cursor} = length $text;
1328 $self->_set_text ($text);
1329 $self->update;
1330} 1642}
1331 1643
1332sub key_down { 1644sub key_down {
1333 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1334 1646
… …
1336 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1338 1650
1339 my $text = $self->get_text; 1651 my $text = $self->get_text;
1340 1652
1341 if ($sym == 8) { 1653 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1666 $self->_emit ('escape');
1355 } elsif ($uni) { 1667 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1669 }
1358 1670
1359 $self->_set_text ($text); 1671 $self->_set_text ($text);
1360 $self->update; 1672
1673 $self->realloc;
1361} 1674}
1362 1675
1363sub focus_in { 1676sub focus_in {
1364 my ($self) = @_; 1677 my ($self) = @_;
1365 1678
… …
1441 my ($self, $ev) = @_; 1754 my ($self, $ev) = @_;
1442 1755
1443 my $sym = $ev->{sym}; 1756 my $sym = $ev->{sym};
1444 1757
1445 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} = '';
1446 $self->emit (activate => $self->get_text); 1763 $self->_emit (activate => $txt);
1447 $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 }
1448 1787
1449 } else { 1788 } else {
1450 $self->SUPER::key_down ($ev); 1789 $self->SUPER::key_down ($ev);
1451 } 1790 }
1452 1791
… …
1466 1805
1467sub new { 1806sub new {
1468 my $class = shift; 1807 my $class = shift;
1469 1808
1470 $class->SUPER::new ( 1809 $class->SUPER::new (
1471 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1472 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1475 can_hover => 1, 1814 can_hover => 1,
1476 align => 0, 1815 align => 0,
1477 valign => 0, 1816 valign => 0,
1478 can_events => 1, 1817 can_events => 1,
1479 @_ 1818 @_
1480 ) 1819 )
1481} 1820}
1482 1821
1822sub activate { }
1823
1483sub button_up { 1824sub button_up {
1484 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1485 1826
1827 $self->emit ("activate")
1486 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1487 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1488 $self->emit ("activate");
1489 }
1490} 1830}
1491 1831
1492sub _draw { 1832sub _draw {
1493 my ($self) = @_; 1833 my ($self) = @_;
1494 1834
… …
1496 1836
1497 if ($GRAB == $self) { 1837 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1838 $self->{fg} = $self->{active_fg};
1499 } 1839 }
1500 1840
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1841 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1843 glColor 0, 0, 0, 1;
1506 1844
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1846
1509 glDisable GL_TEXTURE_2D; 1847 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1848
1512 $self->SUPER::_draw; 1849 $self->SUPER::_draw;
1513} 1850}
1514 1851
1515############################################################################# 1852#############################################################################
… …
1526 1863
1527sub new { 1864sub new {
1528 my $class = shift; 1865 my $class = shift;
1529 1866
1530 $class->SUPER::new ( 1867 $class->SUPER::new (
1531 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1532 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1533 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],
1534 state => 0, 1874 state => 0,
1535 can_hover => 1, 1875 can_hover => 1,
1536 @_ 1876 @_
1537 ) 1877 )
1538} 1878}
1539 1879
1540sub size_request { 1880sub size_request {
1541 my ($self) = @_; 1881 my ($self) = @_;
1542 1882
1543 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1544} 1884}
1545 1885
1546sub button_down { 1886sub button_down {
1547 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1548 1888
1549 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1550 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1551 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1552 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1553 } 1893 }
1554} 1894}
1555 1895
1556sub _draw { 1896sub _draw {
1557 my ($self) = @_; 1897 my ($self) = @_;
1558 1898
1559 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1560 1900
1561 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1562 1902
1563 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;
1564 1906
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1908
1567 glEnable GL_BLEND; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1910
1568 glEnable GL_TEXTURE_2D; 1911 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1912 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1913 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1914}
1578 1915
1579############################################################################# 1916#############################################################################
1580 1917
1581package CFClient::UI::Image; 1918package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1961 glTranslate 0, -$self->{w}, 0;
1625 1962
1626 ($w, $h) = ($h, $w); 1963 ($w, $h) = ($h, $w);
1627 } 1964 }
1628 1965
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1966 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1968
1634 $tex->draw_quad (0, 0, $w, $h); 1969 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1970
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1638} 1972}
1639 1973
1640############################################################################# 1974#############################################################################
1641 1975
… …
1689} 2023}
1690 2024
1691sub set_max { 2025sub set_max {
1692 my ($self, $max) = @_; 2026 my ($self, $max) = @_;
1693 2027
2028 return if $self->{max_val} == $max;
2029
1694 $self->{max_val} = $max; 2030 $self->{max_val} = $max;
2031 $self->update;
1695} 2032}
1696 2033
1697sub set_value { 2034sub set_value {
1698 my ($self, $val, $max) = @_; 2035 my ($self, $val, $max) = @_;
1699 2036
1700 $self->set_max ($max) 2037 $self->set_max ($max)
1701 if defined $max; 2038 if defined $max;
1702 2039
1703 $max = $self->{max_val}; 2040 return if $self->{val} == $val;
2041
1704 $self->{val} = $val; 2042 $self->{val} = $val;
1705
1706 $self->update; 2043 $self->update;
1707} 2044}
1708 2045
1709sub _draw { 2046sub _draw {
1710 my ($self) = @_; 2047 my ($self) = @_;
… …
1773 2110
1774sub new { 2111sub new {
1775 my ($class, %arg) = @_; 2112 my ($class, %arg) = @_;
1776 2113
1777 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2115 tooltip => $arg{type},
2116 can_hover => 1,
1779 can_events => 1, 2117 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2118 %arg,
1782 ); 2119 );
1783 2120
1784 $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");
1785 $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);
… …
1793 2130
1794 $self->{value}->set_fontsize ($fsize); 2131 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2132 $self->{max} ->set_fontsize ($fsize);
1796} 2133}
1797 2134
2135sub set_max {
2136 my ($self, $max) = @_;
2137
2138 $self->{gauge}->set_max ($max);
2139 $self->{max}->set_text ($max);
2140}
2141
1798sub set_value { 2142sub set_value {
1799 my ($self, $val, $max) = @_; 2143 my ($self, $val, $max) = @_;
1800 2144
1801 $self->set_max ($max) 2145 $self->set_max ($max)
1802 if defined $max; 2146 if defined $max;
1803 2147
1804 $self->{gauge}->set_value ($val, $max); 2148 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2149 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2150}
1814 2151
1815############################################################################# 2152#############################################################################
1816 2153
1817package CFClient::UI::Slider; 2154package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
1828 2165
1829sub new { 2166sub new {
1830 my $class = shift; 2167 my $class = shift;
1831 2168
1832 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
1833 2170
1834 # TODO: 0-width page 2171 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2173 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
1839 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],
1840 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
1841 req_w => 20, 2180 min_w => $::WIDTH / 80,
1842 req_h => 20, 2181 min_h => $::WIDTH / 80,
1843 vertical => 0, 2182 vertical => 0,
1844 can_hover => 1, 2183 can_hover => 1,
1845 inner_pad => 5, 2184 inner_pad => 0.02,
1846 @_ 2185 @_
1847 ); 2186 );
1848 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
1849 $self 2191 $self
1850} 2192}
1851 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
1852sub size_request { 2228sub size_request {
1853 my ($self) = @_; 2229 my ($self) = @_;
1854 2230
1855 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
1856 my $h = $self->{req_h};
1857
1858 $self->{vertical} ? ($h, $w) : ($w, $h)
1859} 2232}
1860 2233
1861sub button_down { 2234sub button_down {
1862 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1863 2236
1864 $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
1865 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
1866} 2242}
1867 2243
1868sub mouse_motion { 2244sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1870 2246
1871 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
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
1873 2266
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1875 2268
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1877 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1878 2271
1879 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
1881 $x = $lo if $x < $lo;
1882 $x = $hi - $page if $x > $hi - $page;
1883 $self->{range}[0] = $x;
1884 2274
1885 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
1886 $self->update; 2276 $self->{knob_w} = $knob_w;
1887 } 2277 });
1888}
1889 2278
1890# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
1891# so that the handle doesn't leave the texture. This calculation isn't 100%
1892# correct propably, but it does the job for now
1893sub _calc_inner_pad_px {
1894 my ($self, $w) = @_;
1895 ($w / 100) * $self->{inner_pad} # % to pixels
1896} 2280}
1897 2281
1898sub _draw { 2282sub _draw {
1899 my ($self) = @_; 2283 my ($self) = @_;
1900 2284
1901 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
1902 2286
1903 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
1904 2288
1905 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
1907 2291
2292 glTranslate 1, 0, 0;
1908 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2294 }
1913 2295
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2298
1917 my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919 $hi = $value + 1 if $lo == $hi;
1920
1921 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924 $page = int $page * $inner_w / ($hi - $lo);
1925 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927 $w -= $page;
1928 $page &= ~1;
1929 glTranslate $page * 0.5, 0, 0;
1930 $page ||= 2;
1931
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2301
1940 # draw background 2302 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2304
1943 # draw handle 2305 # draw handle
1944 $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);
1945 2307
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
1948} 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 (@_) }
1949 2351
1950############################################################################# 2352#############################################################################
1951 2353
1952package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
1953 2355
… …
1957 2359
1958sub new { 2360sub new {
1959 my $class = shift; 2361 my $class = shift;
1960 2362
1961 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1962 fontsize => 1, 2364 fontsize => 1,
2365 can_events => 0,
1963 #font => default_font 2366 #font => default_font
1964 @_, 2367 @_,
1965 2368
1966 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
1967 par => [], 2370 par => [],
1968 height => 0, 2371 height => 0,
1969 children => [ 2372 children => [
1970 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
1972 ], 2375 ],
1973 ); 2376 );
1974 2377
1975 $self->{children}[1]->connect (changed => sub { 2378 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2379
1979 $self 2380 $self
1980} 2381}
1981 2382
1982sub set_fontsize { 2383sub set_fontsize {
1983 my ($self, $fontsize) = @_; 2384 my ($self, $fontsize) = @_;
1984 2385
1985 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
1986 $self->reflow; 2387 $self->reflow;
1987}
1988
1989sub text_height {
1990 my ($self, $text) = @_;
1991
1992 my $layout = $self->{layout};
1993
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w});
1996 $layout->set_text ($text);
1997
1998 ($layout->size)[1]
1999}
2000
2001sub reflow {
2002 my ($self) = @_;
2003
2004 $self->{need_reflow}++;
2005 $self->update;
2006} 2388}
2007 2389
2008sub size_allocate { 2390sub size_allocate {
2009 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2010 2392
… …
2015 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2016 2398
2017 $self->reflow; 2399 $self->reflow;
2018} 2400}
2019 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
2020sub add_paragraph { 2436sub add_paragraph {
2021 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2022 2438
2023 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2024 2440 my ($w, $h) = $self->text_size ($line);
2025 my $height = $self->text_height ($text);
2026
2027 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2028 2444
2029 push @{$self->{par}}, [$height, $color, $text];
2030
2031 $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]);
2032 $self->{children}[1]->update;
2033} 2446}
2034 2447
2035sub update { 2448sub update {
2036 my ($self) = @_; 2449 my ($self) = @_;
2037 2450
… …
2039 2452
2040 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2041 2454
2042 delete $self->{texture}; 2455 delete $self->{texture};
2043 2456
2044 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2045 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2461 my $height = 0;
2047 2462
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2049 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 }
2050 2478
2051 $self->{height} = $height; 2479 $self->{height} = $height;
2052 2480
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2054 2482
2055 delete $self->{texture}; 2483 delete $self->{texture};
2056 } 2484 }
2057 2485
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2059 glClearColor 0, 0, 0, 1; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2061 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
2062 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066
2067 my $top = int $self->{children}[1]{range}[0];
2068
2069 my $y0 = $top;
2070 my $y1 = $top + $self->{h};
2071
2072 my $y = 0;
2073
2074 my $layout = $self->{layout};
2075
2076 $layout->set_font ($self->{font}) if $self->{font};
2077 2504
2078 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2506 my $h = $par->[1];
2080 2507
2081 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]);
2082 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2083 2512
2084 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2085 my ($W, $H) = $layout->size; 2514
2086 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;
2087 } 2517 }
2088 2518
2089 $y += $h; 2519 $y += $h;
2090 } 2520 }
2091 2521
2092 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2094 }; 2523 };
2095 }); 2524 });
2096} 2525}
2097 2526
2098sub _draw { 2527sub _draw {
2099 my ($self) = @_; 2528 my ($self) = @_;
2100 2529
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2103 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;
2104 $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});
2105 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2106 }
2107 2535
2108 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2109 2537
2110} 2538}
2111 2539
… …
2159 2587
2160sub new { 2588sub new {
2161 my $class = shift; 2589 my $class = shift;
2162 2590
2163 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2164 state => 0, 2592 state => 0,
2165 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2594 @_
2168 ); 2595 );
2169 2596
2170 if ($self->{state}) {
2171 $self->{state} = 0;
2172 $self->toggle_flopper;
2173 }
2174
2175 $self 2597 $self
2176} 2598}
2177 2599
2178sub toggle_flopper { 2600sub toggle_flopper {
2179 my ($self) = @_; 2601 my ($self) = @_;
2180 2602
2181 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2182 if ($self->{state} = !$self->{state}) {
2183 $CFClient::UI::ROOT->add ($self->{other});
2184 $self->{other}->move ($self->coord2global (0, $self->{h}));
2185 $self->emit ("open");
2186 } else {
2187 $CFClient::UI::ROOT->remove ($self->{other});
2188 $self->emit ("close");
2189 }
2190
2191 $self->emit (changed => $self->{state});
2192} 2604}
2193 2605
2194############################################################################# 2606#############################################################################
2195 2607
2196package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2206 @_, 2618 @_,
2207 can_events => 0, 2619 can_events => 0,
2208 ) 2620 )
2209} 2621}
2210 2622
2211sub set_markup { 2623sub set_tooltip_from {
2212 my ($self, $text) = @_; 2624 my ($self, $widget) = @_;
2213 2625
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2626 my $tooltip = $widget->{tooltip};
2215 $self->{label}->set_markup ($text); 2627
2216 $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 );
2217} 2643}
2218 2644
2219sub size_request { 2645sub size_request {
2220 my ($self) = @_; 2646 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2647
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2649
2226 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2227} 2651}
… …
2230 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2231 2655
2232 $self->SUPER::size_allocate ($w - 4, $h - 4); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2233} 2657}
2234 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
2235sub _draw { 2677sub _draw {
2236 my ($self) = @_; 2678 my ($self) = @_;
2237 2679
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2680 glTranslate 0.375, 0.375;
2240 2681
2241 my ($w, $h) = @$self{qw(w h)}; 2682 my ($w, $h) = @$self{qw(w h)};
2242 2683
2243 glColor 1, 0.8, 0.4; 2684 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2695 glVertex 0 , $h;
2255 glVertex $w, $h; 2696 glVertex $w, $h;
2256 glVertex $w, 0; 2697 glVertex $w, 0;
2257 glEnd; 2698 glEnd;
2258 2699
2259 glPopMatrix; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2260 2701
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2263} 2703}
2264 2704
2265############################################################################# 2705#############################################################################
2266 2706
… …
2271use CFClient::OpenGL; 2711use CFClient::OpenGL;
2272 2712
2273sub new { 2713sub new {
2274 my $class = shift; 2714 my $class = shift;
2275 2715
2276 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2277 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2278 @_, 2719 @_,
2279 ) 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
2280} 2737}
2281 2738
2282sub size_request { 2739sub size_request {
2283 (32, 8) 2740 (32, 8)
2284} 2741}
2285 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2286sub draw { 2751sub _draw {
2287 my ($self) = @_; 2752 my ($self) = @_;
2288 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
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2290 2766
2291 if ($tex) { 2767 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2773 }
2774}
2775
2776sub DESTROY {
2777 my ($self) = @_;
2778
2779 $self->{timer}->cancel
2780 if $self->{timer};
2781
2782 $self->SUPER::DESTROY;
2301} 2783}
2302 2784
2303############################################################################# 2785#############################################################################
2304 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
2305package CFClient::UI::Root; 3260package CFClient::UI::Root;
2306 3261
2307our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2308 3263
2309use CFClient::OpenGL; 3264use CFClient::OpenGL;
2310 3265
2311sub check_size { 3266sub new {
2312 my ($self) = @_; 3267 my $class = shift;
2313 3268
2314 $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
2315} 3277}
2316 3278
2317sub size_request { 3279sub size_request {
2318 ($::WIDTH, $::HEIGHT) 3280 my ($self) = @_;
2319}
2320 3281
2321sub 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 {
2322 my ($self, $x, $y, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2323 3301
2324 $self->SUPER::configure ($x, $y, $w, $h);
2325
2326 for my $child (@{$self->{children}}) { 3302 for my $child ($self->children) {
2327 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)};
2328 3304
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2330 $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
2331 $child->configure ($X, $Y, $W,$H); 3311 $child->configure ($X, $Y, $W, $H);
2332 } 3312 }
2333} 3313}
2334 3314
2335sub _topleft { 3315sub coord2local {
2336 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2337 3317
2338 ($x, $y) 3318 ($x, $y)
2339} 3319}
2340 3320
3321sub coord2global {
3322 my ($self, $x, $y) = @_;
3323
3324 ($x, $y)
3325}
3326
2341sub update { 3327sub update {
2342 my ($self) = @_; 3328 my ($self) = @_;
2343 3329
2344 $self->check_size; 3330 $::WANT_REFRESH++;
2345 ::refresh ();
2346} 3331}
2347 3332
2348sub add { 3333sub add {
2349 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2350 3335
2351 # integerize window positions 3336 $_->{is_toplevel} = 1
2352 $child->{x} = int $child->{x}; 3337 for @children;
2353 $child->{y} = int $child->{y};
2354 3338
2355 $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 }
2356} 3355}
2357 3356
2358sub on_refresh { 3357sub on_refresh {
2359 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2360 3359
2361 $self->{refresh_hook}{$id} = $cb; 3360 $self->{refresh_hook}{$id} = $cb;
2362} 3361}
2363 3362
3363sub on_post_alloc {
3364 my ($self, $id, $cb) = @_;
3365
3366 $self->{post_alloc_hook}{$id} = $cb;
3367}
3368
2364sub draw { 3369sub draw {
2365 my ($self) = @_; 3370 my ($self) = @_;
2366 3371
2367 while (my $rcb = delete $self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 3373 $_->()
3374 for values %{delete $self->{refresh_hook}};
2369 } 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
2370 3465
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2374 3469
2375 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2376 glLoadIdentity; 3471 glLoadIdentity;
2377 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2378 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2379 glLoadIdentity; 3474 glLoadIdentity;
2380 3475
2381 $self->_draw; 3476 $self->_draw;
2382} 3477}
… …
2384############################################################################# 3479#############################################################################
2385 3480
2386package CFClient::UI; 3481package CFClient::UI;
2387 3482
2388$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390 3485
23911 34861
2392 3487

Diff Legend

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