ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.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->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
45} 76}
46 77
47sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
49} 81}
50 82
51sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
52 my ($ev) = @_; 84 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 93 check_tooltip;
62 } 94 }
63 95
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 97
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
67} 100}
68 101
69sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
70 my ($ev) = @_; 103 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
72 105
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 107
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 109
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
78 112
79 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 115 $grab->update if $grab;
82 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 133
100 check_tooltip; 134 check_tooltip;
101 } 135 }
102 136
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
104} 139}
105 140
106# convert position array to integers 141# convert position array to integers
107sub harmonize { 142sub harmonize {
108 my ($vals) = @_; 143 my ($vals) = @_;
… …
114 $rem += $_ - $i; 149 $rem += $_ - $i;
115 $_ = $i; 150 $_ = $i;
116 } 151 }
117} 152}
118 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += 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
119############################################################################# 195#############################################################################
120 196
121package CFClient::UI::Base; 197package CFClient::UI::Base;
122 198
123use strict; 199use strict;
… …
126 202
127sub new { 203sub new {
128 my $class = shift; 204 my $class = shift;
129 205
130 my $self = bless { 206 my $self = bless {
131 x => 0, 207 x => "center",
132 y => 0, 208 y => "center",
133 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
134 can_events => 1, 212 can_events => 1,
135 @_ 213 @_
136 }, $class; 214 }, $class;
137 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
138 for (keys %$self) { 218 for (keys %$self) {
139 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
141 } 221 }
142 } 222 }
143 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
144 $self 236 $self
145} 237}
146 238
147sub destroy { 239sub destroy {
148 my ($self) = @_; 240 my ($self) = @_;
… …
157 return if $self->{parent}; 249 return if $self->{parent};
158 250
159 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
160} 252}
161 253
254sub set_visible {
255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
162sub hide { 307sub hide {
163 my ($self) = @_; 308 my ($self) = @_;
164 309
165 return unless $self->{parent}; 310 $self->set_invisible;
166 311
167 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
168} 314}
169 315
170sub move { 316sub move_abs {
171 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
172 318
173 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
176 322
177 $self->update; 323 $self->update;
178} 324}
179 325
180sub set_size { 326sub set_size {
181 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
182 328
183 $self->{user_w} = $w; 329 $self->{force_w} = $w;
184 $self->{user_h} = $h; 330 $self->{force_h} = $h;
185 331
186 $self->check_size; 332 $self->realloc;
187} 333}
188 334
189sub size_request { 335sub size_request {
190 require Carp; 336 require Carp;
191 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
193 339
194sub configure { 340sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
196 342
197 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
200 348
201 # use alignment to adjust x, y 349 # use alignment to adjust x, y
202 350
203 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 353 }
208 354
209 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 356 $self->{x} = $x;
211 $self->{y} = $y; 357 $self->{y} = $y;
212 $self->update; 358 $self->update;
213 } 359 }
214 360
215 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
216 $self->{w} = $w; 364 $self->{alloc_w} = $w;
217 $self->{h} = $h; 365 $self->{alloc_h} = $h;
218 366
219 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 368 }
222} 369}
223 370
224sub size_allocate { 371sub size_allocate {
225 # nothing to be done 372 # nothing to be done
226} 373}
227 374
375sub children {
376}
377
228sub set_max_size { 378sub set_max_size {
229 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
230 380
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 383}
234 384
235# return top left coordinates 385sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
238 387
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
240} 399}
241 400
242# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
243sub coord2local { 402sub coord2local {
244 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
245 404
246 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 406}
249 407
250# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
251sub coord2global { 409sub coord2global {
252 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
253 411
254 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 413}
257 414
258sub focus_in { 415sub focus_in {
259 my ($self) = @_; 416 my ($self) = @_;
260 417
261 return if $FOCUS == $self; 418 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
263 420
264 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
265 422
266 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
267 424
268 $focus->update if $focus; 425 $focus->update if $focus;
269 $FOCUS->update; 426 $FOCUS->update;
270} 427}
271 428
… …
274 431
275 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
276 433
277 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
278 435
279 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
280 437
281 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
282} 442}
283 443
284sub mouse_motion { } 444sub mouse_motion { }
285sub button_up { } 445sub button_up { }
286sub key_down { } 446sub key_down { }
287sub key_up { } 447sub key_up { }
288 448
289sub button_down { 449sub button_down {
290 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
291 451
292 $self->focus_in; 452 $self->focus_in;
293} 453}
294 454
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
299sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
300 528
301sub draw { 529sub draw {
302 my ($self) = @_; 530 my ($self) = @_;
303 531
304 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # 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);
305 543
306 glPushMatrix; 544 glPushMatrix;
307 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
308 $self->_draw; 546 $self->_draw;
309 glPopMatrix; 547 glPopMatrix;
… …
321 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
322 glEnd; 560 glEnd;
323 glDisable GL_BLEND; 561 glDisable GL_BLEND;
324 } 562 }
325 563
326 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
327 glPushMatrix; 565 glPushMatrix;
328 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
329 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
330 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
331 glVertex 0 , 0; 569 glVertex 0 , 0;
332 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
333 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
334 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
335 glEnd; 573 glEnd;
336 glPopMatrix; 574 glPopMatrix;
337 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;
338 } 576 }
339} 577}
340 578
341sub _draw { 579sub _draw {
342 my ($self) = @_; 580 my ($self) = @_;
343 581
344 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
345} 583}
346 584
347sub find_widget {
348 my ($self, $x, $y) = @_;
349
350 return () unless $self->{can_events};
351
352 return $self
353 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
354 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
355
356 ()
357}
358
359sub set_parent {
360 my ($self, $parent) = @_;
361
362 Scalar::Util::weaken ($self->{parent} = $parent);
363}
364
365sub check_size {
366 my ($self) = @_;
367
368 $self->{parent}
369 or return 1;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389}
390
391sub update {
392 my ($self) = @_;
393
394 $self->{parent}->update
395 if $self->{parent};
396}
397
398sub connect {
399 my ($self, $signal, $cb) = @_;
400
401 push @{ $self->{signal_cb}{$signal} }, $cb;
402}
403
404sub emit {
405 my ($self, $signal, @args) = @_;
406
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
408 $cb->($self, @args);
409 }
410}
411
412sub DESTROY { 585sub DESTROY {
413 my ($self) = @_; 586 my ($self) = @_;
414 587
588 delete $WIDGET{$self+0};
415 #$self->deactivate; 589 #$self->deactivate;
416} 590}
417 591
418############################################################################# 592#############################################################################
419 593
… …
428 my $class = shift; 602 my $class = shift;
429 603
430 # range [value, low, high, page] 604 # range [value, low, high, page]
431 605
432 $class->SUPER::new ( 606 $class->SUPER::new (
433 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
434 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
435 @_ 609 @_
436 ) 610 )
437} 611}
438 612
439sub _draw { 613sub _draw {
440 my ($self) = @_; 614 my ($self) = @_;
441 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
442 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
443 622
444 glEnable GL_BLEND; 623 glEnable GL_BLEND;
445 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
447 626
448 glBegin GL_QUADS; 627 glBegin GL_QUADS;
449 glVertex 0 , 0; 628 glVertex 0 , 0;
450 glVertex 0 , $h; 629 glVertex 0 , $h;
451 glVertex $w, $h; 630 glVertex $w, $h;
452 glVertex $w, 0; 631 glVertex $w, 0;
453 glEnd; 632 glEnd;
454 633
455 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
456} 636}
457 637
458############################################################################# 638#############################################################################
459 639
460package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
465 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
467} 647}
468 648
469sub size_request { 649sub size_request {
470 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
471} 653}
472 654
473sub draw { } 655sub draw { }
474 656
475############################################################################# 657#############################################################################
… …
481sub new { 663sub new {
482 my ($class, %arg) = @_; 664 my ($class, %arg) = @_;
483 665
484 my $children = delete $arg{children} || []; 666 my $children = delete $arg{children} || [];
485 667
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 668 my $self = $class->SUPER::new (
669 children => [],
670 can_events => 0,
671 %arg,
672 );
487 $self->add ($_) for @$children; 673 $self->add ($_) for @$children;
488 674
489 $self 675 $self
490} 676}
491 677
492sub add { 678sub add {
493 my ($self, $child) = @_; 679 my ($self, @widgets) = @_;
494 680
495 $child->set_parent ($self); 681 $_->set_parent ($self)
682 for @widgets;
496 683
497 use sort 'stable'; 684 use sort 'stable';
498 685
499 $self->{children} = [ 686 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 688 @{$self->{children}}, @widgets
502 ]; 689 ];
503 690
504 $child->check_size; 691 $self->realloc;
692}
693
694sub children {
695 @{ $_[0]{children} }
505} 696}
506 697
507sub remove { 698sub remove {
508 my ($self, $child) = @_; 699 my ($self, $child) = @_;
509 700
510 delete $child->{parent}; 701 delete $child->{parent};
702 $child->hide;
511 703
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 705
514 $self->check_size; 706 $self->realloc;
515 $self->update;
516} 707}
517 708
518sub clear { 709sub clear {
519 my ($self) = @_; 710 my ($self) = @_;
520 711
521 delete $_->{parent} 712 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 713 $self->{children} = [];
714
715 for (@$children) {
716 delete $_->{parent};
717 $_->hide;
718 }
719
720 $self->realloc;
525} 721}
526 722
527sub find_widget { 723sub find_widget {
528 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
529 725
… …
604} 800}
605 801
606sub update { 802sub update {
607 my ($self) = @_; 803 my ($self) = @_;
608 804
609 # we want to do this delayed... 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 806 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 807}
623 808
624sub size_allocate { 809sub size_allocate {
625 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
626 811
627 $self->child->configure (0, 0, $w, $h); 812 $self->SUPER::size_allocate ($w, $h);
813 $self->update;
814}
628 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
629 $self->render_chld; 836 $self->_render;
837 };
630} 838}
631 839
632sub _draw { 840sub _draw {
633 my ($self) = @_; 841 my ($self) = @_;
634 842
635 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
636 844
637 my $tex = $self->{texture} 845 my $tex = $self->{texture}
638 or return; 846 or return;
639 847
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
643 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;
644 851
645 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 853
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
649} 855}
650 856
651############################################################################# 857#############################################################################
652 858
653package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
654 860
655our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
656
657sub new { die }
658
659sub size_request {
660 my ($self) = @_;
661
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
664
665 @$self{qw(child_w child_h)}
666}
667
668sub _draw {
669 my ($self) = @_;
670
671 $self->{children}[1]->draw;
672}
673
674
675#############################################################################
676
677package CFClient::UI::Frame;
678
679our @ISA = CFClient::UI::Bin::;
680
681use CFClient::OpenGL;
682 862
683sub new { 863sub new {
684 my $class = shift; 864 my $class = shift;
685 865
686 my $self = $class->SUPER::new ( 866 $class->SUPER::new (
687 bg => [1, 1, 1, 1], 867 scroll_x => 0,
688 border_bg => [1, 1, 1, 1], 868 scroll_y => 1,
689 border => 0.8,
690 @_ 869 @_,
691 ); 870 )
692
693 $self
694} 871}
695 872
696sub _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 {
697 my ($self) = @_; 885 my ($self, $w, $h) = @_;
698 886
699 my ($w, $h) = ($self->{w}, $self->{h}); 887 my $child = $self->child;
700 888
701 glEnable GL_BLEND; 889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
703 glEnable GL_TEXTURE_2D;
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 891
706# glBegin GL_QUADS; 892 $self->child->configure (0, 0, $w, $h);
707# glColor 0, 0, 0, 0; 893 $self->update;
708# glVertex 0 , 0; 894}
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713 895
896sub set_offset {
897 my ($self, $x, $y) = @_;
714 898
715 $self->child->draw; 899 $self->{view_x} = int $x;
716 glDisable GL_BLEND; 900 $self->{view_y} = int $y;
717 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;
718} 942}
719 943
720############################################################################# 944#############################################################################
721 945
722package CFClient::UI::FancyFrame; 946package CFClient::UI::ScrolledWindow;
723 947
724our @ISA = CFClient::UI::Bin::; 948our @ISA = CFClient::UI::HBox::;
725
726use CFClient::OpenGL;
727
728my @tex =
729 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
730 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
731 949
732sub new { 950sub new {
733 my $class = shift; 951 my $class = shift;
734 952
735 # 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};
736 1058
737 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
740 border => 0.8, 1062 border => 0.6,
741 can_events => 1, 1063 can_events => 1,
742 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
743 ); 1067 );
744 1068
745 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
746 align => 0, 1070 align => 0,
747 valign => 1, 1071 valign => 1,
748 text => $self->{title}, 1072 text => $title,
749 fontsize => 1; 1073 fontsize => $self->{border}
1074 if defined $title;
750 1075
751 $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};
752} 1084}
753 1085
754sub border { 1086sub border {
755 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
756} 1088}
757 1089
758sub size_request { 1090sub size_request {
759 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
760 1095
761 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
762 1097
763 ( 1098 (
764 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
767} 1102}
768 1103
769sub size_allocate { 1104sub size_allocate {
770 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
771 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
772 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
774 1117
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
776 if $self->{title};
777
778 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
779} 1119}
780 1120
781sub button_down { 1121sub button_down {
782 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
783 1123
1124 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 1125 my $border = $self->border;
785 1126
786 if ($x < $self->{w} && $x >= $self->{w} - $border 1127 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 1128 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 1129
1130 if ($lr & $td) {
1131 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 1133 my ($bw, $bh) = ($self->{w}, $self->{h});
791 1134
1135 my $mx = $x < $border;
1136 my $my = $y < $border;
1137
792 $self->{motion} = sub { 1138 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
794 1140
795 ($x, $y) = ($ev->{x}, $ev->{y}); 1141 my $dx = $ev->{x} - $ox;
1142 my $dy = $ev->{y} - $oy;
796 1143
797 $self->{user_w} = $bw + $x - $ox; 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
799 $self->check_size; 1146
1147 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
800 }; 1149 };
801 1150
802 } elsif ($x >= 0 && $x < $self->{w} 1151 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
807 1154
808 $self->{motion} = sub { 1155 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
810 1157
811 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
812 1159
813 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
814 $self->update;
815 }; 1161 };
816 } 1162 }
817} 1163}
818 1164
819sub button_up { 1165sub button_up {
… …
829} 1175}
830 1176
831sub _draw { 1177sub _draw {
832 my ($self) = @_; 1178 my ($self) = @_;
833 1179
1180 my $child = $self->{children}[0];
1181
834 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
836 1184
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 1187
842 my $border = $self->border; 1188 my $border = $self->border;
843 1189
844 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
849 1195
850 my $bg = $tex[0]; 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1197 glColor @{ $self->{bg} };
851 1198
852 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1200 # solve this better(?)
854 my $rep_y = $ch / $bg->{h}; 1201 $bg->{s} = $cw / $bg->{w};
855 1202 $bg->{t} = $ch / $bg->{h};
856 glColor @{ $self->{bg} };
857
858 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1204 }
862 1205
863 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 1207
866 $self->{title}->draw if $self->{title};
867 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
868} 1214}
869 1215
870############################################################################# 1216#############################################################################
871 1217
872package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
880sub new { 1226sub new {
881 my $class = shift; 1227 my $class = shift;
882 1228
883 $class->SUPER::new ( 1229 $class->SUPER::new (
884 col_expand => [], 1230 col_expand => [],
885 @_ 1231 @_,
886 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
887} 1237}
888 1238
889sub add { 1239sub add {
890 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
891 1241
892 $child->set_parent ($self); 1242 $child->set_parent ($self);
893 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
894 1244
895 $child->check_size; 1245 $self->realloc;
896} 1246}
897 1247
898# 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?
899sub clear { 1249sub clear {
900 my ($self) = @_; 1250 my ($self) = @_;
901 1251
1252 my @children = $self->children;
902 delete $self->{children}; 1253 delete $self->{children};
903 $self->update; 1254
1255 for (@children) {
1256 delete $_->{parent};
1257 $_->hide;
1258 }
1259
1260 $self->realloc;
904} 1261}
905 1262
906sub get_wh { 1263sub get_wh {
907 my ($self) = @_; 1264 my ($self) = @_;
908 1265
… …
939sub size_allocate { 1296sub size_allocate {
940 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
941 1298
942 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
943 1300
944 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
945 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
946 1303
947 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
948 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
949 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
950 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1004 } 1361 }
1005} 1362}
1006 1363
1007############################################################################# 1364#############################################################################
1008 1365
1009package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1010
1011# TODO: wrap into common Box base class
1012 1367
1013our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1014 1369
1015sub size_request { 1370sub size_request {
1016 my ($self) = @_; 1371 my ($self) = @_;
1017 1372
1018 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1019 1374 ? (
1020 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1021 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1022 (List::Util::max map $_->[1], @alloc), 1377 )
1023 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1024} 1382}
1025 1383
1026sub size_allocate { 1384sub size_allocate {
1027 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1028 1386
1029 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1030
1031 my $children = $self->{children}; 1388 my $children = $self->{children};
1032 1389
1033 my @h = map $_->{req_w}, @$children; 1390 my @req;
1034 1391
1035 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1036 1393 @req = ($space / (@$children || 1)) x @$children;
1037 if ($req_h > $h) {
1038 # ah well, not enough space
1039 $_ *= $h / $req_h for @h;
1040 } else { 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 {
1041 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1042 $exp ||= 1;
1043 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1044 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1045 my $child = $children->[$_];
1046
1047 my $alloc_h = $h[$_];
1048 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1049 $h[$_] = $alloc_h;
1050 } 1408 }
1051 } 1409 }
1052 1410
1053 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1054 1412
1055 my $y = 0; 1413 my $pos = 0;
1056 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1057 my $child = $children->[$_];
1058 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1059 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1060 1417
1061 $y += $h; 1418 $pos += $alloc;
1062 } 1419 }
1063 1420
1064 1 1421 1
1065} 1422}
1066 1423
1067############################################################################# 1424#############################################################################
1068 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
1069package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1070 1442
1071# TODO: wrap into common Box base class
1072
1073our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1074 1444
1075sub size_request { 1445sub new {
1076 my ($self) = @_; 1446 my $class = shift;
1077 1447
1078 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1079 1449 vertical => 1,
1080 ( 1450 @_,
1081 (List::Util::max map $_->[0], @alloc),
1082 (List::Util::sum map $_->[1], @alloc),
1083 ) 1451 )
1084} 1452}
1085 1453
1086sub size_allocate {
1087 my ($self, $w, $h) = @_;
1088
1089 my $children = $self->{children};
1090
1091 my @h = map $_->{req_h}, @$children;
1092
1093 my $req_h = List::Util::sum @h;
1094
1095 if ($req_h > $h) {
1096 # ah well, not enough space
1097 $_ *= $h / $req_h for @h;
1098 } else {
1099 my $exp = List::Util::sum map $_->{expand}, @$children;
1100 $exp ||= 1;
1101
1102 for (0 .. $#$children) {
1103 my $child = $children->[$_];
1104
1105 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1106 }
1107 }
1108
1109 CFClient::UI::harmonize \@h;
1110
1111 my $y = 0;
1112 for (0 .. $#$children) {
1113 my $child = $children->[$_];
1114 my $h = $h[$_];
1115 $child->configure (0, $y, $w, $h);
1116
1117 $y += $h;
1118 }
1119
1120 1
1121}
1122
1123############################################################################# 1454#############################################################################
1124 1455
1125package CFClient::UI::Label; 1456package CFClient::UI::Label;
1126 1457
1127our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1128 1459
1129use CFClient::OpenGL; 1460use CFClient::OpenGL;
1130 1461
1131sub new { 1462sub new {
1132 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1133 1464
1134 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1136 #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),
1137 fontsize => 1, 1475 fontsize => 1,
1138 text => "",
1139 align => -1, 1476 align => -1,
1140 valign => -1, 1477 valign => -1,
1141 padding => 2, 1478 padding_x => 2,
1142 layout => new CFClient::Layout, 1479 padding_y => 2,
1143 can_events => 0, 1480 can_events => 0,
1144 %arg 1481 %arg
1145 ); 1482 );
1146 1483
1147 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1485 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1486 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1487 $self->{template} = $layout;
1151 } 1488 }
1152 1489
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1490 if (exists $self->{markup}) {
1154 $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 }
1155 1495
1156 $self 1496 $self
1157} 1497}
1158 1498
1159sub escape { 1499sub escape($) {
1160 local $_ = $_[1]; 1500 local $_ = $_[0];
1161 1501
1162 s/&/&amp;/g; 1502 s/&/&amp;/g;
1163 s/>/&gt;/g; 1503 s/>/&gt;/g;
1164 s/</&lt;/g; 1504 s/</&lt;/g;
1165 1505
1166 $_[1] 1506 $_
1507}
1508
1509sub update {
1510 my ($self) = @_;
1511
1512 delete $self->{texture};
1513 $self->SUPER::update;
1167} 1514}
1168 1515
1169sub set_text { 1516sub set_text {
1170 my ($self, $text) = @_; 1517 my ($self, $text) = @_;
1171 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;
1172 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1173 1524
1174 delete $self->{texture}; 1525 $self->realloc;
1175 $self->check_size;
1176 $self->update; 1526 $self->update;
1177} 1527}
1178 1528
1179sub set_markup { 1529sub set_markup {
1180 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1181 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;
1182 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1183 1539
1184 delete $self->{texture}; 1540 $self->realloc;
1185 $self->check_size;
1186 $self->update; 1541 $self->update;
1187} 1542}
1188 1543
1189sub size_request { 1544sub size_request {
1190 my ($self) = @_; 1545 my ($self) = @_;
1191 1546
1192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $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});
1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195 1552
1196 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1197 1554
1198 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1203 1560
1204 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1205 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1206 } 1563 }
1207 1564
1208 ( 1565 ($w, $h)
1209 $w + $self->{padding} * 2,
1210 $h + $self->{padding} * 2,
1211 )
1212} 1566}
1213 1567
1214sub size_allocate { 1568sub size_allocate {
1215 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1216 1570
1571 delete $self->{ox};
1572
1217 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1218} 1575}
1219 1576
1220sub set_fontsize { 1577sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1222 1579
1223 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1581 delete $self->{texture};
1225 $self->check_size; 1582
1226 $self->update; 1583 $self->realloc;
1227} 1584}
1228 1585
1229sub _draw { 1586sub _draw {
1230 my ($self) = @_; 1587 my ($self) = @_;
1231 1588
1589 $self->SUPER::_draw; # draw background, if applicable
1590
1232 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $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});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598
1236 new_from_layout CFClient::Texture $self->{layout} 1599 new_from_layout CFClient::Texture $self->{layout}
1237 }; 1600 };
1238 1601
1239 glEnable GL_BLEND; 1602 unless (exists $self->{ox}) {
1240 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
1241 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1614
1615 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1616 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1259 1621
1260 glDisable GL_TEXTURE_2D; 1622 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1623}
1263 1624
1264############################################################################# 1625#############################################################################
1265 1626
1266package CFClient::UI::EntryBase; 1627package CFClient::UI::EntryBase;
… …
1271 1632
1272sub new { 1633sub new {
1273 my $class = shift; 1634 my $class = shift;
1274 1635
1275 $class->SUPER::new ( 1636 $class->SUPER::new (
1276 fg => [1, 1, 1], 1637 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1638 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1639 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1280 can_hover => 1, 1641 can_hover => 1,
1281 can_focus => 1, 1642 can_focus => 1,
1282 valign => 0, 1643 valign => 0,
1283 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1284 @_ 1646 @_
1285 ) 1647 )
1286} 1648}
1287 1649
1288sub _set_text { 1650sub _set_text {
… …
1298 $self->{text} = $text; 1660 $self->{text} = $text;
1299 1661
1300 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1301 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1302 1664
1303 $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;
1304} 1675}
1305 1676
1306sub get_text { 1677sub get_text {
1307 $_[0]{text} 1678 $_[0]{text}
1308} 1679}
… …
1311 my ($self) = @_; 1682 my ($self) = @_;
1312 1683
1313 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1314 1685
1315 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text {
1325 my ($self, $text) = @_;
1326
1327 $self->{cursor} = length $text;
1328 $self->_set_text ($text);
1329 $self->update;
1330} 1687}
1331 1688
1332sub key_down { 1689sub key_down {
1333 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1334 1691
… …
1336 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1338 1695
1339 my $text = $self->get_text; 1696 my $text = $self->get_text;
1340 1697
1341 if ($sym == 8) { 1698 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1711 $self->_emit ('escape');
1355 } elsif ($uni) { 1712 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1714 }
1358 1715
1359 $self->_set_text ($text); 1716 $self->_set_text ($text);
1360 $self->update; 1717
1718 $self->realloc;
1361} 1719}
1362 1720
1363sub focus_in { 1721sub focus_in {
1364 my ($self) = @_; 1722 my ($self) = @_;
1365 1723
… …
1441 my ($self, $ev) = @_; 1799 my ($self, $ev) = @_;
1442 1800
1443 my $sym = $ev->{sym}; 1801 my $sym = $ev->{sym};
1444 1802
1445 if ($sym == 13) { 1803 if ($sym == 13) {
1804 unshift @{$self->{history}},
1805 my $txt = $self->get_text;
1806 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1808 $self->_emit (activate => $txt);
1447 $self->update; 1809 $self->update;
1810
1811 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text;
1814 }
1815 if (@{$self->{history} || []} > 0) {
1816 $self->{history_pointer}++;
1817 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1818 $self->{history_pointer} = @{$self->{history} || []} - 1;
1819 }
1820 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1821 }
1822
1823 } elsif ($sym == CFClient::SDLK_DOWN) {
1824 $self->{history_pointer}--;
1825 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826
1827 if ($self->{history_pointer} >= 0) {
1828 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1829 } else {
1830 $self->set_text ($self->{history_saveback});
1831 }
1448 1832
1449 } else { 1833 } else {
1450 $self->SUPER::key_down ($ev); 1834 $self->SUPER::key_down ($ev);
1451 } 1835 }
1452 1836
… …
1466 1850
1467sub new { 1851sub new {
1468 my $class = shift; 1852 my $class = shift;
1469 1853
1470 $class->SUPER::new ( 1854 $class->SUPER::new (
1471 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1472 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1475 can_hover => 1, 1859 can_hover => 1,
1476 align => 0, 1860 align => 0,
1477 valign => 0, 1861 valign => 0,
1478 can_events => 1, 1862 can_events => 1,
1479 @_ 1863 @_
1480 ) 1864 )
1481} 1865}
1482 1866
1867sub activate { }
1868
1483sub button_up { 1869sub button_up {
1484 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1485 1871
1872 $self->emit ("activate")
1486 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1487 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1488 $self->emit ("activate");
1489 }
1490} 1875}
1491 1876
1492sub _draw { 1877sub _draw {
1493 my ($self) = @_; 1878 my ($self) = @_;
1494 1879
… …
1496 1881
1497 if ($GRAB == $self) { 1882 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1883 $self->{fg} = $self->{active_fg};
1499 } 1884 }
1500 1885
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1886 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1888 glColor 0, 0, 0, 1;
1506 1889
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1891
1509 glDisable GL_TEXTURE_2D; 1892 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1893
1512 $self->SUPER::_draw; 1894 $self->SUPER::_draw;
1513} 1895}
1514 1896
1515############################################################################# 1897#############################################################################
… …
1526 1908
1527sub new { 1909sub new {
1528 my $class = shift; 1910 my $class = shift;
1529 1911
1530 $class->SUPER::new ( 1912 $class->SUPER::new (
1531 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1532 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1533 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],
1534 state => 0, 1919 state => 0,
1535 can_hover => 1, 1920 can_hover => 1,
1536 @_ 1921 @_
1537 ) 1922 )
1538} 1923}
1539 1924
1540sub size_request { 1925sub size_request {
1541 my ($self) = @_; 1926 my ($self) = @_;
1542 1927
1543 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1544} 1929}
1545 1930
1546sub button_down { 1931sub button_down {
1547 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1548 1933
1549 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1550 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1551 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1552 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1553 } 1938 }
1554} 1939}
1555 1940
1556sub _draw { 1941sub _draw {
1557 my ($self) = @_; 1942 my ($self) = @_;
1558 1943
1559 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1560 1945
1561 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1562 1947
1563 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;
1564 1951
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1953
1567 glEnable GL_BLEND; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1955
1568 glEnable GL_TEXTURE_2D; 1956 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1957 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1959}
1578 1960
1579############################################################################# 1961#############################################################################
1580 1962
1581package CFClient::UI::Image; 1963package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 2006 glTranslate 0, -$self->{w}, 0;
1625 2007
1626 ($w, $h) = ($h, $w); 2008 ($w, $h) = ($h, $w);
1627 } 2009 }
1628 2010
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 2013
1634 $tex->draw_quad (0, 0, $w, $h); 2014 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 2015
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 2016 glDisable GL_TEXTURE_2D;
1638} 2017}
1639 2018
1640############################################################################# 2019#############################################################################
1641 2020
… …
1689} 2068}
1690 2069
1691sub set_max { 2070sub set_max {
1692 my ($self, $max) = @_; 2071 my ($self, $max) = @_;
1693 2072
2073 return if $self->{max_val} == $max;
2074
1694 $self->{max_val} = $max; 2075 $self->{max_val} = $max;
2076 $self->update;
1695} 2077}
1696 2078
1697sub set_value { 2079sub set_value {
1698 my ($self, $val, $max) = @_; 2080 my ($self, $val, $max) = @_;
1699 2081
1700 $self->set_max ($max) 2082 $self->set_max ($max)
1701 if defined $max; 2083 if defined $max;
1702 2084
1703 $max = $self->{max_val}; 2085 return if $self->{val} == $val;
2086
1704 $self->{val} = $val; 2087 $self->{val} = $val;
1705
1706 $self->update; 2088 $self->update;
1707} 2089}
1708 2090
1709sub _draw { 2091sub _draw {
1710 my ($self) = @_; 2092 my ($self) = @_;
… …
1773 2155
1774sub new { 2156sub new {
1775 my ($class, %arg) = @_; 2157 my ($class, %arg) = @_;
1776 2158
1777 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2160 tooltip => $arg{type},
2161 can_hover => 1,
1779 can_events => 1, 2162 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2163 %arg,
1782 ); 2164 );
1783 2165
1784 $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");
1785 $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);
… …
1793 2175
1794 $self->{value}->set_fontsize ($fsize); 2176 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2177 $self->{max} ->set_fontsize ($fsize);
1796} 2178}
1797 2179
2180sub set_max {
2181 my ($self, $max) = @_;
2182
2183 $self->{gauge}->set_max ($max);
2184 $self->{max}->set_text ($max);
2185}
2186
1798sub set_value { 2187sub set_value {
1799 my ($self, $val, $max) = @_; 2188 my ($self, $val, $max) = @_;
1800 2189
1801 $self->set_max ($max) 2190 $self->set_max ($max)
1802 if defined $max; 2191 if defined $max;
1803 2192
1804 $self->{gauge}->set_value ($val, $max); 2193 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2194 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2195}
1814 2196
1815############################################################################# 2197#############################################################################
1816 2198
1817package CFClient::UI::Slider; 2199package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
1828 2210
1829sub new { 2211sub new {
1830 my $class = shift; 2212 my $class = shift;
1831 2213
1832 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
1833 2215
1834 # TODO: 0-width page 2216 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2218 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
1839 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],
1840 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
1841 req_w => 20, 2225 min_w => $::WIDTH / 80,
1842 req_h => 20, 2226 min_h => $::WIDTH / 80,
1843 vertical => 0, 2227 vertical => 0,
1844 can_hover => 1, 2228 can_hover => 1,
1845 inner_pad => 5, 2229 inner_pad => 0.02,
1846 @_ 2230 @_
1847 ); 2231 );
1848 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
1849 $self 2236 $self
1850} 2237}
1851 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
1852sub size_request { 2273sub size_request {
1853 my ($self) = @_; 2274 my ($self) = @_;
1854 2275
1855 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
1856 my $h = $self->{req_h};
1857
1858 $self->{vertical} ? ($h, $w) : ($w, $h)
1859} 2277}
1860 2278
1861sub button_down { 2279sub button_down {
1862 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
1863 2281
1864 $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
1865 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
1866} 2287}
1867 2288
1868sub mouse_motion { 2289sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
1870 2291
1871 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
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
1873 2311
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1875 2313
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1877 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1878 2316
1879 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
1881 $x = $lo if $x < $lo;
1882 $x = $hi - $page if $x > $hi - $page;
1883 $self->{range}[0] = $x;
1884 2319
1885 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
1886 $self->update; 2321 $self->{knob_w} = $knob_w;
1887 } 2322 });
1888}
1889 2323
1890# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
1891# so that the handle doesn't leave the texture. This calculation isn't 100%
1892# correct propably, but it does the job for now
1893sub _calc_inner_pad_px {
1894 my ($self, $w) = @_;
1895 ($w / 100) * $self->{inner_pad} # % to pixels
1896} 2325}
1897 2326
1898sub _draw { 2327sub _draw {
1899 my ($self) = @_; 2328 my ($self) = @_;
1900 2329
1901 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
1902 2331
1903 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
1904 2333
1905 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
1907 2336
2337 glTranslate 1, 0, 0;
1908 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2339 }
1913 2340
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2343
1917 my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919 $hi = $value + 1 if $lo == $hi;
1920
1921 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924 $page = int $page * $inner_w / ($hi - $lo);
1925 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927 $w -= $page;
1928 $page &= ~1;
1929 glTranslate $page * 0.5, 0, 0;
1930 $page ||= 2;
1931
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2346
1940 # draw background 2347 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2349
1943 # draw handle 2350 # draw handle
1944 $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);
1945 2352
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
1948} 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 (@_) }
1949 2396
1950############################################################################# 2397#############################################################################
1951 2398
1952package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
1953 2400
… …
1957 2404
1958sub new { 2405sub new {
1959 my $class = shift; 2406 my $class = shift;
1960 2407
1961 my $self = $class->SUPER::new ( 2408 my $self = $class->SUPER::new (
1962 fontsize => 1, 2409 fontsize => 1,
2410 can_events => 0,
1963 #font => default_font 2411 #font => default_font
1964 @_, 2412 @_,
1965 2413
1966 layout => (new CFClient::Layout), 2414 layout => (new CFClient::Layout 1),
1967 par => [], 2415 par => [],
1968 height => 0, 2416 height => 0,
1969 children => [ 2417 children => [
1970 (new CFClient::UI::Empty expand => 1), 2418 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2419 (new CFClient::UI::Slider vertical => 1),
1972 ], 2420 ],
1973 ); 2421 );
1974 2422
1975 $self->{children}[1]->connect (changed => sub { 2423 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2424
1979 $self 2425 $self
1980} 2426}
1981 2427
1982sub set_fontsize { 2428sub set_fontsize {
1983 my ($self, $fontsize) = @_; 2429 my ($self, $fontsize) = @_;
1984 2430
1985 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
1986 $self->reflow; 2432 $self->reflow;
1987}
1988
1989sub text_height {
1990 my ($self, $text) = @_;
1991
1992 my $layout = $self->{layout};
1993
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w});
1996 $layout->set_text ($text);
1997
1998 ($layout->size)[1]
1999}
2000
2001sub reflow {
2002 my ($self) = @_;
2003
2004 $self->{need_reflow}++;
2005 $self->update;
2006} 2433}
2007 2434
2008sub size_allocate { 2435sub size_allocate {
2009 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2010 2437
… …
2015 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2016 2443
2017 $self->reflow; 2444 $self->reflow;
2018} 2445}
2019 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
2020sub add_paragraph { 2481sub add_paragraph {
2021 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2022 2483
2023 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2024 2485 my ($w, $h) = $self->text_size ($line);
2025 my $height = $self->text_height ($text);
2026
2027 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2028 2489
2029 push @{$self->{par}}, [$height, $color, $text];
2030
2031 $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]);
2032 $self->{children}[1]->update;
2033} 2491}
2034 2492
2035sub update { 2493sub update {
2036 my ($self) = @_; 2494 my ($self) = @_;
2037 2495
… …
2039 2497
2040 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2041 2499
2042 delete $self->{texture}; 2500 delete $self->{texture};
2043 2501
2044 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2045 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2506 my $height = 0;
2047 2507
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2049 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 }
2050 2523
2051 $self->{height} = $height; 2524 $self->{height} = $height;
2052 2525
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2054 2527
2055 delete $self->{texture}; 2528 delete $self->{texture};
2056 } 2529 }
2057 2530
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2059 glClearColor 0, 0, 0, 1; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2061 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
2062 glEnable GL_BLEND; 2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066
2067 my $top = int $self->{children}[1]{range}[0];
2068
2069 my $y0 = $top;
2070 my $y1 = $top + $self->{h};
2071
2072 my $y = 0;
2073
2074 my $layout = $self->{layout};
2075
2076 $layout->set_font ($self->{font}) if $self->{font};
2077 2549
2078 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2551 my $h = $par->[1];
2080 2552
2081 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]);
2082 $layout->set_text ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2083 2557
2084 glColor @{ $par->[1] }; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2085 my ($W, $H) = $layout->size; 2559
2086 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;
2087 } 2562 }
2088 2563
2089 $y += $h; 2564 $y += $h;
2090 } 2565 }
2091 2566
2092 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND; 2567 glDisable GL_BLEND;
2094 }; 2568 };
2095 }); 2569 });
2096} 2570}
2097 2571
2098sub _draw { 2572sub _draw {
2099 my ($self) = @_; 2573 my ($self) = @_;
2100 2574
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2103 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;
2104 $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});
2105 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2106 }
2107 2580
2108 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2109 2582
2110} 2583}
2111 2584
… …
2159 2632
2160sub new { 2633sub new {
2161 my $class = shift; 2634 my $class = shift;
2162 2635
2163 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2164 state => 0, 2637 state => 0,
2165 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2639 @_
2168 ); 2640 );
2169 2641
2170 if ($self->{state}) {
2171 $self->{state} = 0;
2172 $self->toggle_flopper;
2173 }
2174
2175 $self 2642 $self
2176} 2643}
2177 2644
2178sub toggle_flopper { 2645sub toggle_flopper {
2179 my ($self) = @_; 2646 my ($self) = @_;
2180 2647
2181 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2182 if ($self->{state} = !$self->{state}) {
2183 $CFClient::UI::ROOT->add ($self->{other});
2184 $self->{other}->move ($self->coord2global (0, $self->{h}));
2185 $self->emit ("open");
2186 } else {
2187 $CFClient::UI::ROOT->remove ($self->{other});
2188 $self->emit ("close");
2189 }
2190
2191 $self->emit (changed => $self->{state});
2192} 2649}
2193 2650
2194############################################################################# 2651#############################################################################
2195 2652
2196package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2206 @_, 2663 @_,
2207 can_events => 0, 2664 can_events => 0,
2208 ) 2665 )
2209} 2666}
2210 2667
2211sub set_markup { 2668sub set_tooltip_from {
2212 my ($self, $text) = @_; 2669 my ($self, $widget) = @_;
2213 2670
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2671 my $tooltip = $widget->{tooltip};
2215 $self->{label}->set_markup ($text); 2672
2216 $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 );
2217} 2688}
2218 2689
2219sub size_request { 2690sub size_request {
2220 my ($self) = @_; 2691 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2692
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2694
2226 ($w + 4, $h + 4) 2695 ($w + 4, $h + 4)
2227} 2696}
… …
2230 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2231 2700
2232 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2233} 2702}
2234 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
2235sub _draw { 2722sub _draw {
2236 my ($self) = @_; 2723 my ($self) = @_;
2237 2724
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2725 glTranslate 0.375, 0.375;
2240 2726
2241 my ($w, $h) = @$self{qw(w h)}; 2727 my ($w, $h) = @$self{qw(w h)};
2242 2728
2243 glColor 1, 0.8, 0.4; 2729 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2740 glVertex 0 , $h;
2255 glVertex $w, $h; 2741 glVertex $w, $h;
2256 glVertex $w, 0; 2742 glVertex $w, 0;
2257 glEnd; 2743 glEnd;
2258 2744
2259 glPopMatrix; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2260 2746
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2263} 2748}
2264 2749
2265############################################################################# 2750#############################################################################
2266 2751
… …
2271use CFClient::OpenGL; 2756use CFClient::OpenGL;
2272 2757
2273sub new { 2758sub new {
2274 my $class = shift; 2759 my $class = shift;
2275 2760
2276 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2277 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2278 @_, 2764 @_,
2279 ) 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
2280} 2782}
2281 2783
2282sub size_request { 2784sub size_request {
2283 (32, 8) 2785 (32, 8)
2284} 2786}
2285 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2286sub draw { 2796sub _draw {
2287 my ($self) = @_; 2797 my ($self) = @_;
2288 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
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2290 2811
2291 if ($tex) { 2812 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2818 }
2819}
2820
2821sub DESTROY {
2822 my ($self) = @_;
2823
2824 $self->{timer}->cancel
2825 if $self->{timer};
2826
2827 $self->SUPER::DESTROY;
2301} 2828}
2302 2829
2303############################################################################# 2830#############################################################################
2304 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
2305package CFClient::UI::Root; 3310package CFClient::UI::Root;
2306 3311
2307our @ISA = CFClient::UI::Container::; 3312our @ISA = CFClient::UI::Container::;
2308 3313
2309use CFClient::OpenGL; 3314use CFClient::OpenGL;
2310 3315
2311sub check_size { 3316sub new {
2312 my ($self) = @_; 3317 my $class = shift;
2313 3318
2314 $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
2315} 3327}
2316 3328
2317sub size_request { 3329sub size_request {
2318 ($::WIDTH, $::HEIGHT) 3330 my ($self) = @_;
2319}
2320 3331
2321sub 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 {
2322 my ($self, $x, $y, $w, $h) = @_; 3350 my ($self, $w, $h) = @_;
2323 3351
2324 $self->SUPER::configure ($x, $y, $w, $h);
2325
2326 for my $child (@{$self->{children}}) { 3352 for my $child ($self->children) {
2327 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)};
2328 3354
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3355 $X = $child->{force_x} if exists $child->{force_x};
2330 $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
2331 $child->configure ($X, $Y, $W,$H); 3361 $child->configure ($X, $Y, $W, $H);
2332 } 3362 }
2333} 3363}
2334 3364
2335sub _topleft { 3365sub coord2local {
2336 my ($self, $x, $y) = @_; 3366 my ($self, $x, $y) = @_;
2337 3367
2338 ($x, $y) 3368 ($x, $y)
2339} 3369}
2340 3370
3371sub coord2global {
3372 my ($self, $x, $y) = @_;
3373
3374 ($x, $y)
3375}
3376
2341sub update { 3377sub update {
2342 my ($self) = @_; 3378 my ($self) = @_;
2343 3379
2344 $self->check_size; 3380 $::WANT_REFRESH++;
2345 ::refresh ();
2346} 3381}
2347 3382
2348sub add { 3383sub add {
2349 my ($self, $child) = @_; 3384 my ($self, @children) = @_;
2350 3385
2351 # integerize window positions 3386 $_->{is_toplevel} = 1
2352 $child->{x} = int $child->{x}; 3387 for @children;
2353 $child->{y} = int $child->{y};
2354 3388
2355 $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 }
2356} 3405}
2357 3406
2358sub on_refresh { 3407sub on_refresh {
2359 my ($self, $id, $cb) = @_; 3408 my ($self, $id, $cb) = @_;
2360 3409
2361 $self->{refresh_hook}{$id} = $cb; 3410 $self->{refresh_hook}{$id} = $cb;
2362} 3411}
2363 3412
3413sub on_post_alloc {
3414 my ($self, $id, $cb) = @_;
3415
3416 $self->{post_alloc_hook}{$id} = $cb;
3417}
3418
2364sub draw { 3419sub draw {
2365 my ($self) = @_; 3420 my ($self) = @_;
2366 3421
2367 while (my $rcb = delete $self->{refresh_hook}) { 3422 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 3423 $_->()
3424 for values %{delete $self->{refresh_hook}};
2369 } 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
2370 3515
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
2374 3519
2375 glMatrixMode GL_PROJECTION; 3520 glMatrixMode GL_PROJECTION;
2376 glLoadIdentity; 3521 glLoadIdentity;
2377 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2378 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
2379 glLoadIdentity; 3524 glLoadIdentity;
2380 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
2381 $self->_draw; 3533 $self->_draw;
2382} 3534}
2383 3535
2384############################################################################# 3536#############################################################################
2385 3537
2386package CFClient::UI; 3538package CFClient::UI;
2387 3539
2388$ROOT = new CFClient::UI::Root; 3540$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 3541$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390 3542
23911 35431
2392 3544

Diff Legend

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