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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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