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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

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

Diff Legend

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