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

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

Diff Legend

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