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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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