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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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