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.267 by root, Thu Jun 1 04:10:29 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;
293} 453}
294 454
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
299sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
300 528
301sub draw { 529sub draw {
302 my ($self) = @_; 530 my ($self) = @_;
303 531
304 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
305 541
306 glPushMatrix; 542 glPushMatrix;
307 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
308 $self->_draw; 544 $self->_draw;
309 glPopMatrix; 545 glPopMatrix;
… …
321 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
322 glEnd; 558 glEnd;
323 glDisable GL_BLEND; 559 glDisable GL_BLEND;
324 } 560 }
325 561
326 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
327 glPushMatrix; 563 glPushMatrix;
328 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
329 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
330 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
331 glVertex 0 , 0; 567 glVertex 0 , 0;
332 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
333 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
334 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
335 glEnd; 571 glEnd;
336 glPopMatrix; 572 glPopMatrix;
337 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338 } 574 }
339} 575}
340 576
341sub _draw { 577sub _draw {
342 my ($self) = @_; 578 my ($self) = @_;
343 579
344 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
345} 581}
346 582
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 { 583sub DESTROY {
413 my ($self) = @_; 584 my ($self) = @_;
414 585
586 delete $WIDGET{$self+0};
415 #$self->deactivate; 587 #$self->deactivate;
416} 588}
417 589
418############################################################################# 590#############################################################################
419 591
… …
428 my $class = shift; 600 my $class = shift;
429 601
430 # range [value, low, high, page] 602 # range [value, low, high, page]
431 603
432 $class->SUPER::new ( 604 $class->SUPER::new (
433 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
434 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
435 @_ 607 @_
436 ) 608 )
437} 609}
438 610
439sub _draw { 611sub _draw {
440 my ($self) = @_; 612 my ($self) = @_;
441 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
442 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
443 620
444 glEnable GL_BLEND; 621 glEnable GL_BLEND;
445 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
447 624
448 glBegin GL_QUADS; 625 glBegin GL_QUADS;
449 glVertex 0 , 0; 626 glVertex 0 , 0;
450 glVertex 0 , $h; 627 glVertex 0 , $h;
451 glVertex $w, $h; 628 glVertex $w, $h;
452 glVertex $w, 0; 629 glVertex $w, 0;
453 glEnd; 630 glEnd;
454 631
455 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
456} 634}
457 635
458############################################################################# 636#############################################################################
459 637
460package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
465 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
467} 645}
468 646
469sub size_request { 647sub size_request {
470 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
471} 651}
472 652
473sub draw { } 653sub draw { }
474 654
475############################################################################# 655#############################################################################
… …
481sub new { 661sub new {
482 my ($class, %arg) = @_; 662 my ($class, %arg) = @_;
483 663
484 my $children = delete $arg{children} || []; 664 my $children = delete $arg{children} || [];
485 665
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 666 my $self = $class->SUPER::new (
667 children => [],
668 can_events => 0,
669 %arg,
670 );
487 $self->add ($_) for @$children; 671 $self->add ($_) for @$children;
488 672
489 $self 673 $self
490} 674}
491 675
492sub add { 676sub add {
493 my ($self, $child) = @_; 677 my ($self, @widgets) = @_;
494 678
495 $child->set_parent ($self); 679 $_->set_parent ($self)
680 for @widgets;
496 681
497 use sort 'stable'; 682 use sort 'stable';
498 683
499 $self->{children} = [ 684 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 686 @{$self->{children}}, @widgets
502 ]; 687 ];
503 688
504 $child->check_size; 689 $self->realloc;
690}
691
692sub children {
693 @{ $_[0]{children} }
505} 694}
506 695
507sub remove { 696sub remove {
508 my ($self, $child) = @_; 697 my ($self, $child) = @_;
509 698
510 delete $child->{parent}; 699 delete $child->{parent};
700 $child->hide;
511 701
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 703
514 $self->check_size; 704 $self->realloc;
515 $self->update;
516} 705}
517 706
518sub clear { 707sub clear {
519 my ($self) = @_; 708 my ($self) = @_;
520 709
521 delete $_->{parent} 710 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 711 $self->{children} = [];
712
713 for (@$children) {
714 delete $_->{parent};
715 $_->hide;
716 }
717
718 $self->realloc;
525} 719}
526 720
527sub find_widget { 721sub find_widget {
528 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
529 723
… …
604} 798}
605 799
606sub update { 800sub update {
607 my ($self) = @_; 801 my ($self) = @_;
608 802
609 # we want to do this delayed... 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 804 $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} 805}
623 806
624sub size_allocate { 807sub size_allocate {
625 my ($self, $w, $h) = @_; 808 my ($self, $w, $h) = @_;
626 809
627 $self->child->configure (0, 0, $w, $h); 810 $self->SUPER::size_allocate ($w, $h);
811 $self->update;
812}
628 813
814sub _render {
815 my ($self) = @_;
816
817 $self->{children}[0]->draw;
818}
819
820sub render_child {
821 my ($self) = @_;
822
823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
824 glClearColor 0, 0, 0, 0;
825 glClear GL_COLOR_BUFFER_BIT;
826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
629 $self->render_chld; 834 $self->_render;
835 };
630} 836}
631 837
632sub _draw { 838sub _draw {
633 my ($self) = @_; 839 my ($self) = @_;
634 840
635 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
636 842
637 my $tex = $self->{texture} 843 my $tex = $self->{texture}
638 or return; 844 or return;
639 845
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1;
644 849
645 $tex->draw_quad (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 851
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
649} 853}
650 854
651############################################################################# 855#############################################################################
652 856
653package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
654 858
655our @ISA = CFClient::UI::Window::; 859our @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 860
683sub new { 861sub new {
684 my $class = shift; 862 my $class = shift;
685 863
686 my $self = $class->SUPER::new ( 864 $class->SUPER::new (
687 bg => [1, 1, 1, 1], 865 scroll_x => 0,
688 border_bg => [1, 1, 1, 1], 866 scroll_y => 1,
689 border => 0.8,
690 @_ 867 @_,
691 ); 868 )
692
693 $self
694} 869}
695 870
696sub _draw { 871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
875
876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
880}
881
882sub size_allocate {
697 my ($self) = @_; 883 my ($self, $w, $h) = @_;
698 884
699 my ($w, $h) = ($self->{w}, $self->{h}); 885 my $child = $self->child;
700 886
701 glEnable GL_BLEND; 887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 888 $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 889
706# glBegin GL_QUADS; 890 $self->child->configure (0, 0, $w, $h);
707# glColor 0, 0, 0, 0; 891 $self->update;
708# glVertex 0 , 0; 892}
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713 893
894sub set_offset {
895 my ($self, $x, $y) = @_;
714 896
715 $self->child->draw; 897 $self->{view_x} = int $x;
716 glDisable GL_BLEND; 898 $self->{view_y} = int $y;
717 glDisable GL_TEXTURE_2D; 899
900 $self->update;
901}
902
903# hmm, this does not work for topleft of $self... but we should not ask for that
904sub coord2local {
905 my ($self, $x, $y) = @_;
906
907 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
908}
909
910sub coord2global {
911 my ($self, $x, $y) = @_;
912
913 $x = List::Util::min $self->{w}, $x - $self->{view_x};
914 $y = List::Util::min $self->{h}, $y - $self->{view_y};
915
916 $self->SUPER::coord2global ($x, $y)
917}
918
919sub find_widget {
920 my ($self, $x, $y) = @_;
921
922 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
923 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
924 ) {
925 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
926 } else {
927 $self->CFClient::UI::Base::find_widget ($x, $y)
928 }
929}
930
931sub _render {
932 my ($self) = @_;
933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
938
939 $self->SUPER::_render;
718} 940}
719 941
720############################################################################# 942#############################################################################
721 943
722package CFClient::UI::FancyFrame; 944package CFClient::UI::ScrolledWindow;
723 945
724our @ISA = CFClient::UI::Bin::; 946our @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 947
732sub new { 948sub new {
733 my $class = shift; 949 my $class = shift;
734 950
735 # TODO: user_x, user_y, overwrite moveto? 951 my $self;
952
953 my $slider = new CFClient::UI::Slider
954 vertical => 1,
955 range => [0, 0, 1, 0.01], # HACK fix
956 on_changed => sub {
957 $self->{vp}->set_offset (0, $_[1]);
958 },
959 ;
960
961 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider,
964 @_,
965 );
966
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider});
970
971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995
996#############################################################################
997
998package CFClient::UI::Frame;
999
1000our @ISA = CFClient::UI::Bin::;
1001
1002use CFClient::OpenGL;
1003
1004sub new {
1005 my $class = shift;
1006
1007 $class->SUPER::new (
1008 bg => undef,
1009 @_,
1010 )
1011}
1012
1013sub _draw {
1014 my ($self) = @_;
1015
1016 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)};
1018
1019 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} };
1022
1023 glBegin GL_QUADS;
1024 glVertex 0 , 0;
1025 glVertex 0 , $h;
1026 glVertex $w, $h;
1027 glVertex $w, 0;
1028 glEnd;
1029
1030 glDisable GL_BLEND;
1031 }
1032
1033 $self->SUPER::_draw;
1034}
1035
1036#############################################################################
1037
1038package CFClient::UI::FancyFrame;
1039
1040our @ISA = CFClient::UI::Bin::;
1041
1042use CFClient::OpenGL;
1043
1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051
1052sub new {
1053 my $class = shift;
736 1054
737 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
740 border => 0.8, 1058 border => 0.6,
741 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
742 @_ 1062 @_
743 ); 1063 );
744 1064
745 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 1066 align => 0,
747 valign => 1, 1067 valign => 1,
748 text => $self->{title}, 1068 text => $self->{title},
749 fontsize => 1; 1069 fontsize => $self->{border};
750 1070
751 $self 1071 $self
752} 1072}
753 1073
754sub border { 1074sub border {
… …
770 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
771 1091
772 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
774 1094
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
776 if $self->{title}; 1096 if $self->{title};
777 1097
778 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
779} 1099}
780 1100
781sub button_down { 1101sub button_down {
782 my ($self, $ev, $x, $y) = @_; 1102 my ($self, $ev, $x, $y) = @_;
783 1103
1104 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 1105 my $border = $self->border;
785 1106
786 if ($x < $self->{w} && $x >= $self->{w} - $border 1107 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 1108 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 1109
1110 if ($lr & $td) {
1111 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1112 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 1113 my ($bw, $bh) = ($self->{w}, $self->{h});
791 1114
1115 my $mx = $x < $border;
1116 my $my = $y < $border;
1117
792 $self->{motion} = sub { 1118 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
794 1120
795 ($x, $y) = ($ev->{x}, $ev->{y}); 1121 my $dx = $ev->{x} - $ox;
1122 my $dy = $ev->{y} - $oy;
796 1123
797 $self->{user_w} = $bw + $x - $ox; 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
799 $self->check_size; 1126
1127 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
800 }; 1129 };
801 1130
802 } elsif ($x >= 0 && $x < $self->{w} 1131 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
807 1134
808 $self->{motion} = sub { 1135 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
810 1137
811 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
812 1139
813 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
814 $self->update;
815 }; 1141 };
816 } 1142 }
817} 1143}
818 1144
819sub button_up { 1145sub button_up {
… …
832 my ($self) = @_; 1158 my ($self) = @_;
833 1159
834 my ($w, $h ) = ($self->{w}, $self->{h}); 1160 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 1162
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 1163 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 1165
842 my $border = $self->border; 1166 my $border = $self->border;
843 1167
844 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
849 1173
850 my $bg = $tex[0]; 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1175 glColor @{ $self->{bg} };
851 1176
852 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1178 # solve this better(?)
854 my $rep_y = $ch / $bg->{h}; 1179 $bg->{s} = $cw / $bg->{w};
855 1180 $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); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 }
862 1183
863 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 1185
866 $self->{title}->draw if $self->{title}; 1186 $self->{title}->draw if $self->{title};
1187
867 $self->child->draw; 1188 $self->child->draw;
868} 1189}
869 1190
870############################################################################# 1191#############################################################################
871 1192
… …
880sub new { 1201sub new {
881 my $class = shift; 1202 my $class = shift;
882 1203
883 $class->SUPER::new ( 1204 $class->SUPER::new (
884 col_expand => [], 1205 col_expand => [],
885 @_ 1206 @_,
886 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
887} 1212}
888 1213
889sub add { 1214sub add {
890 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
891 1216
892 $child->set_parent ($self); 1217 $child->set_parent ($self);
893 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
894 1219
895 $child->check_size; 1220 $self->realloc;
896} 1221}
897 1222
898# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
899sub clear { 1224sub clear {
900 my ($self) = @_; 1225 my ($self) = @_;
901 1226
1227 my @children = $self->children;
902 delete $self->{children}; 1228 delete $self->{children};
903 $self->update; 1229
1230 for (@children) {
1231 delete $_->{parent};
1232 $_->hide;
1233 }
1234
1235 $self->realloc;
904} 1236}
905 1237
906sub get_wh { 1238sub get_wh {
907 my ($self) = @_; 1239 my ($self) = @_;
908 1240
… …
939sub size_allocate { 1271sub size_allocate {
940 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
941 1273
942 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
943 1275
944 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
945 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
946 1278
947 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
948 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
949 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
950 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1004 } 1336 }
1005} 1337}
1006 1338
1007############################################################################# 1339#############################################################################
1008 1340
1009package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1010
1011# TODO: wrap into common Box base class
1012 1342
1013our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1014 1344
1015sub size_request { 1345sub size_request {
1016 my ($self) = @_; 1346 my ($self) = @_;
1017 1347
1018 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1019 1349 ? (
1020 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1021 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1022 (List::Util::max map $_->[1], @alloc), 1352 )
1023 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1024} 1357}
1025 1358
1026sub size_allocate { 1359sub size_allocate {
1027 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1028 1361
1029 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1030
1031 my $children = $self->{children}; 1363 my $children = $self->{children};
1032 1364
1033 my @h = map $_->{req_w}, @$children; 1365 my @req;
1034 1366
1035 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1036 1368 @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 { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1041 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1042 $exp ||= 1;
1043 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1044 for (0 .. $#$children) { 1382 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 } 1383 }
1051 } 1384 }
1052 1385
1053 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1054 1387
1055 my $y = 0; 1388 my $pos = 0;
1056 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1057 my $child = $children->[$_];
1058 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1059 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1060 1392
1061 $y += $h; 1393 $pos += $alloc;
1062 } 1394 }
1063 1395
1064 1 1396 1
1065} 1397}
1066 1398
1067############################################################################# 1399#############################################################################
1068 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1069package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1070 1417
1071# TODO: wrap into common Box base class
1072
1073our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1074 1419
1075sub size_request { 1420sub new {
1076 my ($self) = @_; 1421 my $class = shift;
1077 1422
1078 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1079 1424 vertical => 1,
1080 ( 1425 @_,
1081 (List::Util::max map $_->[0], @alloc),
1082 (List::Util::sum map $_->[1], @alloc),
1083 ) 1426 )
1084} 1427}
1085 1428
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############################################################################# 1429#############################################################################
1124 1430
1125package CFClient::UI::Label; 1431package CFClient::UI::Label;
1126 1432
1127our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1128 1434
1129use CFClient::OpenGL; 1435use CFClient::OpenGL;
1130 1436
1131sub new { 1437sub new {
1132 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1133 1439
1134 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1136 #font => default_font 1444 #font => default_font
1445 #text => initial text
1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1449 layout => (new CFClient::Layout),
1137 fontsize => 1, 1450 fontsize => 1,
1138 text => "",
1139 align => -1, 1451 align => -1,
1140 valign => -1, 1452 valign => -1,
1141 padding => 2, 1453 padding_x => 2,
1142 layout => new CFClient::Layout, 1454 padding_y => 2,
1143 can_events => 0, 1455 can_events => 0,
1144 %arg 1456 %arg
1145 ); 1457 );
1146 1458
1147 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1460 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1461 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1462 $self->{template} = $layout;
1151 } 1463 }
1152 1464
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1465 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1466 $self->set_markup (delete $self->{markup});
1467 } else {
1468 $self->set_text (delete $self->{text});
1469 }
1155 1470
1156 $self 1471 $self
1157} 1472}
1158 1473
1159sub escape { 1474sub escape($) {
1160 local $_ = $_[1]; 1475 local $_ = $_[0];
1161 1476
1162 s/&/&amp;/g; 1477 s/&/&amp;/g;
1163 s/>/&gt;/g; 1478 s/>/&gt;/g;
1164 s/</&lt;/g; 1479 s/</&lt;/g;
1165 1480
1166 $_[1] 1481 $_
1482}
1483
1484sub update {
1485 my ($self) = @_;
1486
1487 delete $self->{texture};
1488 $self->SUPER::update;
1167} 1489}
1168 1490
1169sub set_text { 1491sub set_text {
1170 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1171 1493
1494 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text";
1496
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1173 1499
1174 delete $self->{texture}; 1500 $self->realloc;
1175 $self->check_size;
1176 $self->update; 1501 $self->update;
1177} 1502}
1178 1503
1179sub set_markup { 1504sub set_markup {
1180 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1181 1506
1507 return if $self->{text} eq "M$markup";
1508 $self->{text} = "M$markup";
1509
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1183 1514
1184 delete $self->{texture}; 1515 $self->realloc;
1185 $self->check_size;
1186 $self->update; 1516 $self->update;
1187} 1517}
1188 1518
1189sub size_request { 1519sub size_request {
1190 my ($self) = @_; 1520 my ($self) = @_;
1191 1521
1192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195 1527
1196 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1197 1529
1198 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1203 1535
1204 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1205 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1206 } 1538 }
1207 1539
1208 ( 1540 ($w, $h)
1209 $w + $self->{padding} * 2,
1210 $h + $self->{padding} * 2,
1211 )
1212} 1541}
1213 1542
1214sub size_allocate { 1543sub size_allocate {
1215 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1216 1545
1217 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1218} 1548}
1219 1549
1220sub set_fontsize { 1550sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1222 1552
1223 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1554 delete $self->{texture};
1225 $self->check_size; 1555
1226 $self->update; 1556 $self->realloc;
1227} 1557}
1228 1558
1229sub _draw { 1559sub _draw {
1230 my ($self) = @_; 1560 my ($self) = @_;
1231 1561
1562 $self->SUPER::_draw; # draw background, if applicable
1563
1232 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1565 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571
1236 new_from_layout CFClient::Texture $self->{layout} 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1573
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5);
1577
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1237 }; 1583 };
1238 1584
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1587
1588 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1589 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}); 1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else {
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 }
1259 1594
1260 glDisable GL_TEXTURE_2D; 1595 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1596}
1263 1597
1264############################################################################# 1598#############################################################################
1265 1599
1266package CFClient::UI::EntryBase; 1600package CFClient::UI::EntryBase;
… …
1271 1605
1272sub new { 1606sub new {
1273 my $class = shift; 1607 my $class = shift;
1274 1608
1275 $class->SUPER::new ( 1609 $class->SUPER::new (
1276 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1611 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1612 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1280 can_hover => 1, 1614 can_hover => 1,
1281 can_focus => 1, 1615 can_focus => 1,
1282 valign => 0, 1616 valign => 0,
1283 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1284 @_ 1619 @_
1285 ) 1620 )
1286} 1621}
1287 1622
1288sub _set_text { 1623sub _set_text {
… …
1298 $self->{text} = $text; 1633 $self->{text} = $text;
1299 1634
1300 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1301 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1302 1637
1303 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1639}
1640
1641sub set_text {
1642 my ($self, $text) = @_;
1643
1644 $self->{cursor} = length $text;
1645 $self->_set_text ($text);
1646
1647 $self->realloc;
1304} 1648}
1305 1649
1306sub get_text { 1650sub get_text {
1307 $_[0]{text} 1651 $_[0]{text}
1308} 1652}
… …
1311 my ($self) = @_; 1655 my ($self) = @_;
1312 1656
1313 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1314 1658
1315 ($w + 1, $h) # add 1 for cursor 1659 ($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} 1660}
1331 1661
1332sub key_down { 1662sub key_down {
1333 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1334 1664
… …
1336 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1667 my $uni = $ev->{unicode};
1338 1668
1339 my $text = $self->get_text; 1669 my $text = $self->get_text;
1340 1670
1341 if ($sym == 8) { 1671 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1673 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1674 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1675 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1676 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1677 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1678 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1683 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1684 $self->_emit ('escape');
1355 } elsif ($uni) { 1685 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1687 }
1358 1688
1359 $self->_set_text ($text); 1689 $self->_set_text ($text);
1360 $self->update; 1690
1691 $self->realloc;
1361} 1692}
1362 1693
1363sub focus_in { 1694sub focus_in {
1364 my ($self) = @_; 1695 my ($self) = @_;
1365 1696
… …
1441 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1442 1773
1443 my $sym = $ev->{sym}; 1774 my $sym = $ev->{sym};
1444 1775
1445 if ($sym == 13) { 1776 if ($sym == 13) {
1777 unshift @{$self->{history}},
1778 my $txt = $self->get_text;
1779 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1781 $self->_emit (activate => $txt);
1447 $self->update; 1782 $self->update;
1783
1784 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text;
1787 }
1788 if (@{$self->{history} || []} > 0) {
1789 $self->{history_pointer}++;
1790 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1791 $self->{history_pointer} = @{$self->{history} || []} - 1;
1792 }
1793 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1794 }
1795
1796 } elsif ($sym == CFClient::SDLK_DOWN) {
1797 $self->{history_pointer}--;
1798 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1799
1800 if ($self->{history_pointer} >= 0) {
1801 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1802 } else {
1803 $self->set_text ($self->{history_saveback});
1804 }
1448 1805
1449 } else { 1806 } else {
1450 $self->SUPER::key_down ($ev); 1807 $self->SUPER::key_down ($ev);
1451 } 1808 }
1452 1809
… …
1466 1823
1467sub new { 1824sub new {
1468 my $class = shift; 1825 my $class = shift;
1469 1826
1470 $class->SUPER::new ( 1827 $class->SUPER::new (
1471 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1472 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1475 can_hover => 1, 1832 can_hover => 1,
1476 align => 0, 1833 align => 0,
1477 valign => 0, 1834 valign => 0,
1478 can_events => 1, 1835 can_events => 1,
1479 @_ 1836 @_
1480 ) 1837 )
1481} 1838}
1482 1839
1840sub activate { }
1841
1483sub button_up { 1842sub button_up {
1484 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1485 1844
1845 $self->emit ("activate")
1486 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1487 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1488 $self->emit ("activate");
1489 }
1490} 1848}
1491 1849
1492sub _draw { 1850sub _draw {
1493 my ($self) = @_; 1851 my ($self) = @_;
1494 1852
… …
1496 1854
1497 if ($GRAB == $self) { 1855 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1499 } 1857 }
1500 1858
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1861 glColor 0, 0, 0, 1;
1506 1862
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1864
1509 glDisable GL_TEXTURE_2D; 1865 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1866
1512 $self->SUPER::_draw; 1867 $self->SUPER::_draw;
1513} 1868}
1514 1869
1515############################################################################# 1870#############################################################################
… …
1526 1881
1527sub new { 1882sub new {
1528 my $class = shift; 1883 my $class = shift;
1529 1884
1530 $class->SUPER::new ( 1885 $class->SUPER::new (
1531 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1532 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1533 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1890 bg => [0, 0, 0, 0.2],
1891 active_bg => [1, 1, 1, 0.5],
1534 state => 0, 1892 state => 0,
1535 can_hover => 1, 1893 can_hover => 1,
1536 @_ 1894 @_
1537 ) 1895 )
1538} 1896}
1539 1897
1540sub size_request { 1898sub size_request {
1541 my ($self) = @_; 1899 my ($self) = @_;
1542 1900
1543 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1544} 1902}
1545 1903
1546sub button_down { 1904sub button_down {
1547 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1548 1906
1549 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1550 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1551 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1552 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1553 } 1911 }
1554} 1912}
1555 1913
1556sub _draw { 1914sub _draw {
1557 my ($self) = @_; 1915 my ($self) = @_;
1558 1916
1559 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1560 1918
1561 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1562 1920
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1564 1924
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1926
1567 glEnable GL_BLEND; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1928
1568 glEnable GL_TEXTURE_2D; 1929 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); 1930 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1931 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1932}
1578 1933
1579############################################################################# 1934#############################################################################
1580 1935
1581package CFClient::UI::Image; 1936package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1979 glTranslate 0, -$self->{w}, 0;
1625 1980
1626 ($w, $h) = ($h, $w); 1981 ($w, $h) = ($h, $w);
1627 } 1982 }
1628 1983
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1986
1634 $tex->draw_quad (0, 0, $w, $h); 1987 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1988
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1638} 1990}
1639 1991
1640############################################################################# 1992#############################################################################
1641 1993
… …
1689} 2041}
1690 2042
1691sub set_max { 2043sub set_max {
1692 my ($self, $max) = @_; 2044 my ($self, $max) = @_;
1693 2045
2046 return if $self->{max_val} == $max;
2047
1694 $self->{max_val} = $max; 2048 $self->{max_val} = $max;
2049 $self->update;
1695} 2050}
1696 2051
1697sub set_value { 2052sub set_value {
1698 my ($self, $val, $max) = @_; 2053 my ($self, $val, $max) = @_;
1699 2054
1700 $self->set_max ($max) 2055 $self->set_max ($max)
1701 if defined $max; 2056 if defined $max;
1702 2057
1703 $max = $self->{max_val}; 2058 return if $self->{val} == $val;
2059
1704 $self->{val} = $val; 2060 $self->{val} = $val;
1705
1706 $self->update; 2061 $self->update;
1707} 2062}
1708 2063
1709sub _draw { 2064sub _draw {
1710 my ($self) = @_; 2065 my ($self) = @_;
… …
1773 2128
1774sub new { 2129sub new {
1775 my ($class, %arg) = @_; 2130 my ($class, %arg) = @_;
1776 2131
1777 my $self = $class->SUPER::new ( 2132 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2133 tooltip => $arg{type},
2134 can_hover => 1,
1779 can_events => 1, 2135 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2136 %arg,
1782 ); 2137 );
1783 2138
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2139 $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); 2140 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 2148
1794 $self->{value}->set_fontsize ($fsize); 2149 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2150 $self->{max} ->set_fontsize ($fsize);
1796} 2151}
1797 2152
2153sub set_max {
2154 my ($self, $max) = @_;
2155
2156 $self->{gauge}->set_max ($max);
2157 $self->{max}->set_text ($max);
2158}
2159
1798sub set_value { 2160sub set_value {
1799 my ($self, $val, $max) = @_; 2161 my ($self, $val, $max) = @_;
1800 2162
1801 $self->set_max ($max) 2163 $self->set_max ($max)
1802 if defined $max; 2164 if defined $max;
1803 2165
1804 $self->{gauge}->set_value ($val, $max); 2166 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2167 $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} 2168}
1814 2169
1815############################################################################# 2170#############################################################################
1816 2171
1817package CFClient::UI::Slider; 2172package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
1828 2183
1829sub new { 2184sub new {
1830 my $class = shift; 2185 my $class = shift;
1831 2186
1832 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
1833 2188
1834 # TODO: 0-width page 2189 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2191 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2195 bg => [0, 0, 0, 0.2],
2196 active_bg => [1, 1, 1, 0.5],
1840 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
1841 req_w => 20, 2198 min_w => $::WIDTH / 80,
1842 req_h => 20, 2199 min_h => $::WIDTH / 80,
1843 vertical => 0, 2200 vertical => 0,
1844 can_hover => 1, 2201 can_hover => 1,
1845 inner_pad => 5, 2202 inner_pad => 0.02,
1846 @_ 2203 @_
1847 ); 2204 );
1848 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
1849 $self 2209 $self
1850} 2210}
1851 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2223sub set_value {
2224 my ($self, $value) = @_;
2225
2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2227
2228 $hi = $lo + 1 if $hi <= $lo;
2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2232 $value = $lo if $value < $lo;
2233 $value = $hi - $page if $value > $hi - $page;
2234
2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2236 if $unit;
2237
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239
2240 if ($value != $old_value) {
2241 $self->_emit (changed => $value);
2242 $self->update;
2243 }
2244}
2245
1852sub size_request { 2246sub size_request {
1853 my ($self) = @_; 2247 my ($self) = @_;
1854 2248
1855 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
1856 my $h = $self->{req_h};
1857
1858 $self->{vertical} ? ($h, $w) : ($w, $h)
1859} 2250}
1860 2251
1861sub button_down { 2252sub button_down {
1862 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
1863 2254
1864 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
1865 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
1866} 2260}
1867 2261
1868sub mouse_motion { 2262sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
1870 2264
1871 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267
2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2273 }
2274}
2275
2276sub update {
2277 my ($self) = @_;
2278
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2280 $self->set_value ($self->{range}[0]);
2281
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
1873 2284
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1875 2286
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $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 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1878 2289
1879 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $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 2292
1885 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
1886 $self->update; 2294 $self->{knob_w} = $knob_w;
1887 } 2295 });
1888}
1889 2296
1890# the inner_* stuff is for generating a padding for the slider handle, 2297 $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} 2298}
1897 2299
1898sub _draw { 2300sub _draw {
1899 my ($self) = @_; 2301 my ($self) = @_;
1900 2302
1901 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
1902 2304
1903 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
1904 2306
1905 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
1907 2309
2310 glTranslate 1, 0, 0;
1908 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2312 }
1913 2313
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2316
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; 2317 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2319
1940 # draw background 2320 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2322
1943 # draw handle 2323 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1945 2325
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
1948} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
1949 2369
1950############################################################################# 2370#############################################################################
1951 2371
1952package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
1953 2373
… …
1957 2377
1958sub new { 2378sub new {
1959 my $class = shift; 2379 my $class = shift;
1960 2380
1961 my $self = $class->SUPER::new ( 2381 my $self = $class->SUPER::new (
1962 fontsize => 1, 2382 fontsize => 1,
2383 can_events => 0,
1963 #font => default_font 2384 #font => default_font
1964 @_, 2385 @_,
1965 2386
1966 layout => (new CFClient::Layout), 2387 layout => (new CFClient::Layout 1),
1967 par => [], 2388 par => [],
1968 height => 0, 2389 height => 0,
1969 children => [ 2390 children => [
1970 (new CFClient::UI::Empty expand => 1), 2391 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2392 (new CFClient::UI::Slider vertical => 1),
1972 ], 2393 ],
1973 ); 2394 );
1974 2395
1975 $self->{children}[1]->connect (changed => sub { 2396 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2397
1979 $self 2398 $self
1980} 2399}
1981 2400
1982sub set_fontsize { 2401sub set_fontsize {
1983 my ($self, $fontsize) = @_; 2402 my ($self, $fontsize) = @_;
1984 2403
1985 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
1986 $self->reflow; 2405 $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} 2406}
2007 2407
2008sub size_allocate { 2408sub size_allocate {
2009 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2010 2410
… …
2015 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2016 2416
2017 $self->reflow; 2417 $self->reflow;
2018} 2418}
2019 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2020sub add_paragraph { 2454sub add_paragraph {
2021 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2022 2456
2023 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2024 2458 my ($w, $h) = $self->text_size ($line);
2025 my $height = $self->text_height ($text);
2026
2027 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2028 2462
2029 push @{$self->{par}}, [$height, $color, $text];
2030
2031 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2032 $self->{children}[1]->update;
2033} 2464}
2034 2465
2035sub update { 2466sub update {
2036 my ($self) = @_; 2467 my ($self) = @_;
2037 2468
… …
2039 2470
2040 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2041 2472
2042 delete $self->{texture}; 2473 delete $self->{texture};
2043 2474
2044 $ROOT->on_refresh ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2045 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2479 my $height = 0;
2047 2480
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2049 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2050 2496
2051 $self->{height} = $height; 2497 $self->{height} = $height;
2052 2498
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2054 2500
2055 delete $self->{texture}; 2501 delete $self->{texture};
2056 } 2502 }
2057 2503
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2059 glClearColor 0, 0, 0, 1; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2061 2507
2508 my $top = int $self->{children}[1]{range}[0];
2509
2510 my $y0 = $top;
2511 my $y1 = $top + $H;
2512
2513 my $y = 0;
2514
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518
2062 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2521 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 2522
2078 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2524 my $h = $par->[1];
2080 2525
2081 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2082 $layout->set_text ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2083 2530
2084 glColor @{ $par->[1] }; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2085 my ($W, $H) = $layout->size; 2532
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2087 } 2535 }
2088 2536
2089 $y += $h; 2537 $y += $h;
2090 } 2538 }
2091 2539
2092 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND; 2540 glDisable GL_BLEND;
2094 }; 2541 };
2095 }); 2542 });
2096} 2543}
2097 2544
2098sub _draw { 2545sub _draw {
2099 my ($self) = @_; 2546 my ($self) = @_;
2100 2547
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2106 }
2107 2553
2108 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2109 2555
2110} 2556}
2111 2557
… …
2159 2605
2160sub new { 2606sub new {
2161 my $class = shift; 2607 my $class = shift;
2162 2608
2163 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2164 state => 0, 2610 state => 0,
2165 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2612 @_
2168 ); 2613 );
2169 2614
2170 if ($self->{state}) {
2171 $self->{state} = 0;
2172 $self->toggle_flopper;
2173 }
2174
2175 $self 2615 $self
2176} 2616}
2177 2617
2178sub toggle_flopper { 2618sub toggle_flopper {
2179 my ($self) = @_; 2619 my ($self) = @_;
2180 2620
2181 # TODO: use animation 2621 $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} 2622}
2193 2623
2194############################################################################# 2624#############################################################################
2195 2625
2196package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2206 @_, 2636 @_,
2207 can_events => 0, 2637 can_events => 0,
2208 ) 2638 )
2209} 2639}
2210 2640
2211sub set_markup { 2641sub set_tooltip_from {
2212 my ($self, $text) = @_; 2642 my ($self, $widget) = @_;
2213 2643
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2644 my $tooltip = $widget->{tooltip};
2215 $self->{label}->set_markup ($text); 2645
2216 $self->add ($self->{label}); 2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2653 $self->add (new CFClient::UI::Label
2654 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8,
2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2660 );
2217} 2661}
2218 2662
2219sub size_request { 2663sub size_request {
2220 my ($self) = @_; 2664 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2665
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2667
2226 ($w + 4, $h + 4) 2668 ($w + 4, $h + 4)
2227} 2669}
… …
2230 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2231 2673
2232 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2233} 2675}
2234 2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2693}
2694
2235sub _draw { 2695sub _draw {
2236 my ($self) = @_; 2696 my ($self) = @_;
2237 2697
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2698 glTranslate 0.375, 0.375;
2240 2699
2241 my ($w, $h) = @$self{qw(w h)}; 2700 my ($w, $h) = @$self{qw(w h)};
2242 2701
2243 glColor 1, 0.8, 0.4; 2702 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2713 glVertex 0 , $h;
2255 glVertex $w, $h; 2714 glVertex $w, $h;
2256 glVertex $w, 0; 2715 glVertex $w, 0;
2257 glEnd; 2716 glEnd;
2258 2717
2259 glPopMatrix; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2260 2719
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2263} 2721}
2264 2722
2265############################################################################# 2723#############################################################################
2266 2724
… …
2271use CFClient::OpenGL; 2729use CFClient::OpenGL;
2272 2730
2273sub new { 2731sub new {
2274 my $class = shift; 2732 my $class = shift;
2275 2733
2276 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2277 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2278 @_, 2737 @_,
2279 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2280} 2755}
2281 2756
2282sub size_request { 2757sub size_request {
2283 (32, 8) 2758 (32, 8)
2284} 2759}
2285 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2286sub draw { 2769sub _draw {
2287 my ($self) = @_; 2770 my ($self) = @_;
2288 2771
2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2290 2784
2291 if ($tex) { 2785 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2791 }
2792}
2793
2794sub DESTROY {
2795 my ($self) = @_;
2796
2797 $self->{timer}->cancel
2798 if $self->{timer};
2799
2800 $self->SUPER::DESTROY;
2301} 2801}
2302 2802
2303############################################################################# 2803#############################################################################
2304 2804
2805package CFClient::UI::Menu;
2806
2807our @ISA = CFClient::UI::FancyFrame::;
2808
2809use CFClient::OpenGL;
2810
2811sub new {
2812 my $class = shift;
2813
2814 my $self = $class->SUPER::new (
2815 items => [],
2816 z => 100,
2817 @_,
2818 );
2819
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821
2822 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item;
2824
2825 # handle various types of items, only text for now
2826 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label
2828 can_hover => 1,
2829 can_events => 1,
2830 text => $widget;
2831 }
2832
2833 $self->{item}{$widget} = $item;
2834
2835 $self->{vbox}->add ($widget);
2836 }
2837
2838 $self
2839}
2840
2841# popup given the event (must be a mouse button down event currently)
2842sub popup {
2843 my ($self, $ev) = @_;
2844
2845 $self->_emit ("popdown");
2846
2847 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self;
2849 $self->{button} = $ev->{button};
2850
2851 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853}
2854
2855sub mouse_motion {
2856 my ($self, $ev, $x, $y) = @_;
2857
2858 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER};
2861}
2862
2863sub button_up {
2864 my ($self, $ev, $x, $y) = @_;
2865
2866 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB;
2868 $self->hide;
2869
2870 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover};
2872 }
2873}
2874
2875#############################################################################
2876
2877package CFClient::UI::Statusbox;
2878
2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2890sub reorder {
2891 my ($self) = @_;
2892 my $NOW = time;
2893
2894 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 }
2897
2898 my @widgets;
2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2905 my $count = 10 + 1;
2906 for my $item (@items) {
2907 last unless --$count;
2908
2909 push @widgets, $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2915 for ($short) {
2916 s/^\s+//;
2917 s/\s+/ /g;
2918 }
2919
2920 new CFClient::UI::Label
2921 markup => $short,
2922 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2928 can_events => 1,
2929 can_hover => 1
2930 };
2931 }
2932
2933 $self->clear;
2934 $self->SUPER::add (reverse @widgets);
2935}
2936
2937sub add {
2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2944
2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2946
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948
2949 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) {
2951 $item->{count}++;
2952 } else {
2953 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text;
2955 }
2956 $item->{id} = ++$self->{id};
2957 $item->{timeout} = $timeout;
2958 delete $item->{label};
2959 } else {
2960 $self->{item}{$group} = {
2961 id => ++$self->{id},
2962 text => $text,
2963 timeout => $timeout,
2964 tooltip => $text,
2965 fg => [0.8, 0.8, 0.8, 0.8],
2966 pri => 0,
2967 count => 1,
2968 %arg,
2969 };
2970 }
2971
2972 $self->reorder;
2973}
2974
2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2985#############################################################################
2986
2987package CFClient::UI::Inventory;
2988
2989our @ISA = CFClient::UI::ScrolledWindow::;
2990
2991sub new {
2992 my $class = shift;
2993
2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_,
2997 );
2998
2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
2305package CFClient::UI::Root; 3278package CFClient::UI::Root;
2306 3279
2307our @ISA = CFClient::UI::Container::; 3280our @ISA = CFClient::UI::Container::;
2308 3281
2309use CFClient::OpenGL; 3282use CFClient::OpenGL;
2310 3283
2311sub check_size { 3284sub new {
2312 my ($self) = @_; 3285 my $class = shift;
2313 3286
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2315} 3295}
2316 3296
2317sub size_request { 3297sub size_request {
2318 ($::WIDTH, $::HEIGHT) 3298 my ($self) = @_;
2319}
2320 3299
2321sub configure { 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
3315}
3316
3317sub size_allocate {
2322 my ($self, $x, $y, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2323 3319
2324 $self->SUPER::configure ($x, $y, $w, $h);
2325
2326 for my $child (@{$self->{children}}) { 3320 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 3322
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3323 $X = $child->{force_x} if exists $child->{force_x};
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3325
3326 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h};
3328
2331 $child->configure ($X, $Y, $W,$H); 3329 $child->configure ($X, $Y, $W, $H);
2332 } 3330 }
2333} 3331}
2334 3332
2335sub _topleft { 3333sub coord2local {
2336 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2337 3335
2338 ($x, $y) 3336 ($x, $y)
2339} 3337}
2340 3338
3339sub coord2global {
3340 my ($self, $x, $y) = @_;
3341
3342 ($x, $y)
3343}
3344
2341sub update { 3345sub update {
2342 my ($self) = @_; 3346 my ($self) = @_;
2343 3347
2344 $self->check_size; 3348 $::WANT_REFRESH++;
2345 ::refresh ();
2346} 3349}
2347 3350
2348sub add { 3351sub add {
2349 my ($self, $child) = @_; 3352 my ($self, @children) = @_;
2350 3353
2351 # integerize window positions 3354 $_->{is_toplevel} = 1
2352 $child->{x} = int $child->{x}; 3355 for @children;
2353 $child->{y} = int $child->{y};
2354 3356
2355 $self->SUPER::add ($child); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2356} 3373}
2357 3374
2358sub on_refresh { 3375sub on_refresh {
2359 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2360 3377
2361 $self->{refresh_hook}{$id} = $cb; 3378 $self->{refresh_hook}{$id} = $cb;
2362} 3379}
2363 3380
3381sub on_post_alloc {
3382 my ($self, $id, $cb) = @_;
3383
3384 $self->{post_alloc_hook}{$id} = $cb;
3385}
3386
2364sub draw { 3387sub draw {
2365 my ($self) = @_; 3388 my ($self) = @_;
2366 3389
2367 while (my $rcb = delete $self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 3391 $_->()
3392 for values %{delete $self->{refresh_hook}};
2369 } 3393 }
3394
3395 if ($self->{realloc}) {
3396 my %queue;
3397 my @queue;
3398 my $widget;
3399
3400 outer:
3401 while () {
3402 if (my $realloc = delete $self->{realloc}) {
3403 for $widget (values %$realloc) {
3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3410 }
3411
3412 while () {
3413 @queue or last outer;
3414
3415 $widget = pop @{ $queue[-1] || [] }
3416 and last;
3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3433 $widget->{req_w} = $w;
3434 $widget->{req_h} = $h;
3435
3436 $self->{size_alloc}{$widget+0} = $widget;
3437
3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3448 }
3449 }
3450
3451 while (my $size_alloc = delete $self->{size_alloc}) {
3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459
3460 $w = 0 if $w < 0;
3461 $h = 0 if $h < 0;
3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3470 $widget->{w} = $w;
3471 $widget->{h} = $h;
3472
3473 $widget->emit (size_allocate => $w, $h);
3474 }
3475 }
3476 }
3477
3478 while ($self->{post_alloc_hook}) {
3479 $_->()
3480 for values %{delete $self->{post_alloc_hook}};
3481 }
3482
2370 3483
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2374 3487
2375 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2376 glLoadIdentity; 3489 glLoadIdentity;
2377 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2378 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2379 glLoadIdentity; 3492 glLoadIdentity;
2380 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
2381 $self->_draw; 3501 $self->_draw;
2382} 3502}
2383 3503
2384############################################################################# 3504#############################################################################
2385 3505
2386package CFClient::UI; 3506package CFClient::UI;
2387 3507
2388$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390 3510
23911 35111
2392 3512

Diff Legend

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