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.165 by root, Mon Apr 24 08:22:22 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->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
241sub set_max_size { 383sub set_max_size {
242 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
243 385
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 388}
247 389
248# return top left coordinates 390sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
251 392
252 $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 }
253} 404}
254 405
255# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
256sub coord2local { 407sub coord2local {
257 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
258 409
259 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 411}
262 412
263# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
264sub coord2global { 414sub coord2global {
265 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
266 416
267 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 418}
270 419
271sub focus_in { 420sub focus_in {
272 my ($self) = @_; 421 my ($self) = @_;
273 422
274 return if $FOCUS == $self; 423 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
276 425
277 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
278 427
279 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
280 429
281 $focus->update if $focus; 430 $focus->update if $focus;
282 $FOCUS->update; 431 $FOCUS->update;
283} 432}
284 433
… …
287 436
288 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
289 438
290 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
291 440
292 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
293 442
294 $focus->update if $focus; #? 443 $focus->update if $focus; #?
295}
296 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
297sub mouse_motion { } 449sub mouse_motion { 0 }
298sub button_up { } 450sub button_up { 0 }
299sub key_down { } 451sub key_down { 0 }
300sub key_up { } 452sub key_up { 0 }
301 453
302sub button_down { 454sub button_down {
303 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
304 456
305 $self->focus_in; 457 $self->focus_in;
306}
307 458
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
312sub 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
313 535
314sub draw { 536sub draw {
315 my ($self) = @_; 537 my ($self) = @_;
316 538
317 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);
318 550
319 glPushMatrix; 551 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw; 553 $self->_draw;
322 glPopMatrix; 554 glPopMatrix;
… …
334 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
335 glEnd; 567 glEnd;
336 glDisable GL_BLEND; 568 glDisable GL_BLEND;
337 } 569 }
338 570
339 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
340 glPushMatrix; 572 glPushMatrix;
341 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 576 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
348 glEnd; 580 glEnd;
349 glPopMatrix; 581 glPopMatrix;
350 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;
351 } 583 }
352} 584}
353 585
354sub _draw { 586sub _draw {
355 my ($self) = @_; 587 my ($self) = @_;
356 588
357 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
358} 590}
359 591
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 592sub DESTROY {
424 my ($self) = @_; 593 my ($self) = @_;
425 594
595 delete $WIDGET{$self+0};
426 #$self->deactivate; 596 #$self->deactivate;
427} 597}
428 598
429############################################################################# 599#############################################################################
430 600
… …
439 my $class = shift; 609 my $class = shift;
440 610
441 # range [value, low, high, page] 611 # range [value, low, high, page]
442 612
443 $class->SUPER::new ( 613 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
446 @_ 616 @_
447 ) 617 )
448} 618}
449 619
450sub _draw { 620sub _draw {
451 my ($self) = @_; 621 my ($self) = @_;
452 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
454 629
455 glEnable GL_BLEND; 630 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
458 633
459 glBegin GL_QUADS; 634 glBegin GL_QUADS;
460 glVertex 0 , 0; 635 glVertex 0 , 0;
461 glVertex 0 , $h; 636 glVertex 0 , $h;
462 glVertex $w, $h; 637 glVertex $w, $h;
463 glVertex $w, 0; 638 glVertex $w, 0;
464 glEnd; 639 glEnd;
465 640
466 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
467} 643}
468 644
469############################################################################# 645#############################################################################
470 646
471package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
478} 654}
479 655
480sub size_request { 656sub size_request {
481 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
482} 660}
483 661
484sub draw { } 662sub draw { }
485 663
486############################################################################# 664#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
491 669
492sub new { 670sub new {
493 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
494 672
495 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
496 674
497 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
498 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
499 683
500 $self 684 $self
501} 685}
502 686
503sub add { 687sub add {
504 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
505 689
506 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
507 692
508 use sort 'stable'; 693 use sort 'stable';
509 694
510 $self->{children} = [ 695 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
513 ]; 698 ];
514 699
515 $child->check_size; 700 $self->realloc;
701}
702
703sub children {
704 @{ $_[0]{children} }
516} 705}
517 706
518sub remove { 707sub remove {
519 my ($self, $child) = @_; 708 my ($self, $child) = @_;
520 709
521 delete $child->{parent}; 710 delete $child->{parent};
522 $child->hide; 711 $child->hide;
523 712
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 714
526 $self->check_size; 715 $self->realloc;
527 $self->update;
528} 716}
529 717
530sub clear { 718sub clear {
531 my ($self) = @_; 719 my ($self) = @_;
532 720
… …
535 723
536 for (@$children) { 724 for (@$children) {
537 delete $_->{parent}; 725 delete $_->{parent};
538 $_->hide; 726 $_->hide;
539 } 727 }
728
729 $self->realloc;
540} 730}
541 731
542sub find_widget { 732sub find_widget {
543 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
544 734
545 $x -= $self->{x}; 735 $x -= $self->{x};
546 $y -= $self->{y}; 736 $y -= $self->{y};
547 737
548 my $res; 738 my $res;
549 739
550 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
552 and return $res; 742 and return $res;
553 } 743 }
554 744
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
619} 809}
620 810
621sub update { 811sub update {
622 my ($self) = @_; 812 my ($self) = @_;
623 813
624 # we want to do this delayed... 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 815 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 816}
638 817
639sub size_allocate { 818sub size_allocate {
640 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
641 820
642 $self->child->configure (0, 0, $w, $h); 821 $self->SUPER::size_allocate ($w, $h);
822 $self->update;
823}
643 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
644 $self->render_chld; 845 $self->_render;
846 };
645} 847}
646 848
647sub _draw { 849sub _draw {
648 my ($self) = @_; 850 my ($self) = @_;
649 851
650 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
651 853
652 my $tex = $self->{texture} 854 my $tex = $self->{texture}
653 or return; 855 or return;
654 856
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
658 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;
659 860
660 $tex->draw_quad (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 862
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
664} 864}
665 865
666############################################################################# 866#############################################################################
667 867
668package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
669 869
670our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 871
698sub new { 872sub new {
699 my $class = shift; 873 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 975 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 976 slider => $slider,
704 border => 0.8, 977 %arg,
705 @_
706 ); 978 );
707 979
980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
982
708 $self 983 $self
709} 984}
710 985
711sub _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 {
712 my ($self) = @_; 1003 my ($self, $w, $h) = @_;
713 1004
714 my ($w, $h) = ($self->{w}, $self->{h}); 1005 $self->SUPER::size_allocate ($w, $h);
715 1006
716 glEnable GL_BLEND; 1007 my $child = $self->{vp}->child;
717 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]);
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 1009}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
734 1013
735############################################################################# 1014#############################################################################
736 1015
737package CFClient::UI::FancyFrame; 1016package CFClient::UI::Frame;
738 1017
739our @ISA = CFClient::UI::Bin::; 1018our @ISA = CFClient::UI::Bin::;
740 1019
741use CFClient::OpenGL; 1020use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1021
747sub new { 1022sub new {
748 my $class = shift; 1023 my $class = shift;
749 1024
750 # 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};
751 1074
752 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1078 border => 0.6,
756 @_ 1079 can_events => 1,
1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
757 ); 1083 );
758 1084
759 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
760 align => 0, 1086 align => 0,
761 valign => 1, 1087 valign => 1,
762 text => $self->{title}, 1088 text => $title,
763 fontsize => 1; 1089 fontsize => $self->{border}
1090 if defined $title;
764 1091
765 $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};
766} 1100}
767 1101
768sub border { 1102sub border {
769 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
770} 1104}
771 1105
772sub size_request { 1106sub size_request {
773 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
774 1111
775 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
776 1113
777 ( 1114 (
778 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
781} 1118}
782 1119
783sub size_allocate { 1120sub size_allocate {
784 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
785 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
786 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
787 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
788 1133
789 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
790 if $self->{title};
791
792 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
793} 1135}
794 1136
795sub button_down { 1137sub button_down {
796 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
797 1139
1140 my ($w, $h) = @$self{qw(w h)};
798 my $border = $self->border; 1141 my $border = $self->border;
799 1142
800 if ($x < $self->{w} && $x >= $self->{w} - $border 1143 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801 && $y < $self->{h} && $y >= $self->{h} - $border) { 1144 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802 1145
1146 if ($lr & $td) {
1147 my ($wx, $wy) = ($self->{x}, $self->{y});
803 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1148 my ($ox, $oy) = ($ev->{x}, $ev->{y});
804 my ($bw, $bh) = ($self->{w}, $self->{h}); 1149 my ($bw, $bh) = ($self->{w}, $self->{h});
805 1150
1151 my $mx = $x < $border;
1152 my $my = $y < $border;
1153
806 $self->{motion} = sub { 1154 $self->{motion} = sub {
807 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
808 1156
809 ($x, $y) = ($ev->{x}, $ev->{y}); 1157 my $dx = $ev->{x} - $ox;
1158 my $dy = $ev->{y} - $oy;
810 1159
811 $self->{user_w} = $bw + $x - $ox; 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
812 $self->{user_h} = $bh + $y - $oy; 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
813 $self->check_size; 1162
1163 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
814 }; 1165 };
815 1166
816 } elsif ($x >= 0 && $x < $self->{w} 1167 } elsif ($lr ^ $td) {
817 && $y >= 0 && $y < $border) {
818
819 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
820 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
821 1170
822 $self->{motion} = sub { 1171 $self->{motion} = sub {
823 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
824 1173
825 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
826 1175
827 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
828 $self->update;
829 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
830 } 1182 1
831} 1183}
832 1184
833sub button_up { 1185sub button_up {
834 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
835 1187
836 delete $self->{motion}; 1188 !!delete $self->{motion}
837} 1189}
838 1190
839sub mouse_motion { 1191sub mouse_motion {
840 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
841 1193
842 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
843} 1197}
844 1198
845sub _draw { 1199sub _draw {
846 my ($self) = @_; 1200 my ($self) = @_;
847 1201
1202 my $child = $self->{children}[0];
1203
848 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
849 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
850 1206
851 glEnable GL_BLEND;
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
855 1209
856 my $border = $self->border; 1210 my $border = $self->border;
857 1211
858 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
859 $tex[1]->draw_quad (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
860 $tex[3]->draw_quad (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
861 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
862 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
863 1217
864 my $bg = $tex[0]; 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} };
865 1220
866 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
867 my $rep_x = $cw / $bg->{w}; 1222 # solve this better(?)
868 my $rep_y = $ch / $bg->{h}; 1223 $bg->{s} = $cw / $bg->{w};
869 1224 $bg->{t} = $ch / $bg->{h};
870 glColor @{ $self->{bg} };
871
872 $bg->{s} = $rep_x;
873 $bg->{t} = $rep_y;
874 $bg->{wrap_mode} = 1;
875 $bg->draw_quad ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1226 }
876 1227
877 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
878 glDisable GL_BLEND;
879 1229
880 $self->{title}->draw if $self->{title};
881 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
882} 1236}
883 1237
884############################################################################# 1238#############################################################################
885 1239
886package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
894sub new { 1248sub new {
895 my $class = shift; 1249 my $class = shift;
896 1250
897 $class->SUPER::new ( 1251 $class->SUPER::new (
898 col_expand => [], 1252 col_expand => [],
899 @_ 1253 @_,
900 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
901} 1259}
902 1260
903sub add { 1261sub add {
904 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
905 1263
906 $child->set_parent ($self); 1264 $child->set_parent ($self);
907 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
908 1266
909 $child->check_size; 1267 $self->realloc;
910} 1268}
911 1269
912# 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?
913sub clear { 1271sub clear {
914 my ($self) = @_; 1272 my ($self) = @_;
915 1273
916 my $children = delete $self->{children}; 1274 my @children = $self->children;
1275 delete $self->{children};
917 1276
918 for (grep $_, map @$_, grep $_, @$children) { 1277 for (@children) {
919 delete $_->{parent}; 1278 delete $_->{parent};
920 $_->hide; 1279 $_->hide;
921 } 1280 }
922 1281
923 $self->update; 1282 $self->realloc;
924} 1283}
925 1284
926sub get_wh { 1285sub get_wh {
927 my ($self) = @_; 1286 my ($self) = @_;
928 1287
… …
959sub size_allocate { 1318sub size_allocate {
960 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
961 1320
962 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
963 1322
964 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
965 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
966 1325
967 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
968 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
969 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
970 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1024 } 1383 }
1025} 1384}
1026 1385
1027############################################################################# 1386#############################################################################
1028 1387
1029package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1030
1031# TODO: wrap into common Box base class
1032 1389
1033our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1034 1391
1035sub size_request { 1392sub size_request {
1036 my ($self) = @_; 1393 my ($self) = @_;
1037 1394
1038 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1039 1396 ? (
1040 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1041 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1042 (List::Util::max map $_->[1], @alloc), 1399 )
1043 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1044} 1404}
1045 1405
1046sub size_allocate { 1406sub size_allocate {
1047 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1048 1408
1049 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1050
1051 my $children = $self->{children}; 1410 my $children = $self->{children};
1052 1411
1053 my @h = map $_->{req_w}, @$children; 1412 my @req;
1054 1413
1055 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1056 1415 @req = ($space / (@$children || 1)) x @$children;
1057 if ($req_h > $h) {
1058 # ah well, not enough space
1059 $_ *= $h / $req_h for @h;
1060 } 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 {
1061 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1062 $exp ||= 1;
1063 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1064 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1065 my $child = $children->[$_];
1066
1067 my $alloc_h = $h[$_];
1068 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1069 $h[$_] = $alloc_h;
1070 } 1430 }
1071 } 1431 }
1072 1432
1073 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1074 1434
1075 my $y = 0; 1435 my $pos = 0;
1076 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1077 my $child = $children->[$_];
1078 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1079 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1080 1439
1081 $y += $h; 1440 $pos += $alloc;
1082 } 1441 }
1083 1442
1084 1 1443 1
1085} 1444}
1086 1445
1087############################################################################# 1446#############################################################################
1088 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
1089package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1090 1464
1091# TODO: wrap into common Box base class
1092
1093our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1094 1466
1095sub size_request { 1467sub new {
1096 my ($self) = @_; 1468 my $class = shift;
1097 1469
1098 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1099 1471 vertical => 1,
1100 ( 1472 @_,
1101 (List::Util::max map $_->[0], @alloc),
1102 (List::Util::sum map $_->[1], @alloc),
1103 ) 1473 )
1104} 1474}
1105 1475
1106sub size_allocate {
1107 my ($self, $w, $h) = @_;
1108
1109 my $children = $self->{children};
1110
1111 my @h = map $_->{req_h}, @$children;
1112
1113 my $req_h = List::Util::sum @h;
1114
1115 if ($req_h > $h) {
1116 # ah well, not enough space
1117 $_ *= $h / $req_h for @h;
1118 } else {
1119 my $exp = List::Util::sum map $_->{expand}, @$children;
1120 $exp ||= 1;
1121
1122 for (0 .. $#$children) {
1123 my $child = $children->[$_];
1124
1125 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1126 }
1127 }
1128
1129 CFClient::UI::harmonize \@h;
1130
1131 my $y = 0;
1132 for (0 .. $#$children) {
1133 my $child = $children->[$_];
1134 my $h = $h[$_];
1135 $child->configure (0, $y, $w, $h);
1136
1137 $y += $h;
1138 }
1139
1140 1
1141}
1142
1143############################################################################# 1476#############################################################################
1144 1477
1145package CFClient::UI::Label; 1478package CFClient::UI::Label;
1146 1479
1147our @ISA = CFClient::UI::Base::; 1480our @ISA = CFClient::UI::DrawBG::;
1148 1481
1149use CFClient::OpenGL; 1482use CFClient::OpenGL;
1150 1483
1151sub new { 1484sub new {
1152 my ($class, %arg) = @_; 1485 my ($class, %arg) = @_;
1153 1486
1154 my $self = $class->SUPER::new ( 1487 my $self = $class->SUPER::new (
1155 fg => [1, 1, 1], 1488 fg => [1, 1, 1],
1489 #bg => none
1490 #active_bg => none
1156 #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),
1157 fontsize => 1, 1497 fontsize => 1,
1158 text => "",
1159 align => -1, 1498 align => -1,
1160 valign => -1, 1499 valign => -1,
1161 padding => 2, 1500 padding_x => 2,
1162 layout => new CFClient::Layout, 1501 padding_y => 2,
1163 can_events => 0, 1502 can_events => 0,
1164 %arg 1503 %arg
1165 ); 1504 );
1166 1505
1167 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1168 my $layout = new CFClient::Layout; 1507 my $layout = new CFClient::Layout;
1169 $layout->set_text (delete $self->{template}); 1508 $layout->set_text (delete $self->{template});
1170 $self->{template} = $layout; 1509 $self->{template} = $layout;
1171 } 1510 }
1172 1511
1173 $self->set_text (delete $self->{text}) if exists $self->{text}; 1512 if (exists $self->{markup}) {
1174 $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 }
1175 1517
1176 $self 1518 $self
1177} 1519}
1178 1520
1179sub escape { 1521sub escape($) {
1180 local $_ = $_[1]; 1522 local $_ = $_[0];
1181 1523
1182 s/&/&amp;/g; 1524 s/&/&amp;/g;
1183 s/>/&gt;/g; 1525 s/>/&gt;/g;
1184 s/</&lt;/g; 1526 s/</&lt;/g;
1185 1527
1186 $_[1] 1528 $_
1529}
1530
1531sub update {
1532 my ($self) = @_;
1533
1534 delete $self->{texture};
1535 $self->SUPER::update;
1187} 1536}
1188 1537
1189sub set_text { 1538sub set_text {
1190 my ($self, $text) = @_; 1539 my ($self, $text) = @_;
1191 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;
1192 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1193 1546
1194 delete $self->{texture}; 1547 $self->realloc;
1195 $self->check_size;
1196 $self->update; 1548 $self->update;
1197} 1549}
1198 1550
1199sub set_markup { 1551sub set_markup {
1200 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1201 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;
1202 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1203 1561
1204 delete $self->{texture}; 1562 $self->realloc;
1205 $self->check_size;
1206 $self->update; 1563 $self->update;
1207} 1564}
1208 1565
1209sub size_request { 1566sub size_request {
1210 my ($self) = @_; 1567 my ($self) = @_;
1211 1568
1212 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1213 $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});
1214 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1215 1574
1216 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1217 1576
1218 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
… …
1223 1582
1224 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1225 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1226 } 1585 }
1227 1586
1228 ( 1587 ($w, $h)
1229 $w + $self->{padding} * 2,
1230 $h + $self->{padding} * 2,
1231 )
1232} 1588}
1233 1589
1234sub size_allocate { 1590sub size_allocate {
1235 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1236 1592
1593 delete $self->{ox};
1594
1237 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1238} 1597}
1239 1598
1240sub set_fontsize { 1599sub set_fontsize {
1241 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1242 1601
1243 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1244 delete $self->{texture}; 1603 delete $self->{texture};
1245 $self->check_size; 1604
1246 $self->update; 1605 $self->realloc;
1247} 1606}
1248 1607
1249sub _draw { 1608sub _draw {
1250 my ($self) = @_; 1609 my ($self) = @_;
1251 1610
1611 $self->SUPER::_draw; # draw background, if applicable
1612
1252 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}});
1253 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1254 $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});
1255 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620
1256 new_from_layout CFClient::Texture $self->{layout} 1621 new_from_layout CFClient::Texture $self->{layout}
1257 }; 1622 };
1258 1623
1259 glEnable GL_BLEND; 1624 unless (exists $self->{ox}) {
1260 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
1261 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1262 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1263 1636
1637 if ($tex->{format} == GL_ALPHA) {
1264 glColor @{$self->{fg}}; 1638 glColor @{$self->{fg}};
1265
1266 $self->{ox} = int (
1267 $self->{align} < 0 ? $self->{padding}
1268 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1269 : ($self->{w} - $tex->{w}) * 0.5
1270 );
1271
1272 $self->{oy} = int (
1273 $self->{valign} < 0 ? $self->{padding}
1274 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1275 : ($self->{h} - $tex->{h}) * 0.5
1276 );
1277
1278 $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 }
1279 1643
1280 glDisable GL_TEXTURE_2D; 1644 glDisable GL_TEXTURE_2D;
1281 glDisable GL_BLEND;
1282} 1645}
1283 1646
1284############################################################################# 1647#############################################################################
1285 1648
1286package CFClient::UI::EntryBase; 1649package CFClient::UI::EntryBase;
… …
1299 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1300 can_hover => 1, 1663 can_hover => 1,
1301 can_focus => 1, 1664 can_focus => 1,
1302 valign => 0, 1665 valign => 0,
1303 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1304 @_ 1668 @_
1305 ) 1669 )
1306} 1670}
1307 1671
1308sub _set_text { 1672sub _set_text {
… …
1318 $self->{text} = $text; 1682 $self->{text} = $text;
1319 1683
1320 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1321 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1322 1686
1323 $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;
1324} 1697}
1325 1698
1326sub get_text { 1699sub get_text {
1327 $_[0]{text} 1700 $_[0]{text}
1328} 1701}
… …
1331 my ($self) = @_; 1704 my ($self) = @_;
1332 1705
1333 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1334 1707
1335 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1342}
1343
1344sub set_text {
1345 my ($self, $text) = @_;
1346
1347 $self->{cursor} = length $text;
1348 $self->_set_text ($text);
1349 $self->update;
1350} 1709}
1351 1710
1352sub key_down { 1711sub key_down {
1353 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1354 1713
… …
1356 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1357 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1358 1717
1359 my $text = $self->get_text; 1718 my $text = $self->get_text;
1360 1719
1361 if ($sym == 8) { 1720 if ($uni == 8) {
1362 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1363 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1364 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1365 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1366 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1367 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1368 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1369 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1370 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1371 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1372 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1373 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1374 $self->emit ('escape'); 1733 $self->_emit ('escape');
1375 } elsif ($uni) { 1734 } elsif ($uni) {
1376 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1377 } 1738 }
1378 1739
1379 $self->_set_text ($text); 1740 $self->_set_text ($text);
1380 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1381} 1745}
1382 1746
1383sub focus_in { 1747sub focus_in {
1384 my ($self) = @_; 1748 my ($self) = @_;
1385 1749
… …
1400 utf8::encode $text; 1764 utf8::encode $text;
1401 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1402 1766
1403 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1404 $self->update; 1768 $self->update;
1769
1770 1
1405} 1771}
1406 1772
1407sub mouse_motion { 1773sub mouse_motion {
1408 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1409# 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
1410} 1778}
1411 1779
1412sub _draw { 1780sub _draw {
1413 my ($self) = @_; 1781 my ($self) = @_;
1414 1782
… …
1461 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1462 1830
1463 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1464 1832
1465 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} = '';
1466 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1467 $self->update; 1839 $self->update;
1468 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
1469 } else { 1863 } else {
1470 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1471 } 1867 1
1472
1473} 1868}
1474 1869
1475############################################################################# 1870#############################################################################
1476 1871
1477package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1486 1881
1487sub new { 1882sub new {
1488 my $class = shift; 1883 my $class = shift;
1489 1884
1490 $class->SUPER::new ( 1885 $class->SUPER::new (
1491 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1492 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1493 bg => [1, 1, 1, 0.2],
1494 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1495 can_hover => 1, 1890 can_hover => 1,
1496 align => 0, 1891 align => 0,
1497 valign => 0, 1892 valign => 0,
1498 can_events => 1, 1893 can_events => 1,
1499 @_ 1894 @_
1500 ) 1895 )
1501} 1896}
1502 1897
1898sub activate { }
1899
1503sub button_up { 1900sub button_up {
1504 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1505 1902
1903 $self->emit ("activate")
1506 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1507 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1508 $self->emit ("activate"); 1906
1509 } 1907 1
1510} 1908}
1511 1909
1512sub _draw { 1910sub _draw {
1513 my ($self) = @_; 1911 my ($self) = @_;
1514 1912
… …
1516 1914
1517 if ($GRAB == $self) { 1915 if ($GRAB == $self) {
1518 $self->{fg} = $self->{active_fg}; 1916 $self->{fg} = $self->{active_fg};
1519 } 1917 }
1520 1918
1521 glEnable GL_BLEND;
1522 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1523 glEnable GL_TEXTURE_2D; 1919 glEnable GL_TEXTURE_2D;
1524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1525 glColor 0, 0, 0, 1; 1921 glColor 0, 0, 0, 1;
1526 1922
1527 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1528 1924
1529 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1530 glDisable GL_BLEND;
1531 1926
1532 $self->SUPER::_draw; 1927 $self->SUPER::_draw;
1533} 1928}
1534 1929
1535############################################################################# 1930#############################################################################
… …
1546 1941
1547sub new { 1942sub new {
1548 my $class = shift; 1943 my $class = shift;
1549 1944
1550 $class->SUPER::new ( 1945 $class->SUPER::new (
1551 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1552 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1553 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],
1554 state => 0, 1952 state => 0,
1555 can_hover => 1, 1953 can_hover => 1,
1556 @_ 1954 @_
1557 ) 1955 )
1558} 1956}
1559 1957
1560sub size_request { 1958sub size_request {
1561 my ($self) = @_; 1959 my ($self) = @_;
1562 1960
1563 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1564} 1962}
1565 1963
1566sub button_down { 1964sub button_down {
1567 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1568 1966
1569 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1570 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1571 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1572 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1573 } 1975 1
1574} 1976}
1575 1977
1576sub _draw { 1978sub _draw {
1577 my ($self) = @_; 1979 my ($self) = @_;
1578 1980
1579 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1580 1982
1581 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1582 1984
1583 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;
1584 1988
1585 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1586 1990
1587 glEnable GL_BLEND; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1992
1588 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590
1591 my $tex = $self->{state} ? $tex[1] : $tex[0];
1592
1593 $tex->draw_quad (0, 0, $s, $s); 1994 $tex->draw_quad_alpha (0, 0, $s, $s);
1594
1595 glDisable GL_TEXTURE_2D; 1995 glDisable GL_TEXTURE_2D;
1596 glDisable GL_BLEND;
1597} 1996}
1598 1997
1599############################################################################# 1998#############################################################################
1600 1999
1601package CFClient::UI::Image; 2000package CFClient::UI::Image;
… …
1644 glTranslate 0, -$self->{w}, 0; 2043 glTranslate 0, -$self->{w}, 0;
1645 2044
1646 ($w, $h) = ($h, $w); 2045 ($w, $h) = ($h, $w);
1647 } 2046 }
1648 2047
1649 glEnable GL_BLEND;
1650 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651 glEnable GL_TEXTURE_2D; 2048 glEnable GL_TEXTURE_2D;
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653 2050
1654 $tex->draw_quad (0, 0, $w, $h); 2051 $tex->draw_quad_alpha (0, 0, $w, $h);
1655 2052
1656 glDisable GL_BLEND;
1657 glDisable GL_TEXTURE_2D; 2053 glDisable GL_TEXTURE_2D;
1658} 2054}
1659 2055
1660############################################################################# 2056#############################################################################
1661 2057
… …
1709} 2105}
1710 2106
1711sub set_max { 2107sub set_max {
1712 my ($self, $max) = @_; 2108 my ($self, $max) = @_;
1713 2109
2110 return if $self->{max_val} == $max;
2111
1714 $self->{max_val} = $max; 2112 $self->{max_val} = $max;
2113 $self->update;
1715} 2114}
1716 2115
1717sub set_value { 2116sub set_value {
1718 my ($self, $val, $max) = @_; 2117 my ($self, $val, $max) = @_;
1719 2118
1720 $self->set_max ($max) 2119 $self->set_max ($max)
1721 if defined $max; 2120 if defined $max;
1722 2121
1723 $max = $self->{max_val}; 2122 return if $self->{val} == $val;
2123
1724 $self->{val} = $val; 2124 $self->{val} = $val;
1725
1726 $self->update; 2125 $self->update;
1727} 2126}
1728 2127
1729sub _draw { 2128sub _draw {
1730 my ($self) = @_; 2129 my ($self) = @_;
… …
1793 2192
1794sub new { 2193sub new {
1795 my ($class, %arg) = @_; 2194 my ($class, %arg) = @_;
1796 2195
1797 my $self = $class->SUPER::new ( 2196 my $self = $class->SUPER::new (
1798 tooltip => $arg{type}, 2197 tooltip => $arg{type},
1799 can_hover => 1, 2198 can_hover => 1,
2199 can_events => 1,
1800 %arg, 2200 %arg,
1801 ); 2201 );
1802 2202
1803 $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");
1804 $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);
… …
1812 2212
1813 $self->{value}->set_fontsize ($fsize); 2213 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize); 2214 $self->{max} ->set_fontsize ($fsize);
1815} 2215}
1816 2216
2217sub set_max {
2218 my ($self, $max) = @_;
2219
2220 $self->{gauge}->set_max ($max);
2221 $self->{max}->set_text ($max);
2222}
2223
1817sub set_value { 2224sub set_value {
1818 my ($self, $val, $max) = @_; 2225 my ($self, $val, $max) = @_;
1819 2226
1820 $self->set_max ($max) 2227 $self->set_max ($max)
1821 if defined $max; 2228 if defined $max;
1822 2229
1823 $self->{gauge}->set_value ($val, $max); 2230 $self->{gauge}->set_value ($val, $max);
1824 $self->{value}->set_text ($val); 2231 $self->{value}->set_text ($val);
1825}
1826
1827sub set_max {
1828 my ($self, $max) = @_;
1829
1830 $self->{gauge}->set_max ($max);
1831 $self->{max}->set_text ($max);
1832} 2232}
1833 2233
1834############################################################################# 2234#############################################################################
1835 2235
1836package CFClient::UI::Slider; 2236package CFClient::UI::Slider;
… …
1846 qw(s1_slider.png s1_slider_bg.png); 2246 qw(s1_slider.png s1_slider_bg.png);
1847 2247
1848sub new { 2248sub new {
1849 my $class = shift; 2249 my $class = shift;
1850 2250
1851 # range [value, low, high, page] 2251 # range [value, low, high, page, unit]
1852 2252
1853 # TODO: 0-width page 2253 # TODO: 0-width page
1854 # TODO: req_w/h are wrong with vertical 2254 # TODO: req_w/h are wrong with vertical
1855 # TODO: calculations are off 2255 # TODO: calculations are off
1856 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
1857 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
1858 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],
1859 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
1860 req_w => 20, 2262 min_w => $::WIDTH / 80,
1861 req_h => 20, 2263 min_h => $::WIDTH / 80,
1862 vertical => 0, 2264 vertical => 0,
1863 can_hover => 1, 2265 can_hover => 1,
1864 inner_pad => 5, 2266 inner_pad => 0.02,
1865 @_ 2267 @_
1866 ); 2268 );
1867 2269
2270 $self->set_value ($self->{range}[0]);
2271 $self->update;
2272
1868 $self 2273 $self
1869} 2274}
1870 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
1871sub size_request { 2310sub size_request {
1872 my ($self) = @_; 2311 my ($self) = @_;
1873 2312
1874 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
1875 my $h = $self->{req_h};
1876
1877 $self->{vertical} ? ($h, $w) : ($w, $h)
1878} 2314}
1879 2315
1880sub button_down { 2316sub button_down {
1881 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
1882 2318
1883 $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
1884 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
1885} 2324}
1886 2325
1887sub mouse_motion { 2326sub mouse_motion {
1888 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
1889 2328
1890 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
1891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
1892 2352
1893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1894 2354
1895 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1896 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1897 2357
1898 $x -= $inner_pad_px; # substract the padding 2358 $value = ($value - $lo) / $range;
1899 $x = $x * ($hi - $lo) / $inner_w + $lo; 2359 $value = $value * $self->{scale} + $self->{offset};
1900 $x = $lo if $x < $lo;
1901 $x = $hi - $page if $x > $hi - $page;
1902 $self->{range}[0] = $x;
1903 2360
1904 $self->emit (changed => $x); 2361 $self->{knob_x} = $value - $knob_w * 0.5;
1905 $self->update; 2362 $self->{knob_w} = $knob_w;
1906 } 2363 });
1907}
1908 2364
1909# the inner_* stuff is for generating a padding for the slider handle, 2365 $self->SUPER::update;
1910# so that the handle doesn't leave the texture. This calculation isn't 100%
1911# correct propably, but it does the job for now
1912sub _calc_inner_pad_px {
1913 my ($self, $w) = @_;
1914 ($w / 100) * $self->{inner_pad} # % to pixels
1915} 2366}
1916 2367
1917sub _draw { 2368sub _draw {
1918 my ($self) = @_; 2369 my ($self) = @_;
1919 2370
1920 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
1921 2372
1922 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
1923 2374
1924 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
1925 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
1926 2377
2378 glTranslate 1, 0, 0;
1927 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
1928 glTranslate 0, -$self->{w}, 0;
1929
1930 ($w, $h) = ($h, $w);
1931 } 2380 }
1932 2381
1933 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1934 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1935 2384
1936 my ($value, $lo, $hi, $page) = @{$self->{range}};
1937
1938 $hi = $value + 1 if $lo == $hi;
1939
1940 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1941 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1942
1943 $page = int $page * $inner_w / ($hi - $lo);
1944 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1945
1946 $w -= $page;
1947 $page &= ~1;
1948 glTranslate $page * 0.5, 0, 0;
1949 $page ||= 2;
1950
1951 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1952 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1953
1954 glEnable GL_BLEND;
1955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1956 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
1957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1958 2387
1959 # draw background 2388 # draw background
1960 $tex[1]->draw_quad (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1961 2390
1962 # draw handle 2391 # draw handle
1963 $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);
1964 2393
1965 glDisable GL_BLEND;
1966 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
1967} 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 (@_) }
1968 2437
1969############################################################################# 2438#############################################################################
1970 2439
1971package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
1972 2441
… …
1981 fontsize => 1, 2450 fontsize => 1,
1982 can_events => 0, 2451 can_events => 0,
1983 #font => default_font 2452 #font => default_font
1984 @_, 2453 @_,
1985 2454
1986 layout => (new CFClient::Layout), 2455 layout => (new CFClient::Layout 1),
1987 par => [], 2456 par => [],
1988 height => 0, 2457 height => 0,
1989 children => [ 2458 children => [
1990 (new CFClient::UI::Empty expand => 1), 2459 (new CFClient::UI::Empty expand => 1),
1991 (new CFClient::UI::Slider vertical => 1), 2460 (new CFClient::UI::Slider vertical => 1),
1992 ], 2461 ],
1993 ); 2462 );
1994 2463
1995 $self->{children}[1]->connect (changed => sub { 2464 $self->{children}[1]->connect (changed => sub { $self->update });
1996 $self->update;
1997 });
1998 2465
1999 $self 2466 $self
2000} 2467}
2001 2468
2002sub set_fontsize { 2469sub set_fontsize {
2003 my ($self, $fontsize) = @_; 2470 my ($self, $fontsize) = @_;
2004 2471
2005 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2006 $self->reflow; 2473 $self->reflow;
2007}
2008
2009sub text_height {
2010 my ($self, $text) = @_;
2011
2012 my $layout = $self->{layout};
2013
2014 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015 $layout->set_width ($self->{w});
2016 $layout->set_text ($text);
2017
2018 ($layout->size)[1]
2019}
2020
2021sub reflow {
2022 my ($self) = @_;
2023
2024 $self->{need_reflow}++;
2025 $self->update;
2026} 2474}
2027 2475
2028sub size_allocate { 2476sub size_allocate {
2029 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2030 2478
… …
2035 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2036 2484
2037 $self->reflow; 2485 $self->reflow;
2038} 2486}
2039 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
2040sub add_paragraph { 2522sub add_paragraph {
2041 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2042 2524
2043 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2044 2526 my ($w, $h) = $self->text_size ($line);
2045 my $height = $self->text_height ($text);
2046
2047 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2048 2530
2049 push @{$self->{par}}, [$height, $color, $text];
2050
2051 $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]);
2052 $self->{children}[1]->update;
2053} 2532}
2054 2533
2055sub update { 2534sub update {
2056 my ($self) = @_; 2535 my ($self) = @_;
2057 2536
… …
2059 2538
2060 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2061 2540
2062 delete $self->{texture}; 2541 delete $self->{texture};
2063 2542
2064 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2065 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2066 my $height = 0; 2547 my $height = 0;
2067 2548
2068 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2069 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 }
2070 2564
2071 $self->{height} = $height; 2565 $self->{height} = $height;
2072 2566
2073 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2074 2568
2075 delete $self->{texture}; 2569 delete $self->{texture};
2076 } 2570 }
2077 2571
2078 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2079 glClearColor 0, 0, 0, 1; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2080 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2081 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
2082 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2083 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2084 glEnable GL_TEXTURE_2D;
2085 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2086
2087 my $top = int $self->{children}[1]{range}[0];
2088
2089 my $y0 = $top;
2090 my $y1 = $top + $self->{h};
2091
2092 my $y = 0;
2093
2094 my $layout = $self->{layout};
2095
2096 $layout->set_font ($self->{font}) if $self->{font};
2097 2590
2098 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2099 my $h = $par->[0]; 2592 my $h = $par->[1];
2100 2593
2101 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]);
2102 $layout->set_text ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2103 2598
2104 glColor @{ $par->[1] }; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2105 my ($W, $H) = $layout->size; 2600
2106 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;
2107 } 2603 }
2108 2604
2109 $y += $h; 2605 $y += $h;
2110 } 2606 }
2111 2607
2112 glDisable GL_TEXTURE_2D;
2113 glDisable GL_BLEND; 2608 glDisable GL_BLEND;
2114 }; 2609 };
2115 }); 2610 });
2116} 2611}
2117 2612
2118sub _draw { 2613sub _draw {
2119 my ($self) = @_; 2614 my ($self) = @_;
2120 2615
2121 if ($self->{texture}) {
2122 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2123 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;
2124 $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});
2125 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2126 }
2127 2621
2128 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2129 2623
2130} 2624}
2131 2625
… …
2179 2673
2180sub new { 2674sub new {
2181 my $class = shift; 2675 my $class = shift;
2182 2676
2183 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2184 state => 0, 2678 state => 0,
2185 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2186 @_ 2680 @_
2187 ); 2681 );
2188 2682
2189 if ($self->{state}) {
2190 $self->{state} = 0;
2191 $self->toggle_flopper;
2192 }
2193
2194 $self 2683 $self
2195} 2684}
2196 2685
2197sub toggle_flopper { 2686sub toggle_flopper {
2198 my ($self) = @_; 2687 my ($self) = @_;
2199 2688
2200 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2201 if ($self->{state} = !$self->{state}) {
2202 $CFClient::UI::ROOT->add ($self->{other});
2203 $self->{other}->move ($self->coord2global (0, $self->{h}));
2204 $self->emit ("open");
2205 } else {
2206 $CFClient::UI::ROOT->remove ($self->{other});
2207 $self->emit ("close");
2208 }
2209
2210 $self->emit (changed => $self->{state});
2211} 2690}
2212 2691
2213############################################################################# 2692#############################################################################
2214 2693
2215package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2225 @_, 2704 @_,
2226 can_events => 0, 2705 can_events => 0,
2227 ) 2706 )
2228} 2707}
2229 2708
2230sub set_markup { 2709sub set_tooltip_from {
2231 my ($self, $text) = @_; 2710 my ($self, $widget) = @_;
2232 2711
2233 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2712 my $tooltip = $widget->{tooltip};
2234 $self->{label}->set_markup ($text); 2713
2235 $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 );
2236} 2729}
2237 2730
2238sub size_request { 2731sub size_request {
2239 my ($self) = @_; 2732 my ($self) = @_;
2240
2241 $self->child->set_max_size ($::WIDTH * 0.3);
2242 2733
2243 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244 2735
2245 ($w + 4, $h + 4) 2736 ($w + 4, $h + 4)
2246} 2737}
… …
2249 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2250 2741
2251 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2252} 2743}
2253 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
2254sub _draw { 2763sub _draw {
2255 my ($self) = @_; 2764 my ($self) = @_;
2256 2765
2257 glPushMatrix;
2258 glTranslate 0.375, 0.375; 2766 glTranslate 0.375, 0.375;
2259 2767
2260 my ($w, $h) = @$self{qw(w h)}; 2768 my ($w, $h) = @$self{qw(w h)};
2261 2769
2262 glColor 1, 0.8, 0.4; 2770 glColor 1, 0.8, 0.4;
… …
2273 glVertex 0 , $h; 2781 glVertex 0 , $h;
2274 glVertex $w, $h; 2782 glVertex $w, $h;
2275 glVertex $w, 0; 2783 glVertex $w, 0;
2276 glEnd; 2784 glEnd;
2277 2785
2278 glPopMatrix; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2279 2787
2280 glTranslate 2, 2;
2281 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2282} 2789}
2283 2790
2284############################################################################# 2791#############################################################################
2285 2792
… …
2290use CFClient::OpenGL; 2797use CFClient::OpenGL;
2291 2798
2292sub new { 2799sub new {
2293 my $class = shift; 2800 my $class = shift;
2294 2801
2295 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2296 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2297 @_, 2805 @_,
2298 ) 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
2299} 2823}
2300 2824
2301sub size_request { 2825sub size_request {
2302 (32, 8) 2826 (32, 8)
2303} 2827}
2304 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2305sub draw { 2837sub _draw {
2306 my ($self) = @_; 2838 my ($self) = @_;
2307 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
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2309 2852
2310 if ($tex) { 2853 if ($tex) {
2311 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315 glColor 1, 1, 1, 1; 2856 glColor 1, 1, 1, 1;
2316 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2317 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2318 glDisable GL_BLEND;
2319 } 2859 }
2860}
2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2320} 2869}
2321 2870
2322############################################################################# 2871#############################################################################
2323 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
2324package CFClient::UI::Root; 3472package CFClient::UI::Root;
2325 3473
2326our @ISA = CFClient::UI::Container::; 3474our @ISA = CFClient::UI::Container::;
2327 3475
2328use CFClient::OpenGL; 3476use CFClient::OpenGL;
2329 3477
2330sub check_size { 3478sub new {
2331 my ($self) = @_; 3479 my $class = shift;
2332 3480
2333 $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
2334} 3489}
2335 3490
2336sub size_request { 3491sub size_request {
2337 ($::WIDTH, $::HEIGHT) 3492 my ($self) = @_;
2338}
2339 3493
2340sub 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 {
2341 my ($self, $x, $y, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2342 3513
2343 $self->SUPER::configure ($x, $y, $w, $h);
2344
2345 for my $child (@{$self->{children}}) { 3514 for my $child ($self->children) {
2346 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)};
2347 3516
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3517 $X = $child->{force_x} if exists $child->{force_x};
2349 $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
2350 $child->configure ($X, $Y, $W,$H); 3523 $child->configure ($X, $Y, $W, $H);
2351 } 3524 }
2352} 3525}
2353 3526
2354sub _topleft { 3527sub coord2local {
2355 my ($self, $x, $y) = @_; 3528 my ($self, $x, $y) = @_;
2356 3529
2357 ($x, $y) 3530 ($x, $y)
2358} 3531}
2359 3532
3533sub coord2global {
3534 my ($self, $x, $y) = @_;
3535
3536 ($x, $y)
3537}
3538
2360sub update { 3539sub update {
2361 my ($self) = @_; 3540 my ($self) = @_;
2362 3541
2363 $self->check_size; 3542 $::WANT_REFRESH++;
2364 ::refresh ();
2365} 3543}
2366 3544
2367sub add { 3545sub add {
2368 my ($self, $child) = @_; 3546 my ($self, @children) = @_;
2369 3547
2370 # integerize window positions 3548 $_->{is_toplevel} = 1
2371 $child->{x} = int $child->{x}; 3549 for @children;
2372 $child->{y} = int $child->{y};
2373 3550
2374 $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 }
2375} 3567}
2376 3568
2377sub on_refresh { 3569sub on_refresh {
2378 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2379 3571
2380 $self->{refresh_hook}{$id} = $cb; 3572 $self->{refresh_hook}{$id} = $cb;
2381} 3573}
2382 3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
2383sub draw { 3581sub draw {
2384 my ($self) = @_; 3582 my ($self) = @_;
2385 3583
2386 while (my $rcb = delete $self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2387 $_->() for values %$rcb; 3585 $_->()
3586 for values %{delete $self->{refresh_hook}};
2388 } 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
2389 3677
2390 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
2393 3681
2394 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
2395 glLoadIdentity; 3683 glLoadIdentity;
2396 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2397 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
2398 glLoadIdentity; 3686 glLoadIdentity;
2399 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
2400 $self->_draw; 3695 $self->_draw;
2401} 3696}
2402 3697
2403############################################################################# 3698#############################################################################
2404 3699
2405package CFClient::UI; 3700package CFClient::UI;
2406 3701
2407$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
2408$TOOLTIP = new CFClient::UI::Tooltip; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2409 3704
24101 37051
2411 3706

Diff Legend

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