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.169 by elmex, Mon Apr 24 10:43:39 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
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, int $x;
187 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, 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 ( 677 my $self = $class->SUPER::new (
498 children => [], 678 children => [],
499 can_events => 0, 679 can_events => 0,
500 %arg, 680 %arg,
501 ); 681 );
682
502 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
503 685
504 $self 686 $self
505} 687}
506 688
507sub add { 689sub add {
508 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
509 691
510 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
511 694
512 use sort 'stable'; 695 use sort 'stable';
513 696
514 $self->{children} = [ 697 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
517 ]; 700 ];
518 701
519 $child->check_size; 702 $self->realloc;
703}
704
705sub children {
706 @{ $_[0]{children} }
520} 707}
521 708
522sub remove { 709sub remove {
523 my ($self, $child) = @_; 710 my ($self, $child) = @_;
524 711
525 delete $child->{parent}; 712 delete $child->{parent};
526 $child->hide; 713 $child->hide;
527 714
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 716
530 $self->check_size; 717 $self->realloc;
531 $self->update;
532} 718}
533 719
534sub clear { 720sub clear {
535 my ($self) = @_; 721 my ($self) = @_;
536 722
… …
539 725
540 for (@$children) { 726 for (@$children) {
541 delete $_->{parent}; 727 delete $_->{parent};
542 $_->hide; 728 $_->hide;
543 } 729 }
730
731 $self->realloc;
544} 732}
545 733
546sub find_widget { 734sub find_widget {
547 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
548 736
549 $x -= $self->{x}; 737 $x -= $self->{x};
550 $y -= $self->{y}; 738 $y -= $self->{y};
551 739
552 my $res; 740 my $res;
553 741
554 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
555 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
556 and return $res; 744 and return $res;
557 } 745 }
558 746
559 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
608 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
609} 797}
610 798
611############################################################################# 799#############################################################################
612 800
801# back-buffered drawing area
802
613package CFClient::UI::Window; 803package CFClient::UI::Window;
614 804
615our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
616 806
617use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
623} 813}
624 814
625sub update { 815sub update {
626 my ($self) = @_; 816 my ($self) = @_;
627 817
628 # we want to do this delayed... 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 819 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 820}
642 821
643sub size_allocate { 822sub size_allocate {
644 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
645 824
646 $self->child->configure (0, 0, $w, $h); 825 $self->SUPER::size_allocate ($w, $h);
826 $self->update;
827}
647 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
648 $self->render_chld; 849 $self->_render;
850 };
649} 851}
650 852
651sub _draw { 853sub _draw {
652 my ($self) = @_; 854 my ($self) = @_;
653 855
654 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
655 857
656 my $tex = $self->{texture} 858 my $tex = $self->{texture}
657 or return; 859 or return;
658 860
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
662 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;
663 864
664 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 866
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
668} 868}
669 869
670############################################################################# 870#############################################################################
671 871
672package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
673 873
674our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 875
702sub new { 876sub new {
703 my $class = shift; 877 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 980 slider => $slider,
708 border => 0.8, 981 %arg,
709 @_
710 ); 982 );
711 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
712 $self 987 $self
713} 988}
714 989
715sub _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 {
716 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
717 1008
718 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
719 1010
720 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
721 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]);
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
738 1017
739############################################################################# 1018#############################################################################
740 1019
741package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
742 1021
743our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
744 1023
745use CFClient::OpenGL; 1024use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750 1025
751sub new { 1026sub new {
752 my $class = shift; 1027 my $class = shift;
753 1028
754 # 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};
755 1078
756 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1082 border => 0.6,
760 can_events => 1, 1083 can_events => 1,
761 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
762 ); 1087 );
763 1088
764 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
765 align => 0, 1090 align => 0,
766 valign => 1, 1091 valign => 1,
767 text => $self->{title}, 1092 text => $title,
768 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
769 1095
770 $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};
771} 1104}
772 1105
773sub border { 1106sub border {
774 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
775} 1108}
776 1109
777sub size_request { 1110sub size_request {
778 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
779 1115
780 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
781 1117
782 ( 1118 (
783 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
786} 1122}
787 1123
788sub size_allocate { 1124sub size_allocate {
789 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
790 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
791 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
793 1137
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
798} 1139}
799 1140
800sub button_down { 1141sub button_down {
801 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
802 1143
1144 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1145 my $border = $self->border;
804 1146
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
811 $self->{motion} = sub { 1158 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
813 1160
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
815 1163
816 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
819 }; 1169 };
820 1170
821 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
826 1174
827 $self->{motion} = sub { 1175 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
829 1177
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
831 1179
832 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
834 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
835 } 1188 1
836} 1189}
837 1190
838sub button_up { 1191sub button_up {
839 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
840 1193
841 delete $self->{motion}; 1194 !!delete $self->{motion}
842} 1195}
843 1196
844sub mouse_motion { 1197sub mouse_motion {
845 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
846 1199
847 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
848} 1203}
849 1204
850sub _draw { 1205sub _draw {
851 my ($self) = @_; 1206 my ($self) = @_;
852 1207
1208 my $child = $self->{children}[0];
1209
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
855 1212
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1215
861 my $border = $self->border; 1216 my $border = $self->border;
862 1217
863 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1223
869 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
870 1226
871 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
873 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
874 1230 $bg->{t} = $ch / $bg->{h};
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
881 1233
882 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1235
885 $self->{title}->draw if $self->{title};
886 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
887} 1242}
888 1243
889############################################################################# 1244#############################################################################
890 1245
891package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
899sub new { 1254sub new {
900 my $class = shift; 1255 my $class = shift;
901 1256
902 $class->SUPER::new ( 1257 $class->SUPER::new (
903 col_expand => [], 1258 col_expand => [],
904 @_ 1259 @_,
905 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1265}
907 1266
908sub add { 1267sub add {
909 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
910 1269
911 $child->set_parent ($self); 1270 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
913 1272
914 $child->check_size; 1273 $self->realloc;
915} 1274}
916 1275
917# 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?
918sub clear { 1277sub clear {
919 my ($self) = @_; 1278 my ($self) = @_;
920 1279
921 my $children = delete $self->{children}; 1280 my @children = $self->children;
1281 delete $self->{children};
922 1282
923 for (grep $_, map @$_, grep $_, @$children) { 1283 for (@children) {
924 delete $_->{parent}; 1284 delete $_->{parent};
925 $_->hide; 1285 $_->hide;
926 } 1286 }
927 1287
928 $self->update; 1288 $self->realloc;
929} 1289}
930 1290
931sub get_wh { 1291sub get_wh {
932 my ($self) = @_; 1292 my ($self) = @_;
933 1293
… …
964sub size_allocate { 1324sub size_allocate {
965 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
966 1326
967 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
968 1328
969 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
971 1331
972 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1029 } 1389 }
1030} 1390}
1031 1391
1032############################################################################# 1392#############################################################################
1033 1393
1034package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1035
1036# TODO: wrap into common Box base class
1037 1395
1038our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1039 1397
1040sub size_request { 1398sub size_request {
1041 my ($self) = @_; 1399 my ($self) = @_;
1042 1400
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1044 1402 ? (
1045 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1046 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1047 (List::Util::max map $_->[1], @alloc), 1405 )
1048 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1049} 1410}
1050 1411
1051sub size_allocate { 1412sub size_allocate {
1052 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1053 1414
1054 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1055
1056 my $children = $self->{children}; 1416 my $children = $self->{children};
1057 1417
1058 my @h = map $_->{req_w}, @$children; 1418 my @req;
1059 1419
1060 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1061 1421 @req = ($space / (@$children || 1)) x @$children;
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } 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 {
1066 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1067 $exp ||= 1;
1068 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1069 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
1075 } 1436 }
1076 } 1437 }
1077 1438
1078 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1079 1440
1080 my $y = 0; 1441 my $pos = 0;
1081 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1082 my $child = $children->[$_];
1083 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1084 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1085 1445
1086 $y += $h; 1446 $pos += $alloc;
1087 } 1447 }
1088 1448
1089 1 1449 1
1090} 1450}
1091 1451
1092############################################################################# 1452#############################################################################
1093 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
1094package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1095 1470
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1099 1472
1100sub size_request { 1473sub new {
1101 my ($self) = @_; 1474 my $class = shift;
1102 1475
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1104 1477 vertical => 1,
1105 ( 1478 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1479 )
1109} 1480}
1110 1481
1111sub size_allocate {
1112 my ($self, $w, $h) = @_;
1113
1114 my $children = $self->{children};
1115
1116 my @h = map $_->{req_h}, @$children;
1117
1118 my $req_h = List::Util::sum @h;
1119
1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
1125 $exp ||= 1;
1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131 }
1132 }
1133
1134 CFClient::UI::harmonize \@h;
1135
1136 my $y = 0;
1137 for (0 .. $#$children) {
1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
1141
1142 $y += $h;
1143 }
1144
1145 1
1146}
1147
1148############################################################################# 1482#############################################################################
1149 1483
1150package CFClient::UI::Label; 1484package CFClient::UI::Label;
1151 1485
1152our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1153 1487
1154use CFClient::OpenGL; 1488use CFClient::OpenGL;
1155 1489
1156sub new { 1490sub new {
1157 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1158 1492
1159 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1161 #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),
1162 fontsize => 1, 1503 fontsize => 1,
1163 text => "",
1164 align => -1, 1504 align => -1,
1165 valign => -1, 1505 valign => -1,
1166 padding => 2, 1506 padding_x => 2,
1167 layout => new CFClient::Layout, 1507 padding_y => 2,
1168 can_events => 0, 1508 can_events => 0,
1169 %arg 1509 %arg
1170 ); 1510 );
1171 1511
1172 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1515 $self->{template} = $layout;
1176 } 1516 }
1177 1517
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1179 $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 }
1180 1523
1181 $self 1524 $self
1182} 1525}
1183 1526
1184sub escape { 1527sub escape($) {
1185 local $_ = $_[1]; 1528 local $_ = $_[0];
1186 1529
1187 s/&/&amp;/g; 1530 s/&/&amp;/g;
1188 s/>/&gt;/g; 1531 s/>/&gt;/g;
1189 s/</&lt;/g; 1532 s/</&lt;/g;
1190 1533
1191 $_[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;
1192} 1549}
1193 1550
1194sub set_text { 1551sub set_text {
1195 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1198 1559
1199 delete $self->{texture}; 1560 delete $self->{size_req};
1200 $self->check_size; 1561 $self->realloc;
1201 $self->update; 1562 $self->update;
1202} 1563}
1203 1564
1204sub set_markup { 1565sub set_markup {
1205 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1206 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;
1207 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1208 1575
1209 delete $self->{texture}; 1576 delete $self->{size_req};
1210 $self->check_size; 1577 $self->realloc;
1211 $self->update; 1578 $self->update;
1212} 1579}
1213 1580
1214sub size_request { 1581sub size_request {
1215 my ($self) = @_; 1582 my ($self) = @_;
1216 1583
1584 $self->{size_req} ||= do {
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1590
1221 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1222 1592
1223 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226 1596
1227 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1228 1598
1229 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1231 } 1604 };
1232 1605
1233 ( 1606 @{ $self->{size_req} }
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237} 1607}
1238 1608
1239sub size_allocate { 1609sub size_allocate {
1240 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1241 1611
1612 delete $self->{ox};
1613
1242 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1243} 1616}
1244 1617
1245sub set_fontsize { 1618sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1247 1620
1248 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1622 delete $self->{texture};
1250 $self->check_size; 1623
1251 $self->update; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1252} 1633}
1253 1634
1254sub _draw { 1635sub _draw {
1255 my ($self) = @_; 1636 my ($self) = @_;
1256 1637
1638 $self->SUPER::_draw; # draw background, if applicable
1639
1257 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $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});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647
1261 new_from_layout CFClient::Texture $self->{layout} 1648 new_from_layout CFClient::Texture $self->{layout}
1262 }; 1649 };
1263 1650
1264 glEnable GL_BLEND; 1651 unless (exists $self->{ox}) {
1265 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
1266 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662
1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268
1269 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1284 1671
1285 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1673}
1288 1674
1289############################################################################# 1675#############################################################################
1290 1676
1291package CFClient::UI::EntryBase; 1677package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1690 active_fg => [0, 0, 0],
1305 can_hover => 1, 1691 can_hover => 1,
1306 can_focus => 1, 1692 can_focus => 1,
1307 valign => 0, 1693 valign => 0,
1308 can_events => 1, 1694 can_events => 1,
1695 #text => ...
1309 @_ 1696 @_
1310 ) 1697 )
1311} 1698}
1312 1699
1313sub _set_text { 1700sub _set_text {
… …
1315 1702
1316 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1317 1704
1318 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1319 1706
1320 delete $self->{texture};
1321
1322 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1323 $self->{text} = $text; 1708 $self->{text} = $text;
1324 1709
1325 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1327 1713
1328 $self->emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1718}
1719
1720sub set_text {
1721 my ($self, $text) = @_;
1722
1723 $self->{cursor} = length $text;
1724 $self->_set_text ($text);
1329} 1725}
1330 1726
1331sub get_text { 1727sub get_text {
1332 $_[0]{text} 1728 $_[0]{text}
1333} 1729}
… …
1336 my ($self) = @_; 1732 my ($self) = @_;
1337 1733
1338 my ($w, $h) = $self->SUPER::size_request; 1734 my ($w, $h) = $self->SUPER::size_request;
1339 1735
1340 ($w + 1, $h) # add 1 for cursor 1736 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1737}
1356 1738
1357sub key_down { 1739sub key_down {
1358 my ($self, $ev) = @_; 1740 my ($self, $ev) = @_;
1359 1741
… …
1361 my $sym = $ev->{sym}; 1743 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1744 my $uni = $ev->{unicode};
1363 1745
1364 my $text = $self->get_text; 1746 my $text = $self->get_text;
1365 1747
1366 if ($sym == 8) { 1748 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1749 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1750 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1751 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1752 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1753 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1754 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1755 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1756 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1757 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1758 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1760 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1761 $self->_emit ('escape');
1380 } elsif ($uni) { 1762 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1382 } 1766 }
1383 1767
1384 $self->_set_text ($text); 1768 $self->_set_text ($text);
1385 $self->update; 1769
1770 $self->realloc;
1771
1772 1
1386} 1773}
1387 1774
1388sub focus_in { 1775sub focus_in {
1389 my ($self) = @_; 1776 my ($self) = @_;
1390 1777
… …
1405 utf8::encode $text; 1792 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1407 1794
1408 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1409 $self->update; 1796 $self->update;
1797
1798 1
1410} 1799}
1411 1800
1412sub mouse_motion { 1801sub mouse_motion {
1413 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1414# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1415} 1806}
1416 1807
1417sub _draw { 1808sub _draw {
1418 my ($self) = @_; 1809 my ($self) = @_;
1419 1810
1420 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1421 1812
1422 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1423 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1424 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1425 } else { 1816 } else {
1426 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1427 } 1818 }
1428 1819
1429 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1431 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1432 glVertex 0 , 0; 1823 glVertex 0 , 0;
1433 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1434 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1435 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1470 if ($sym == 13) { 1861 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1862 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1863 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1864 $self->{history_pointer} = -1;
1474 $self->{history_saveback} = ''; 1865 $self->{history_saveback} = '';
1475 $self->emit (activate => $txt); 1866 $self->_emit (activate => $txt);
1476 $self->update; 1867 $self->update;
1477 1868
1478 } elsif ($sym == CFClient::SDLK_UP) { 1869 } elsif ($sym == CFClient::SDLK_UP) {
1479 if ($self->{history_pointer} < 0) { 1870 if ($self->{history_pointer} < 0) {
1480 $self->{history_saveback} = $self->get_text; 1871 $self->{history_saveback} = $self->get_text;
… …
1496 } else { 1887 } else {
1497 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1498 } 1889 }
1499 1890
1500 } else { 1891 } else {
1501 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1502 } 1895 1
1503
1504} 1896}
1505 1897
1506############################################################################# 1898#############################################################################
1507 1899
1508package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1517 1909
1518sub new { 1910sub new {
1519 my $class = shift; 1911 my $class = shift;
1520 1912
1521 $class->SUPER::new ( 1913 $class->SUPER::new (
1522 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1523 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1524 bg => [1, 1, 1, 0.2],
1525 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1526 can_hover => 1, 1918 can_hover => 1,
1527 align => 0, 1919 align => 0,
1528 valign => 0, 1920 valign => 0,
1529 can_events => 1, 1921 can_events => 1,
1530 @_ 1922 @_
1531 ) 1923 )
1532} 1924}
1533 1925
1926sub activate { }
1927
1534sub button_up { 1928sub button_up {
1535 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1536 1930
1931 $self->emit ("activate")
1537 if ($x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1538 && $y >= 0 && $y < $self->{h}) { 1933 && $y >= 0 && $y < $self->{h};
1539 $self->emit ("activate"); 1934
1540 } 1935 1
1541} 1936}
1542 1937
1543sub _draw { 1938sub _draw {
1544 my ($self) = @_; 1939 my ($self) = @_;
1545 1940
1546 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1547 1942
1548 if ($GRAB == $self) {
1549 $self->{fg} = $self->{active_fg};
1550 }
1551
1552 glEnable GL_BLEND;
1553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1554 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1557 1946
1558 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1947 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1559 1948
1560 glDisable GL_TEXTURE_2D; 1949 glDisable GL_TEXTURE_2D;
1561 glDisable GL_BLEND;
1562 1950
1563 $self->SUPER::_draw; 1951 $self->SUPER::_draw;
1564} 1952}
1565 1953
1566############################################################################# 1954#############################################################################
… …
1577 1965
1578sub new { 1966sub new {
1579 my $class = shift; 1967 my $class = shift;
1580 1968
1581 $class->SUPER::new ( 1969 $class->SUPER::new (
1582 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1583 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1584 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1974 bg => [0, 0, 0, 0.2],
1975 active_bg => [1, 1, 1, 0.5],
1585 state => 0, 1976 state => 0,
1586 can_hover => 1, 1977 can_hover => 1,
1587 @_ 1978 @_
1588 ) 1979 )
1589} 1980}
1590 1981
1591sub size_request { 1982sub size_request {
1592 my ($self) = @_; 1983 my ($self) = @_;
1593 1984
1594 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1595} 1986}
1596 1987
1597sub button_down { 1988sub button_down {
1598 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1599 1990
1600 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1601 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1602 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1603 $self->emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1604 } 1999 1
1605} 2000}
1606 2001
1607sub _draw { 2002sub _draw {
1608 my ($self) = @_; 2003 my ($self) = @_;
1609 2004
1610 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1611 2006
1612 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1613 2008
1614 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1615 2012
1616 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1617 2014
1618 glEnable GL_BLEND; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
2016
1619 glEnable GL_TEXTURE_2D; 2017 glEnable GL_TEXTURE_2D;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621
1622 my $tex = $self->{state} ? $tex[1] : $tex[0];
1623
1624 $tex->draw_quad (0, 0, $s, $s); 2018 $tex->draw_quad_alpha (0, 0, $s, $s);
1625
1626 glDisable GL_TEXTURE_2D; 2019 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628} 2020}
1629 2021
1630############################################################################# 2022#############################################################################
1631 2023
1632package CFClient::UI::Image; 2024package CFClient::UI::Image;
… …
1675 glTranslate 0, -$self->{w}, 0; 2067 glTranslate 0, -$self->{w}, 0;
1676 2068
1677 ($w, $h) = ($h, $w); 2069 ($w, $h) = ($h, $w);
1678 } 2070 }
1679 2071
1680 glEnable GL_BLEND;
1681 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1682 glEnable GL_TEXTURE_2D; 2072 glEnable GL_TEXTURE_2D;
1683 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2073 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1684 2074
1685 $tex->draw_quad (0, 0, $w, $h); 2075 $tex->draw_quad_alpha (0, 0, $w, $h);
1686 2076
1687 glDisable GL_BLEND;
1688 glDisable GL_TEXTURE_2D; 2077 glDisable GL_TEXTURE_2D;
1689} 2078}
1690 2079
1691############################################################################# 2080#############################################################################
1692 2081
… …
1740} 2129}
1741 2130
1742sub set_max { 2131sub set_max {
1743 my ($self, $max) = @_; 2132 my ($self, $max) = @_;
1744 2133
2134 return if $self->{max_val} == $max;
2135
1745 $self->{max_val} = $max; 2136 $self->{max_val} = $max;
2137 $self->update;
1746} 2138}
1747 2139
1748sub set_value { 2140sub set_value {
1749 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1750 2142
1751 $self->set_max ($max) 2143 $self->set_max ($max)
1752 if defined $max; 2144 if defined $max;
1753 2145
1754 $max = $self->{max_val}; 2146 return if $self->{val} == $val;
2147
1755 $self->{val} = $val; 2148 $self->{val} = $val;
1756
1757 $self->update; 2149 $self->update;
1758} 2150}
1759 2151
1760sub _draw { 2152sub _draw {
1761 my ($self) = @_; 2153 my ($self) = @_;
… …
1779 2171
1780 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
1781 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
1782 2174
1783 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
1784 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1785 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1787 2180
1788 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
1789 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
1824 2217
1825sub new { 2218sub new {
1826 my ($class, %arg) = @_; 2219 my ($class, %arg) = @_;
1827 2220
1828 my $self = $class->SUPER::new ( 2221 my $self = $class->SUPER::new (
1829 tooltip => $arg{type}, 2222 tooltip => $arg{type},
1830 can_hover => 1, 2223 can_hover => 1,
2224 can_events => 1,
1831 %arg, 2225 %arg,
1832 ); 2226 );
1833 2227
1834 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2228 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1835 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2229 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1843 2237
1844 $self->{value}->set_fontsize ($fsize); 2238 $self->{value}->set_fontsize ($fsize);
1845 $self->{max} ->set_fontsize ($fsize); 2239 $self->{max} ->set_fontsize ($fsize);
1846} 2240}
1847 2241
2242sub set_max {
2243 my ($self, $max) = @_;
2244
2245 $self->{gauge}->set_max ($max);
2246 $self->{max}->set_text ($max);
2247}
2248
1848sub set_value { 2249sub set_value {
1849 my ($self, $val, $max) = @_; 2250 my ($self, $val, $max) = @_;
1850 2251
1851 $self->set_max ($max) 2252 $self->set_max ($max)
1852 if defined $max; 2253 if defined $max;
1853 2254
1854 $self->{gauge}->set_value ($val, $max); 2255 $self->{gauge}->set_value ($val, $max);
1855 $self->{value}->set_text ($val); 2256 $self->{value}->set_text ($val);
1856}
1857
1858sub set_max {
1859 my ($self, $max) = @_;
1860
1861 $self->{gauge}->set_max ($max);
1862 $self->{max}->set_text ($max);
1863} 2257}
1864 2258
1865############################################################################# 2259#############################################################################
1866 2260
1867package CFClient::UI::Slider; 2261package CFClient::UI::Slider;
… …
1877 qw(s1_slider.png s1_slider_bg.png); 2271 qw(s1_slider.png s1_slider_bg.png);
1878 2272
1879sub new { 2273sub new {
1880 my $class = shift; 2274 my $class = shift;
1881 2275
1882 # range [value, low, high, page] 2276 # range [value, low, high, page, unit]
1883 2277
1884 # TODO: 0-width page 2278 # TODO: 0-width page
1885 # TODO: req_w/h are wrong with vertical 2279 # TODO: req_w/h are wrong with vertical
1886 # TODO: calculations are off 2280 # TODO: calculations are off
1887 my $self = $class->SUPER::new ( 2281 my $self = $class->SUPER::new (
1888 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
1889 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2284 bg => [0, 0, 0, 0.2],
2285 active_bg => [1, 1, 1, 0.5],
1890 range => [0, 0, 100, 10], 2286 range => [0, 0, 100, 10, 0],
1891 req_w => 20, 2287 min_w => $::WIDTH / 80,
1892 req_h => 20, 2288 min_h => $::WIDTH / 80,
1893 vertical => 0, 2289 vertical => 0,
1894 can_hover => 1, 2290 can_hover => 1,
1895 inner_pad => 5, 2291 inner_pad => 0.02,
1896 @_ 2292 @_
1897 ); 2293 );
1898 2294
2295 $self->set_value ($self->{range}[0]);
2296 $self->update;
2297
1899 $self 2298 $self
1900} 2299}
1901 2300
2301sub changed { }
2302
2303sub set_range {
2304 my ($self, $range) = @_;
2305
2306 ($range, $self->{range}) = ($self->{range}, $range);
2307
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}";
2310}
2311
2312sub set_value {
2313 my ($self, $value) = @_;
2314
2315 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2316
2317 $hi = $lo + 1 if $hi <= $lo;
2318
2319 $page = $hi - $lo if $page > $hi - $lo;
2320
2321 $value = $lo if $value < $lo;
2322 $value = $hi - $page if $value > $hi - $page;
2323
2324 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2325 if $unit;
2326
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328
2329 if ($value != $old_value) {
2330 $self->_emit (changed => $value);
2331 $self->update;
2332 }
2333}
2334
1902sub size_request { 2335sub size_request {
1903 my ($self) = @_; 2336 my ($self) = @_;
1904 2337
1905 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
1906 my $h = $self->{req_h};
1907
1908 $self->{vertical} ? ($h, $w) : ($w, $h)
1909} 2339}
1910 2340
1911sub button_down { 2341sub button_down {
1912 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
1913 2343
1914 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2345
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347
1915 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
1916} 2349}
1917 2350
1918sub mouse_motion { 2351sub mouse_motion {
1919 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
1920 2353
1921 if ($GRAB == $self) { 2354 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356
2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2358
2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2360
2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2366 1
2367}
2368
2369sub update {
2370 my ($self) = @_;
2371
2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2380 $self->set_value ($self->{range}[0]);
2381
1922 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2383 my $range = ($hi - $page - $lo) || 1e-100;
1923 2384
1924 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2385 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1925 2386
1926 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2387 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1927 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2388 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1928 2389
1929 $x -= $inner_pad_px; # substract the padding 2390 $value = ($value - $lo) / $range;
1930 $x = $x * ($hi - $lo) / $inner_w + $lo; 2391 $value = $value * $self->{scale} + $self->{offset};
1931 $x = $lo if $x < $lo;
1932 $x = $hi - $page if $x > $hi - $page;
1933 $self->{range}[0] = $x;
1934 2392
1935 $self->emit (changed => $x); 2393 $self->{knob_x} = $value - $knob_w * 0.5;
1936 $self->update; 2394 $self->{knob_w} = $knob_w;
1937 } 2395 }
1938}
1939
1940# the inner_* stuff is for generating a padding for the slider handle,
1941# so that the handle doesn't leave the texture. This calculation isn't 100%
1942# correct propably, but it does the job for now
1943sub _calc_inner_pad_px {
1944 my ($self, $w) = @_;
1945 ($w / 100) * $self->{inner_pad} # % to pixels
1946}
1947
1948sub _draw {
1949 my ($self) = @_;
1950 2396
1951 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
1952 2398
1953 my ($w, $h) = @$self{qw(w h)}; 2399 glScale $self->{w}, $self->{h};
1954 2400
1955 if ($self->{vertical}) { 2401 if ($self->{vertical}) {
1956 # draw a vertical slider like a rotated horizontal slider 2402 # draw a vertical slider like a rotated horizontal slider
1957 2403
2404 glTranslate 1, 0, 0;
1958 glRotate 90, 0, 0, 1; 2405 glRotate 90, 0, 0, 1;
1959 glTranslate 0, -$self->{w}, 0;
1960
1961 ($w, $h) = ($h, $w);
1962 } 2406 }
1963 2407
1964 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2408 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1965 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2409 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1966 2410
1967 my ($value, $lo, $hi, $page) = @{$self->{range}};
1968
1969 $hi = $value + 1 if $lo == $hi;
1970
1971 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1972 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1973
1974 $page = int $page * $inner_w / ($hi - $lo);
1975 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1976
1977 $w -= $page;
1978 $page &= ~1;
1979 glTranslate $page * 0.5, 0, 0;
1980 $page ||= 2;
1981
1982 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1983 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1984
1985 glEnable GL_BLEND;
1986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1987 glEnable GL_TEXTURE_2D; 2411 glEnable GL_TEXTURE_2D;
1988 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1989 2413
1990 # draw background 2414 # draw background
1991 $tex[1]->draw_quad (0, 0, $w, $h); 2415 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1992 2416
1993 # draw handle 2417 # draw handle
1994 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2418 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1995 2419
1996 glDisable GL_BLEND;
1997 glDisable GL_TEXTURE_2D; 2420 glDisable GL_TEXTURE_2D;
1998} 2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::ValSlider;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my ($class, %arg) = @_;
2431
2432 my $range = delete $arg{range};
2433
2434 my $self = $class->SUPER::new (
2435 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2436 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2437 to_value => sub { shift },
2438 from_value => sub { shift },
2439 %arg,
2440 );
2441
2442 $self->{slider}->connect (changed => sub {
2443 my ($self, $value) = @_;
2444 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2445 $self->{parent}->emit (changed => $value);
2446 });
2447
2448# $self->{entry}->connect (changed => sub {
2449# my ($self, $value) = @_;
2450# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2451# $self->{parent}->emit (changed => $value);
2452# });
2453
2454 $self->add ($self->{slider}, $self->{entry});
2455
2456 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2457
2458 $self
2459}
2460
2461sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) }
1999 2463
2000############################################################################# 2464#############################################################################
2001 2465
2002package CFClient::UI::TextView; 2466package CFClient::UI::TextView;
2003 2467
… …
2012 fontsize => 1, 2476 fontsize => 1,
2013 can_events => 0, 2477 can_events => 0,
2014 #font => default_font 2478 #font => default_font
2015 @_, 2479 @_,
2016 2480
2017 layout => (new CFClient::Layout), 2481 layout => (new CFClient::Layout 1),
2018 par => [], 2482 par => [],
2019 height => 0, 2483 height => 0,
2020 children => [ 2484 children => [
2021 (new CFClient::UI::Empty expand => 1), 2485 (new CFClient::UI::Empty expand => 1),
2022 (new CFClient::UI::Slider vertical => 1), 2486 (new CFClient::UI::Slider vertical => 1),
2023 ], 2487 ],
2024 ); 2488 );
2025 2489
2026 $self->{children}[1]->connect (changed => sub { 2490 $self->{children}[1]->connect (changed => sub { $self->update });
2027 $self->update;
2028 });
2029 2491
2030 $self 2492 $self
2031} 2493}
2032 2494
2033sub set_fontsize { 2495sub set_fontsize {
2034 my ($self, $fontsize) = @_; 2496 my ($self, $fontsize) = @_;
2035 2497
2036 $self->{fontsize} = $fontsize; 2498 $self->{fontsize} = $fontsize;
2037 $self->reflow; 2499 $self->reflow;
2038}
2039
2040sub text_height {
2041 my ($self, $text) = @_;
2042
2043 my $layout = $self->{layout};
2044
2045 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2046 $layout->set_width ($self->{w});
2047 $layout->set_text ($text);
2048
2049 ($layout->size)[1]
2050}
2051
2052sub reflow {
2053 my ($self) = @_;
2054
2055 $self->{need_reflow}++;
2056 $self->update;
2057} 2500}
2058 2501
2059sub size_allocate { 2502sub size_allocate {
2060 my ($self, $w, $h) = @_; 2503 my ($self, $w, $h) = @_;
2061 2504
… …
2066 $self->{layout}->set_width ($self->{children}[0]{w}); 2509 $self->{layout}->set_width ($self->{children}[0]{w});
2067 2510
2068 $self->reflow; 2511 $self->reflow;
2069} 2512}
2070 2513
2514sub text_size {
2515 my ($self, $text, $indent) = @_;
2516
2517 my $layout = $self->{layout};
2518
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent);
2521 $layout->set_markup ($text);
2522
2523 $layout->size
2524}
2525
2526sub reflow {
2527 my ($self) = @_;
2528
2529 $self->{need_reflow}++;
2530 $self->update;
2531}
2532
2533sub set_offset {
2534 my ($self, $offset) = @_;
2535
2536 # todo: base offset on lines or so, not on pixels
2537 $self->{children}[1]->set_value ($offset);
2538}
2539
2540sub clear {
2541 my ($self) = @_;
2542
2543 $self->{par} = [];
2544 $self->{height} = 0;
2545 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546}
2547
2071sub add_paragraph { 2548sub add_paragraph {
2072 my ($self, $color, $text) = @_; 2549 my ($self, $color, $text, $indent) = @_;
2073 2550
2074 #TODO: intelligently "reformat" paragraph 2551 for my $line (split /\n/, $text) {
2075 2552 my ($w, $h) = $self->text_size ($line);
2076 my $height = $self->text_height ($text);
2077
2078 $self->{height} += $height; 2553 $self->{height} += $h;
2554 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2555 }
2079 2556
2080 push @{$self->{par}}, [$height, $color, $text];
2081
2082 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2557 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2083 $self->{children}[1]->update;
2084} 2558}
2085 2559
2086sub update { 2560sub update {
2087 my ($self) = @_; 2561 my ($self) = @_;
2088 2562
… …
2090 2564
2091 return unless $self->{h} > 0; 2565 return unless $self->{h} > 0;
2092 2566
2093 delete $self->{texture}; 2567 delete $self->{texture};
2094 2568
2095 $ROOT->on_refresh ($self, sub { 2569 $ROOT->on_post_alloc ($self, sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571
2096 if (delete $self->{need_reflow}) { 2572 if (delete $self->{need_reflow}) {
2097 my $height = 0; 2573 my $height = 0;
2098 2574
2099 $height += $_->[0] = $self->text_height ($_->[2]) 2575 my $layout = $self->{layout};
2576
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2100 for @{$self->{par}}; 2579 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]);
2582 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h;
2586 }
2587
2588 $height += $_->[1];
2589 }
2101 2590
2102 $self->{height} = $height; 2591 $self->{height} = $height;
2103 2592
2104 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2105 2594
2106 delete $self->{texture}; 2595 delete $self->{texture};
2107 } 2596 }
2108 2597
2109 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2110 glClearColor 0, 0, 0, 1; 2599 glClearColor 0, 0, 0, 0;
2111 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2112 2601
2602 my $top = int $self->{children}[1]{range}[0];
2603
2604 my $y0 = $top;
2605 my $y1 = $top + $H;
2606
2607 my $y = 0;
2608
2609 my $layout = $self->{layout};
2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612
2113 glEnable GL_BLEND; 2613 glEnable GL_BLEND;
2614 #TODO# not correct in windows where rgba is forced off
2114 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2115 glEnable GL_TEXTURE_2D;
2116 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2117
2118 my $top = int $self->{children}[1]{range}[0];
2119
2120 my $y0 = $top;
2121 my $y1 = $top + $self->{h};
2122
2123 my $y = 0;
2124
2125 my $layout = $self->{layout};
2126
2127 $layout->set_font ($self->{font}) if $self->{font};
2128 2616
2129 for my $par (@{$self->{par}}) { 2617 for my $par (@{$self->{par}}) {
2130 my $h = $par->[0]; 2618 my $h = $par->[1];
2131 2619
2132 if ($y0 < $y + $h && $y < $y1) { 2620 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]);
2133 $layout->set_text ($par->[2]); 2623 $layout->set_markup ($par->[4]);
2134 2624
2135 glColor @{ $par->[1] }; 2625 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2136 my ($W, $H) = $layout->size; 2626
2137 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2627 glRasterPos $par->[3], $y - $y0;
2628 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2138 } 2629 }
2139 2630
2140 $y += $h; 2631 $y += $h;
2141 } 2632 }
2142 2633
2143 glDisable GL_TEXTURE_2D;
2144 glDisable GL_BLEND; 2634 glDisable GL_BLEND;
2145 }; 2635 };
2146 }); 2636 });
2147} 2637}
2148 2638
2149sub _draw { 2639sub _draw {
2150 my ($self) = @_; 2640 my ($self) = @_;
2151 2641
2152 if ($self->{texture}) {
2153 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2644 glColor 0, 0, 0, 1;
2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2156 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2157 }
2158 2647
2159 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2160 2649
2161} 2650}
2162 2651
… …
2210 2699
2211sub new { 2700sub new {
2212 my $class = shift; 2701 my $class = shift;
2213 2702
2214 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2215 state => 0, 2704 state => 0,
2216 connect_activate => \&toggle_flopper, 2705 on_activate => \&toggle_flopper,
2217 @_ 2706 @_
2218 ); 2707 );
2219 2708
2220 if ($self->{state}) {
2221 $self->{state} = 0;
2222 $self->toggle_flopper;
2223 }
2224
2225 $self 2709 $self
2226} 2710}
2227 2711
2228sub toggle_flopper { 2712sub toggle_flopper {
2229 my ($self) = @_; 2713 my ($self) = @_;
2230 2714
2231 # TODO: use animation 2715 $self->{other}->toggle_visibility;
2232 if ($self->{state} = !$self->{state}) {
2233 $CFClient::UI::ROOT->add ($self->{other});
2234 $self->{other}->move ($self->coord2global (0, $self->{h}));
2235 $self->emit ("open");
2236 } else {
2237 $CFClient::UI::ROOT->remove ($self->{other});
2238 $self->emit ("close");
2239 }
2240
2241 $self->emit (changed => $self->{state});
2242} 2716}
2243 2717
2244############################################################################# 2718#############################################################################
2245 2719
2246package CFClient::UI::Tooltip; 2720package CFClient::UI::Tooltip;
… …
2256 @_, 2730 @_,
2257 can_events => 0, 2731 can_events => 0,
2258 ) 2732 )
2259} 2733}
2260 2734
2261sub set_markup { 2735sub set_tooltip_from {
2262 my ($self, $text) = @_; 2736 my ($self, $widget) = @_;
2263 2737
2264 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2738 my $tooltip = $widget->{tooltip};
2265 $self->{label}->set_markup ($text); 2739
2266 $self->add ($self->{label}); 2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2747 $self->add (new CFClient::UI::Label
2748 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8,
2751 fg => [0, 0, 0, 1],
2752 ellipsise => 0,
2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
2754 );
2267} 2755}
2268 2756
2269sub size_request { 2757sub size_request {
2270 my ($self) = @_; 2758 my ($self) = @_;
2271
2272 $self->child->set_max_size ($::WIDTH * 0.3);
2273 2759
2274 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2275 2761
2276 ($w + 4, $h + 4) 2762 ($w + 4, $h + 4)
2277} 2763}
… …
2280 my ($self, $w, $h) = @_; 2766 my ($self, $w, $h) = @_;
2281 2767
2282 $self->SUPER::size_allocate ($w - 4, $h - 4); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2283} 2769}
2284 2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2787}
2788
2285sub _draw { 2789sub _draw {
2286 my ($self) = @_; 2790 my ($self) = @_;
2287 2791
2288 glPushMatrix;
2289 glTranslate 0.375, 0.375; 2792 glTranslate 0.375, 0.375;
2290 2793
2291 my ($w, $h) = @$self{qw(w h)}; 2794 my ($w, $h) = @$self{qw(w h)};
2292 2795
2293 glColor 1, 0.8, 0.4; 2796 glColor 1, 0.8, 0.4;
… …
2304 glVertex 0 , $h; 2807 glVertex 0 , $h;
2305 glVertex $w, $h; 2808 glVertex $w, $h;
2306 glVertex $w, 0; 2809 glVertex $w, 0;
2307 glEnd; 2810 glEnd;
2308 2811
2309 glPopMatrix; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2310 2813
2311 glTranslate 2, 2;
2312 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2313} 2815}
2314 2816
2315############################################################################# 2817#############################################################################
2316 2818
… …
2321use CFClient::OpenGL; 2823use CFClient::OpenGL;
2322 2824
2323sub new { 2825sub new {
2324 my $class = shift; 2826 my $class = shift;
2325 2827
2326 $class->SUPER::new ( 2828 my $self = $class->SUPER::new (
2327 aspect => 1, 2829 aspect => 1,
2830 can_events => 0,
2831 @_,
2832 );
2833
2834 if ($self->{anim} && $self->{animspeed}) {
2835 Scalar::Util::weaken (my $widget = $self);
2836
2837 $self->{timer} = Event->timer (
2838 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2839 hard => 1,
2840 interval => $self->{animspeed},
2841 cb => sub {
2842 ++$widget->{frame};
2843 $widget->update;
2844 },
2845 );
2846 }
2847
2848 $self
2849}
2850
2851sub size_request {
2852 (32, 8)
2853}
2854
2855sub update {
2856 my ($self) = @_;
2857
2858 return unless $self->{visible};
2859
2860 $self->SUPER::update;
2861}
2862
2863sub _draw {
2864 my ($self) = @_;
2865
2866 return unless $::CONN;
2867
2868 my $face;
2869
2870 if ($self->{frame}) {
2871 my $anim = $::CONN->{anim}[$self->{anim}];
2872
2873 $face = $anim->[ $self->{frame} % @$anim ]
2874 if $anim && @$anim;
2875 }
2876
2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2878
2879 if ($tex) {
2880 glEnable GL_TEXTURE_2D;
2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2882 glColor 0, 0, 0, 1;
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D;
2885 }
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 $self->{timer}->cancel
2892 if $self->{timer};
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Buttonbar;
2900
2901our @ISA = CFClient::UI::HBox::;
2902
2903# TODO: should actualyl wrap buttons and other goodies.
2904
2905#############################################################################
2906
2907package CFClient::UI::Menu;
2908
2909our @ISA = CFClient::UI::FancyFrame::;
2910
2911use CFClient::OpenGL;
2912
2913sub new {
2914 my $class = shift;
2915
2916 my $self = $class->SUPER::new (
2917 items => [],
2918 z => 100,
2919 @_,
2920 );
2921
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923
2924 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item;
2926
2927 # handle various types of items, only text for now
2928 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label
2930 can_hover => 1,
2931 can_events => 1,
2932 text => $widget;
2933 }
2934
2935 $self->{item}{$widget} = $item;
2936
2937 $self->{vbox}->add ($widget);
2938 }
2939
2940 $self
2941}
2942
2943# popup given the event (must be a mouse button down event currently)
2944sub popup {
2945 my ($self, $ev) = @_;
2946
2947 $self->_emit ("popdown");
2948
2949 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self;
2951 $self->{button} = $ev->{button};
2952
2953 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955}
2956
2957sub mouse_motion {
2958 my ($self, $ev, $x, $y) = @_;
2959
2960 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2965}
2966
2967sub button_up {
2968 my ($self, $ev, $x, $y) = @_;
2969
2970 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB;
2972 $self->hide;
2973
2974 $self->_emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2980 1
2981}
2982
2983#############################################################################
2984
2985package CFClient::UI::Multiplexer;
2986
2987our @ISA = CFClient::UI::Container::;
2988
2989sub new {
2990 my $class = shift;
2991
2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
3101 fontsize => 0.8,
3102 @_,
3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
3110}
3111
3112sub reorder {
3113 my ($self) = @_;
3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
3120
3121 while (my ($k, $v) = each %{ $self->{item} }) {
3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3123 }
3124
3125 my @widgets;
3126
3127 my @items = sort {
3128 $a->{pri} <=> $b->{pri}
3129 or $b->{id} <=> $a->{id}
3130 } values %{ $self->{item} };
3131
3132 $self->{timer}->interval (1);
3133
3134 my $count = 10 + 1;
3135 for my $item (@items) {
3136 last unless --$count;
3137
3138 my $label = $item->{label} ||= do {
3139 # TODO: doesn't handle markup well (read as: at all)
3140 my $short = $item->{count} > 1
3141 ? "<b>$item->{count} ×</b> $item->{text}"
3142 : $item->{text};
3143
3144 for ($short) {
3145 s/^\s+//;
3146 s/\s+/ /g;
3147 }
3148
3149 new CFClient::UI::Label
3150 markup => $short,
3151 tooltip => $item->{tooltip},
3152 tooltip_font => $::FONT_PROP,
3153 tooltip_width => 0.67,
3154 fontsize => $item->{fontsize} || $self->{fontsize},
3155 max_w => $::WIDTH * 0.44,
3156 fg => [@{ $item->{fg} }],
3157 can_events => 1,
3158 can_hover => 1
3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
3172 }
3173
3174 $self->clear;
3175 $self->SUPER::add (reverse @widgets);
3176}
3177
3178sub add {
3179 my ($self, $text, %arg) = @_;
3180
3181 $text =~ s/^\s+//;
3182 $text =~ s/\s+$//;
3183
3184 return unless $text;
3185
3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3187
3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3189
3190 if (my $item = $self->{item}{$group}) {
3191 if ($item->{text} eq $text) {
3192 $item->{count}++;
3193 } else {
3194 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text;
3196 }
3197 $item->{id} = ++$self->{id};
3198 $item->{timeout} = $timeout;
3199 delete $item->{label};
3200 } else {
3201 $self->{item}{$group} = {
3202 id => ++$self->{id},
3203 text => $text,
3204 timeout => $timeout,
3205 tooltip => $text,
3206 fg => [0.8, 0.8, 0.8, 0.8],
3207 pri => 0,
3208 count => 1,
3209 %arg,
3210 };
3211 }
3212
3213 $self->reorder;
3214}
3215
3216sub reconfigure {
3217 my ($self) = @_;
3218
3219 delete $_->{label}
3220 for values %{ $self->{item} || {} };
3221
3222 $self->reorder;
3223 $self->SUPER::reconfigure;
3224}
3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
3234#############################################################################
3235
3236package CFClient::UI::Inventory;
3237
3238our @ISA = CFClient::UI::ScrolledWindow::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
2328 @_, 3485 @_,
2329 ) 3486 )
2330} 3487}
2331 3488
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3544 my ($self, $spell) = @_;
3545
3546 $self->{spell}->{$spell->{name}} = $spell;
3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
3559package CFClient::UI::Root;
3560
3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3564
3565use CFClient::OpenGL;
3566
3567sub new {
3568 my $class = shift;
3569
3570 my $self = $class->SUPER::new (
3571 visible => 1,
3572 @_,
3573 );
3574
3575 Scalar::Util::weaken ($self->{root} = $self);
3576
3577 $self
3578}
3579
2332sub size_request { 3580sub size_request {
2333 (32, 8)
2334}
2335
2336sub draw {
2337 my ($self) = @_; 3581 my ($self) = @_;
2338 3582
2339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3583 ($self->{w}, $self->{h})
2340
2341 if ($tex) {
2342 glEnable GL_BLEND;
2343 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2344 glEnable GL_TEXTURE_2D;
2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2346 glColor 1, 1, 1, 1;
2347 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2348 glDisable GL_TEXTURE_2D;
2349 glDisable GL_BLEND;
2350 }
2351} 3584}
2352 3585
2353############################################################################# 3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
2354 3588
2355package CFClient::UI::Root; 3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
2356 3593
2357our @ISA = CFClient::UI::Container::; 3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
2358 3596
2359use CFClient::OpenGL; 3597 int $coord + 0.5
2360
2361sub check_size {
2362 my ($self) = @_;
2363
2364 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2365} 3598}
2366 3599
2367sub size_request { 3600sub size_allocate {
2368 ($::WIDTH, $::HEIGHT)
2369}
2370
2371sub configure {
2372 my ($self, $x, $y, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
2373 3602
2374 $self->SUPER::configure ($x, $y, $w, $h);
2375
2376 for my $child (@{$self->{children}}) { 3603 for my $child ($self->children) {
2377 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2378 3605
2379 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3606 $X = $child->{force_x} if exists $child->{force_x};
2380 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3607 $Y = $child->{force_y} if exists $child->{force_y};
3608
3609 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h};
3611
2381 $child->configure ($X, $Y, $W,$H); 3612 $child->configure ($X, $Y, $W, $H);
2382 } 3613 }
2383} 3614}
2384 3615
2385sub _topleft { 3616sub coord2local {
2386 my ($self, $x, $y) = @_; 3617 my ($self, $x, $y) = @_;
2387 3618
2388 ($x, $y) 3619 ($x, $y)
2389} 3620}
2390 3621
3622sub coord2global {
3623 my ($self, $x, $y) = @_;
3624
3625 ($x, $y)
3626}
3627
2391sub update { 3628sub update {
2392 my ($self) = @_; 3629 my ($self) = @_;
2393 3630
2394 $self->check_size; 3631 $::WANT_REFRESH++;
2395 ::refresh ();
2396} 3632}
2397 3633
2398sub add { 3634sub add {
2399 my ($self, $child) = @_; 3635 my ($self, @children) = @_;
2400 3636
2401 # integerize window positions 3637 $_->{is_toplevel} = 1
2402 $child->{x} = int $child->{x}; 3638 for @children;
2403 $child->{y} = int $child->{y};
2404 3639
2405 $self->SUPER::add ($child); 3640 $self->SUPER::add (@children);
3641}
3642
3643sub remove {
3644 my ($self, @children) = @_;
3645
3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3650
3651 while (@children) {
3652 my $w = pop @children;
3653 push @children, $w->children;
3654 $w->set_invisible;
3655 }
2406} 3656}
2407 3657
2408sub on_refresh { 3658sub on_refresh {
2409 my ($self, $id, $cb) = @_; 3659 my ($self, $id, $cb) = @_;
2410 3660
2411 $self->{refresh_hook}{$id} = $cb; 3661 $self->{refresh_hook}{$id} = $cb;
2412} 3662}
2413 3663
3664sub on_post_alloc {
3665 my ($self, $id, $cb) = @_;
3666
3667 $self->{post_alloc_hook}{$id} = $cb;
3668}
3669
2414sub draw { 3670sub draw {
2415 my ($self) = @_; 3671 my ($self) = @_;
2416 3672
2417 while (my $rcb = delete $self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
2418 $_->() for values %$rcb; 3674 $_->()
3675 for values %{delete $self->{refresh_hook}};
2419 } 3676 }
3677
3678 if ($self->{realloc}) {
3679 my %queue;
3680 my @queue;
3681 my $widget;
3682
3683 outer:
3684 while () {
3685 if (my $realloc = delete $self->{realloc}) {
3686 for $widget (values %$realloc) {
3687 $widget->{visible} or next; # do not resize invisible widgets
3688
3689 $queue{$widget+0}++ and next; # duplicates are common
3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3693 }
3694
3695 while () {
3696 @queue or last outer;
3697
3698 $widget = pop @{ $queue[-1] || [] }
3699 and last;
3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3719 $widget->{req_w} = $w;
3720 $widget->{req_h} = $h;
3721
3722 $self->{size_alloc}{$widget+0} = $widget;
3723
3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3734 }
3735 }
3736
3737 while (my $size_alloc = delete $self->{size_alloc}) {
3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745
3746 $w = 0 if $w < 0;
3747 $h = 0 if $h < 0;
3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3756 $widget->{w} = $w;
3757 $widget->{h} = $h;
3758
3759 $widget->emit (size_allocate => $w, $h);
3760 }
3761 }
3762 }
3763
3764 while ($self->{post_alloc_hook}) {
3765 $_->()
3766 for values %{delete $self->{post_alloc_hook}};
3767 }
3768
2420 3769
2421 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2422 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2423 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
2424 3773
2425 glMatrixMode GL_PROJECTION; 3774 glMatrixMode GL_PROJECTION;
2426 glLoadIdentity; 3775 glLoadIdentity;
2427 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2428 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
2429 glLoadIdentity; 3778 glLoadIdentity;
2430 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
2431 $self->_draw; 3787 $self->_draw;
2432} 3788}
2433 3789
2434############################################################################# 3790#############################################################################
2435 3791
2436package CFClient::UI; 3792package CFClient::UI;
2437 3793
2438$ROOT = new CFClient::UI::Root; 3794$ROOT = new CFClient::UI::Root;
2439$TOOLTIP = new CFClient::UI::Tooltip; 3795$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2440 3796
24411 37971
2442 3798

Diff Legend

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