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

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

Diff Legend

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