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.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 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
1199 delete $self->{texture}; 1559 delete $self->{req_h};
1200 $self->check_size; 1560
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
1209 delete $self->{texture}; 1575 delete $self->{req_h};
1210 $self->check_size; 1576
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 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1592
1221 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1222 1594
1223 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226 1598
1227 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1228 1600
1229 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1231 } 1603 }
1232 1604
1605 ($w, $h)
1233 ( 1606 }
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;
1252} 1625}
1253 1626
1254sub _draw { 1627sub _draw {
1255 my ($self) = @_; 1628 my ($self) = @_;
1256 1629
1630 $self->SUPER::_draw; # draw background, if applicable
1631
1257 my $tex = $self->{texture} ||= do { 1632 my $tex = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639
1261 new_from_layout CFClient::Texture $self->{layout} 1640 new_from_layout CFClient::Texture $self->{layout}
1262 }; 1641 };
1263 1642
1264 glEnable GL_BLEND; 1643 unless (exists $self->{ox}) {
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5);
1647
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5);
1651 };
1652
1266 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1655
1269 glColor @{$self->{fg}}; 1656 glColor_premultiply @{$self->{fg}}
1657 if $tex->{format} == GL_ALPHA;
1270 1658
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}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1284 1660
1285 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1662}
1288 1663
1289############################################################################# 1664#############################################################################
1290 1665
1291package CFClient::UI::EntryBase; 1666package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1679 active_fg => [0, 0, 0],
1305 can_hover => 1, 1680 can_hover => 1,
1306 can_focus => 1, 1681 can_focus => 1,
1307 valign => 0, 1682 valign => 0,
1308 can_events => 1, 1683 can_events => 1,
1684 #text => ...
1309 @_ 1685 @_
1310 ) 1686 )
1311} 1687}
1312 1688
1313sub _set_text { 1689sub _set_text {
… …
1315 1691
1316 delete $self->{cur_h}; 1692 delete $self->{cur_h};
1317 1693
1318 return if $self->{text} eq $text; 1694 return if $self->{text} eq $text;
1319 1695
1320 delete $self->{texture};
1321
1322 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1323 $self->{text} = $text; 1697 $self->{text} = $text;
1324 1698
1325 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1327 1702
1328 $self->emit (changed => $self->{text}); 1703 $self->_emit (changed => $self->{text});
1704
1705 $self->realloc;
1706 $self->update;
1707}
1708
1709sub set_text {
1710 my ($self, $text) = @_;
1711
1712 $self->{cursor} = length $text;
1713 $self->_set_text ($text);
1329} 1714}
1330 1715
1331sub get_text { 1716sub get_text {
1332 $_[0]{text} 1717 $_[0]{text}
1333} 1718}
… …
1336 my ($self) = @_; 1721 my ($self) = @_;
1337 1722
1338 my ($w, $h) = $self->SUPER::size_request; 1723 my ($w, $h) = $self->SUPER::size_request;
1339 1724
1340 ($w + 1, $h) # add 1 for cursor 1725 ($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} 1726}
1356 1727
1357sub key_down { 1728sub key_down {
1358 my ($self, $ev) = @_; 1729 my ($self, $ev) = @_;
1359 1730
… …
1361 my $sym = $ev->{sym}; 1732 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1733 my $uni = $ev->{unicode};
1363 1734
1364 my $text = $self->get_text; 1735 my $text = $self->get_text;
1365 1736
1366 if ($sym == 8) { 1737 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1739 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1740 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1741 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1742 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1743 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1744 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1745 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1746 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1747 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1748 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1749 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1750 $self->_emit ('escape');
1380 } elsif ($uni) { 1751 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1752 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else {
1754 return 0;
1382 } 1755 }
1383 1756
1384 $self->_set_text ($text); 1757 $self->_set_text ($text);
1385 $self->update; 1758
1759 $self->realloc;
1760
1761 1
1386} 1762}
1387 1763
1388sub focus_in { 1764sub focus_in {
1389 my ($self) = @_; 1765 my ($self) = @_;
1390 1766
… …
1405 utf8::encode $text; 1781 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx; 1782 $self->{cursor} = length substr $text, 0, $idx;
1407 1783
1408 $self->_set_text ($self->{text}); 1784 $self->_set_text ($self->{text});
1409 $self->update; 1785 $self->update;
1786
1787 1
1410} 1788}
1411 1789
1412sub mouse_motion { 1790sub mouse_motion {
1413 my ($self, $ev, $x, $y) = @_; 1791 my ($self, $ev, $x, $y) = @_;
1414# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793
1794 0
1415} 1795}
1416 1796
1417sub _draw { 1797sub _draw {
1418 my ($self) = @_; 1798 my ($self) = @_;
1419 1799
1420 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1421 1801
1422 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1423 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1424 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1425 } else { 1805 } else {
1426 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1427 } 1807 }
1428 1808
1429 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1431 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1432 glVertex 0 , 0; 1812 glVertex 0 , 0;
1433 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1434 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1435 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1466 my ($self, $ev) = @_; 1846 my ($self, $ev) = @_;
1467 1847
1468 my $sym = $ev->{sym}; 1848 my $sym = $ev->{sym};
1469 1849
1470 if ($sym == 13) { 1850 if ($sym == 13) {
1851 unshift @{$self->{history}},
1852 my $txt = $self->get_text;
1853 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = '';
1471 $self->emit (activate => $self->get_text); 1855 $self->_emit (activate => $txt);
1472 $self->update; 1856 $self->update;
1473 1857
1858 } elsif ($sym == CFClient::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text;
1861 }
1862 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++;
1864 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1865 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 }
1869
1870 } elsif ($sym == CFClient::SDLK_DOWN) {
1871 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873
1874 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else {
1877 $self->set_text ($self->{history_saveback});
1878 }
1879
1474 } else { 1880 } else {
1475 $self->SUPER::key_down ($ev); 1881 return $self->SUPER::key_down ($ev)
1882 }
1883
1476 } 1884 1
1477
1478} 1885}
1479 1886
1480############################################################################# 1887#############################################################################
1481 1888
1482package CFClient::UI::Button; 1889package CFClient::UI::Button;
… …
1491 1898
1492sub new { 1899sub new {
1493 my $class = shift; 1900 my $class = shift;
1494 1901
1495 $class->SUPER::new ( 1902 $class->SUPER::new (
1496 padding => 4, 1903 padding_x => 4,
1904 padding_y => 4,
1497 fg => [1, 1, 1], 1905 fg => [1, 1, 1],
1498 bg => [1, 1, 1, 0.2],
1499 active_fg => [0, 0, 1], 1906 active_fg => [0, 0, 1],
1500 can_hover => 1, 1907 can_hover => 1,
1501 align => 0, 1908 align => 0,
1502 valign => 0, 1909 valign => 0,
1503 can_events => 1, 1910 can_events => 1,
1504 @_ 1911 @_
1505 ) 1912 )
1506} 1913}
1507 1914
1915sub activate { }
1916
1508sub button_up { 1917sub button_up {
1509 my ($self, $ev, $x, $y) = @_; 1918 my ($self, $ev, $x, $y) = @_;
1510 1919
1920 $self->emit ("activate")
1511 if ($x >= 0 && $x < $self->{w} 1921 if $x >= 0 && $x < $self->{w}
1512 && $y >= 0 && $y < $self->{h}) { 1922 && $y >= 0 && $y < $self->{h};
1513 $self->emit ("activate"); 1923
1514 } 1924 1
1515} 1925}
1516 1926
1517sub _draw { 1927sub _draw {
1518 my ($self) = @_; 1928 my ($self) = @_;
1519 1929
1520 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1521 1931
1522 if ($GRAB == $self) {
1523 $self->{fg} = $self->{active_fg};
1524 }
1525
1526 glEnable GL_BLEND;
1527 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1528 glEnable GL_TEXTURE_2D; 1932 glEnable GL_TEXTURE_2D;
1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1530 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1531 1935
1532 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1533 1937
1534 glDisable GL_TEXTURE_2D; 1938 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536 1939
1537 $self->SUPER::_draw; 1940 $self->SUPER::_draw;
1538} 1941}
1539 1942
1540############################################################################# 1943#############################################################################
… …
1551 1954
1552sub new { 1955sub new {
1553 my $class = shift; 1956 my $class = shift;
1554 1957
1555 $class->SUPER::new ( 1958 $class->SUPER::new (
1556 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1557 fg => [1, 1, 1], 1961 fg => [1, 1, 1],
1558 active_fg => [1, 1, 0], 1962 active_fg => [1, 1, 0],
1963 bg => [0, 0, 0, 0.2],
1964 active_bg => [1, 1, 1, 0.5],
1559 state => 0, 1965 state => 0,
1560 can_hover => 1, 1966 can_hover => 1,
1561 @_ 1967 @_
1562 ) 1968 )
1563} 1969}
1564 1970
1565sub size_request { 1971sub size_request {
1566 my ($self) = @_; 1972 my ($self) = @_;
1567 1973
1568 ($self->{padding} * 2 + 6) x 2 1974 (6) x 2
1569} 1975}
1570 1976
1571sub button_down { 1977sub button_down {
1572 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1573 1979
1574 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1575 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1576 $self->{state} = !$self->{state}; 1982 $self->{state} = !$self->{state};
1577 $self->emit (changed => $self->{state}); 1983 $self->_emit (changed => $self->{state});
1984 } else {
1985 return 0
1986 }
1987
1578 } 1988 1
1579} 1989}
1580 1990
1581sub _draw { 1991sub _draw {
1582 my ($self) = @_; 1992 my ($self) = @_;
1583 1993
1584 $self->SUPER::_draw; 1994 $self->SUPER::_draw;
1585 1995
1586 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1587 1997
1588 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1998 my ($w, $h) = @$self{qw(w h)};
1999
2000 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1589 2001
1590 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2002 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1591 2003
1592 glEnable GL_BLEND; 2004 my $tex = $self->{state} ? $tex[1] : $tex[0];
2005
1593 glEnable GL_TEXTURE_2D; 2006 glEnable GL_TEXTURE_2D;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595
1596 my $tex = $self->{state} ? $tex[1] : $tex[0];
1597
1598 $tex->draw_quad (0, 0, $s, $s); 2007 $tex->draw_quad_alpha (0, 0, $s, $s);
1599
1600 glDisable GL_TEXTURE_2D; 2008 glDisable GL_TEXTURE_2D;
1601 glDisable GL_BLEND;
1602} 2009}
1603 2010
1604############################################################################# 2011#############################################################################
1605 2012
1606package CFClient::UI::Image; 2013package CFClient::UI::Image;
… …
1649 glTranslate 0, -$self->{w}, 0; 2056 glTranslate 0, -$self->{w}, 0;
1650 2057
1651 ($w, $h) = ($h, $w); 2058 ($w, $h) = ($h, $w);
1652 } 2059 }
1653 2060
1654 glEnable GL_BLEND;
1655 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1656 glEnable GL_TEXTURE_2D; 2061 glEnable GL_TEXTURE_2D;
1657 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1658 2063
1659 $tex->draw_quad (0, 0, $w, $h); 2064 $tex->draw_quad_alpha (0, 0, $w, $h);
1660 2065
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D; 2066 glDisable GL_TEXTURE_2D;
1663} 2067}
1664 2068
1665############################################################################# 2069#############################################################################
1666 2070
… …
1714} 2118}
1715 2119
1716sub set_max { 2120sub set_max {
1717 my ($self, $max) = @_; 2121 my ($self, $max) = @_;
1718 2122
2123 return if $self->{max_val} == $max;
2124
1719 $self->{max_val} = $max; 2125 $self->{max_val} = $max;
2126 $self->update;
1720} 2127}
1721 2128
1722sub set_value { 2129sub set_value {
1723 my ($self, $val, $max) = @_; 2130 my ($self, $val, $max) = @_;
1724 2131
1725 $self->set_max ($max) 2132 $self->set_max ($max)
1726 if defined $max; 2133 if defined $max;
1727 2134
1728 $max = $self->{max_val}; 2135 return if $self->{val} == $val;
2136
1729 $self->{val} = $val; 2137 $self->{val} = $val;
1730
1731 $self->update; 2138 $self->update;
1732} 2139}
1733 2140
1734sub _draw { 2141sub _draw {
1735 my ($self) = @_; 2142 my ($self) = @_;
… …
1753 2160
1754 my $h1 = $self->{h} * (1 - $ycut1); 2161 my $h1 = $self->{h} * (1 - $ycut1);
1755 my $h2 = $self->{h} * (1 - $ycut2); 2162 my $h2 = $self->{h} * (1 - $ycut2);
1756 2163
1757 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
1758 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1759 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1761 2169
1762 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
1763 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
… …
1798 2206
1799sub new { 2207sub new {
1800 my ($class, %arg) = @_; 2208 my ($class, %arg) = @_;
1801 2209
1802 my $self = $class->SUPER::new ( 2210 my $self = $class->SUPER::new (
1803 tooltip => $arg{type}, 2211 tooltip => $arg{type},
1804 can_hover => 1, 2212 can_hover => 1,
2213 can_events => 1,
1805 %arg, 2214 %arg,
1806 ); 2215 );
1807 2216
1808 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2217 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1809 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2218 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1817 2226
1818 $self->{value}->set_fontsize ($fsize); 2227 $self->{value}->set_fontsize ($fsize);
1819 $self->{max} ->set_fontsize ($fsize); 2228 $self->{max} ->set_fontsize ($fsize);
1820} 2229}
1821 2230
2231sub set_max {
2232 my ($self, $max) = @_;
2233
2234 $self->{gauge}->set_max ($max);
2235 $self->{max}->set_text ($max);
2236}
2237
1822sub set_value { 2238sub set_value {
1823 my ($self, $val, $max) = @_; 2239 my ($self, $val, $max) = @_;
1824 2240
1825 $self->set_max ($max) 2241 $self->set_max ($max)
1826 if defined $max; 2242 if defined $max;
1827 2243
1828 $self->{gauge}->set_value ($val, $max); 2244 $self->{gauge}->set_value ($val, $max);
1829 $self->{value}->set_text ($val); 2245 $self->{value}->set_text ($val);
1830}
1831
1832sub set_max {
1833 my ($self, $max) = @_;
1834
1835 $self->{gauge}->set_max ($max);
1836 $self->{max}->set_text ($max);
1837} 2246}
1838 2247
1839############################################################################# 2248#############################################################################
1840 2249
1841package CFClient::UI::Slider; 2250package CFClient::UI::Slider;
… …
1851 qw(s1_slider.png s1_slider_bg.png); 2260 qw(s1_slider.png s1_slider_bg.png);
1852 2261
1853sub new { 2262sub new {
1854 my $class = shift; 2263 my $class = shift;
1855 2264
1856 # range [value, low, high, page] 2265 # range [value, low, high, page, unit]
1857 2266
1858 # TODO: 0-width page 2267 # TODO: 0-width page
1859 # TODO: req_w/h are wrong with vertical 2268 # TODO: req_w/h are wrong with vertical
1860 # TODO: calculations are off 2269 # TODO: calculations are off
1861 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
1862 fg => [1, 1, 1], 2271 fg => [1, 1, 1],
1863 active_fg => [0, 0, 0], 2272 active_fg => [0, 0, 0],
2273 bg => [0, 0, 0, 0.2],
2274 active_bg => [1, 1, 1, 0.5],
1864 range => [0, 0, 100, 10], 2275 range => [0, 0, 100, 10, 0],
1865 req_w => 20, 2276 min_w => $::WIDTH / 80,
1866 req_h => 20, 2277 min_h => $::WIDTH / 80,
1867 vertical => 0, 2278 vertical => 0,
1868 can_hover => 1, 2279 can_hover => 1,
1869 inner_pad => 5, 2280 inner_pad => 0.02,
1870 @_ 2281 @_
1871 ); 2282 );
1872 2283
2284 $self->set_value ($self->{range}[0]);
2285 $self->update;
2286
1873 $self 2287 $self
1874} 2288}
1875 2289
2290sub changed { }
2291
2292sub set_range {
2293 my ($self, $range) = @_;
2294
2295 ($range, $self->{range}) = ($self->{range}, $range);
2296
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}";
2299}
2300
2301sub set_value {
2302 my ($self, $value) = @_;
2303
2304 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2305
2306 $hi = $lo + 1 if $hi <= $lo;
2307
2308 $page = $hi - $lo if $page > $hi - $lo;
2309
2310 $value = $lo if $value < $lo;
2311 $value = $hi - $page if $value > $hi - $page;
2312
2313 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2314 if $unit;
2315
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317
2318 if ($value != $old_value) {
2319 $self->_emit (changed => $value);
2320 $self->update;
2321 }
2322}
2323
1876sub size_request { 2324sub size_request {
1877 my ($self) = @_; 2325 my ($self) = @_;
1878 2326
1879 my $w = $self->{req_w}; 2327 ($self->{req_w}, $self->{req_h})
1880 my $h = $self->{req_h};
1881
1882 $self->{vertical} ? ($h, $w) : ($w, $h)
1883} 2328}
1884 2329
1885sub button_down { 2330sub button_down {
1886 my ($self, $ev, $x, $y) = @_; 2331 my ($self, $ev, $x, $y) = @_;
1887 2332
1888 $self->SUPER::button_down ($ev, $x, $y); 2333 $self->SUPER::button_down ($ev, $x, $y);
2334
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336
1889 $self->mouse_motion ($ev, $x, $y); 2337 $self->mouse_motion ($ev, $x, $y)
1890} 2338}
1891 2339
1892sub mouse_motion { 2340sub mouse_motion {
1893 my ($self, $ev, $x, $y) = @_; 2341 my ($self, $ev, $x, $y) = @_;
1894 2342
1895 if ($GRAB == $self) { 2343 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345
2346 my (undef, $lo, $hi, $page) = @{$self->{range}};
2347
2348 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2349
2350 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2351 } else {
2352 return 0;
2353 }
2354
2355 1
2356}
2357
2358sub update {
2359 my ($self) = @_;
2360
2361 delete $self->{knob_w};
2362 $self->SUPER::update;
2363}
2364
2365sub _draw {
2366 my ($self) = @_;
2367
2368 unless ($self->{knob_w}) {
2369 $self->set_value ($self->{range}[0]);
2370
1896 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2371 my ($value, $lo, $hi, $page) = @{$self->{range}};
2372 my $range = ($hi - $page - $lo) || 1e-100;
1897 2373
1898 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2374 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1899 2375
1900 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2376 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1901 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2377 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1902 2378
1903 $x -= $inner_pad_px; # substract the padding 2379 $value = ($value - $lo) / $range;
1904 $x = $x * ($hi - $lo) / $inner_w + $lo; 2380 $value = $value * $self->{scale} + $self->{offset};
1905 $x = $lo if $x < $lo;
1906 $x = $hi - $page if $x > $hi - $page;
1907 $self->{range}[0] = $x;
1908 2381
1909 $self->emit (changed => $x); 2382 $self->{knob_x} = $value - $knob_w * 0.5;
1910 $self->update; 2383 $self->{knob_w} = $knob_w;
1911 } 2384 }
1912}
1913
1914# the inner_* stuff is for generating a padding for the slider handle,
1915# so that the handle doesn't leave the texture. This calculation isn't 100%
1916# correct propably, but it does the job for now
1917sub _calc_inner_pad_px {
1918 my ($self, $w) = @_;
1919 ($w / 100) * $self->{inner_pad} # % to pixels
1920}
1921
1922sub _draw {
1923 my ($self) = @_;
1924 2385
1925 $self->SUPER::_draw (); 2386 $self->SUPER::_draw ();
1926 2387
1927 my ($w, $h) = @$self{qw(w h)}; 2388 glScale $self->{w}, $self->{h};
1928 2389
1929 if ($self->{vertical}) { 2390 if ($self->{vertical}) {
1930 # draw a vertical slider like a rotated horizontal slider 2391 # draw a vertical slider like a rotated horizontal slider
1931 2392
2393 glTranslate 1, 0, 0;
1932 glRotate 90, 0, 0, 1; 2394 glRotate 90, 0, 0, 1;
1933 glTranslate 0, -$self->{w}, 0;
1934
1935 ($w, $h) = ($h, $w);
1936 } 2395 }
1937 2396
1938 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2397 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1939 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2398 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1940 2399
1941 my ($value, $lo, $hi, $page) = @{$self->{range}};
1942
1943 $hi = $value + 1 if $lo == $hi;
1944
1945 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1946 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1947
1948 $page = int $page * $inner_w / ($hi - $lo);
1949 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1950
1951 $w -= $page;
1952 $page &= ~1;
1953 glTranslate $page * 0.5, 0, 0;
1954 $page ||= 2;
1955
1956 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1957 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963 2402
1964 # draw background 2403 # draw background
1965 $tex[1]->draw_quad (0, 0, $w, $h); 2404 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1966 2405
1967 # draw handle 2406 # draw handle
1968 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2407 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1969 2408
1970 glDisable GL_BLEND;
1971 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1972} 2410}
2411
2412#############################################################################
2413
2414package CFClient::UI::ValSlider;
2415
2416our @ISA = CFClient::UI::HBox::;
2417
2418sub new {
2419 my ($class, %arg) = @_;
2420
2421 my $range = delete $arg{range};
2422
2423 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift },
2427 from_value => sub { shift },
2428 %arg,
2429 );
2430
2431 $self->{slider}->connect (changed => sub {
2432 my ($self, $value) = @_;
2433 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2434 $self->{parent}->emit (changed => $value);
2435 });
2436
2437# $self->{entry}->connect (changed => sub {
2438# my ($self, $value) = @_;
2439# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2440# $self->{parent}->emit (changed => $value);
2441# });
2442
2443 $self->add ($self->{slider}, $self->{entry});
2444
2445 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2446
2447 $self
2448}
2449
2450sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) }
1973 2452
1974############################################################################# 2453#############################################################################
1975 2454
1976package CFClient::UI::TextView; 2455package CFClient::UI::TextView;
1977 2456
… …
1986 fontsize => 1, 2465 fontsize => 1,
1987 can_events => 0, 2466 can_events => 0,
1988 #font => default_font 2467 #font => default_font
1989 @_, 2468 @_,
1990 2469
1991 layout => (new CFClient::Layout), 2470 layout => (new CFClient::Layout 1),
1992 par => [], 2471 par => [],
1993 height => 0, 2472 height => 0,
1994 children => [ 2473 children => [
1995 (new CFClient::UI::Empty expand => 1), 2474 (new CFClient::UI::Empty expand => 1),
1996 (new CFClient::UI::Slider vertical => 1), 2475 (new CFClient::UI::Slider vertical => 1),
1997 ], 2476 ],
1998 ); 2477 );
1999 2478
2000 $self->{children}[1]->connect (changed => sub { 2479 $self->{children}[1]->connect (changed => sub { $self->update });
2001 $self->update;
2002 });
2003 2480
2004 $self 2481 $self
2005} 2482}
2006 2483
2007sub set_fontsize { 2484sub set_fontsize {
2008 my ($self, $fontsize) = @_; 2485 my ($self, $fontsize) = @_;
2009 2486
2010 $self->{fontsize} = $fontsize; 2487 $self->{fontsize} = $fontsize;
2011 $self->reflow; 2488 $self->reflow;
2012}
2013
2014sub text_height {
2015 my ($self, $text) = @_;
2016
2017 my $layout = $self->{layout};
2018
2019 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2020 $layout->set_width ($self->{w});
2021 $layout->set_text ($text);
2022
2023 ($layout->size)[1]
2024}
2025
2026sub reflow {
2027 my ($self) = @_;
2028
2029 $self->{need_reflow}++;
2030 $self->update;
2031} 2489}
2032 2490
2033sub size_allocate { 2491sub size_allocate {
2034 my ($self, $w, $h) = @_; 2492 my ($self, $w, $h) = @_;
2035 2493
… …
2040 $self->{layout}->set_width ($self->{children}[0]{w}); 2498 $self->{layout}->set_width ($self->{children}[0]{w});
2041 2499
2042 $self->reflow; 2500 $self->reflow;
2043} 2501}
2044 2502
2503sub text_size {
2504 my ($self, $text, $indent) = @_;
2505
2506 my $layout = $self->{layout};
2507
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent);
2510 $layout->set_markup ($text);
2511
2512 $layout->size
2513}
2514
2515sub reflow {
2516 my ($self) = @_;
2517
2518 $self->{need_reflow}++;
2519 $self->update;
2520}
2521
2522sub set_offset {
2523 my ($self, $offset) = @_;
2524
2525 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset);
2527}
2528
2529sub clear {
2530 my ($self) = @_;
2531
2532 $self->{par} = [];
2533 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535}
2536
2045sub add_paragraph { 2537sub add_paragraph {
2046 my ($self, $color, $text) = @_; 2538 my ($self, $color, $text, $indent) = @_;
2047 2539
2048 #TODO: intelligently "reformat" paragraph 2540 for my $line (split /\n/, $text) {
2049 2541 my ($w, $h) = $self->text_size ($line);
2050 my $height = $self->text_height ($text);
2051
2052 $self->{height} += $height; 2542 $self->{height} += $h;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2544 }
2053 2545
2054 push @{$self->{par}}, [$height, $color, $text];
2055
2056 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2057 $self->{children}[1]->update;
2058} 2547}
2059 2548
2060sub update { 2549sub update {
2061 my ($self) = @_; 2550 my ($self) = @_;
2062 2551
… …
2064 2553
2065 return unless $self->{h} > 0; 2554 return unless $self->{h} > 0;
2066 2555
2067 delete $self->{texture}; 2556 delete $self->{texture};
2068 2557
2069 $ROOT->on_refresh ($self, sub { 2558 $ROOT->on_post_alloc ($self, sub {
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560
2070 if (delete $self->{need_reflow}) { 2561 if (delete $self->{need_reflow}) {
2071 my $height = 0; 2562 my $height = 0;
2072 2563
2073 $height += $_->[0] = $self->text_height ($_->[2]) 2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2074 for @{$self->{par}}; 2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2075 2579
2076 $self->{height} = $height; 2580 $self->{height} = $height;
2077 2581
2078 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2079 2583
2080 delete $self->{texture}; 2584 delete $self->{texture};
2081 } 2585 }
2082 2586
2083 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2084 glClearColor 0, 0, 0, 1; 2588 glClearColor 0, 0, 0, 0;
2085 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2086 2590
2591 my $top = int $self->{children}[1]{range}[0];
2592
2593 my $y0 = $top;
2594 my $y1 = $top + $H;
2595
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2087 glEnable GL_BLEND; 2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091
2092 my $top = int $self->{children}[1]{range}[0];
2093
2094 my $y0 = $top;
2095 my $y1 = $top + $self->{h};
2096
2097 my $y = 0;
2098
2099 my $layout = $self->{layout};
2100
2101 $layout->set_font ($self->{font}) if $self->{font};
2102 2605
2103 for my $par (@{$self->{par}}) { 2606 for my $par (@{$self->{par}}) {
2104 my $h = $par->[0]; 2607 my $h = $par->[1];
2105 2608
2106 if ($y0 < $y + $h && $y < $y1) { 2609 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] });
2611 $layout->set_width ($W - $par->[3]);
2107 $layout->set_text ($par->[2]); 2612 $layout->set_markup ($par->[4]);
2108 2613
2109 glColor @{ $par->[1] }; 2614 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2110 my ($W, $H) = $layout->size; 2615
2111 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2616 glRasterPos $par->[3], $y - $y0;
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2112 } 2618 }
2113 2619
2114 $y += $h; 2620 $y += $h;
2115 } 2621 }
2116 2622
2117 glDisable GL_TEXTURE_2D;
2118 glDisable GL_BLEND; 2623 glDisable GL_BLEND;
2119 }; 2624 };
2120 }); 2625 });
2121} 2626}
2122 2627
2123sub _draw { 2628sub _draw {
2124 my ($self) = @_; 2629 my ($self) = @_;
2125 2630
2126 if ($self->{texture}) {
2127 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2129 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2633 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2130 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2131 }
2132 2636
2133 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2134 2638
2135} 2639}
2136 2640
… …
2184 2688
2185sub new { 2689sub new {
2186 my $class = shift; 2690 my $class = shift;
2187 2691
2188 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2189 state => 0, 2693 state => 0,
2190 connect_activate => \&toggle_flopper, 2694 on_activate => \&toggle_flopper,
2191 @_ 2695 @_
2192 ); 2696 );
2193 2697
2194 if ($self->{state}) {
2195 $self->{state} = 0;
2196 $self->toggle_flopper;
2197 }
2198
2199 $self 2698 $self
2200} 2699}
2201 2700
2202sub toggle_flopper { 2701sub toggle_flopper {
2203 my ($self) = @_; 2702 my ($self) = @_;
2204 2703
2205 # TODO: use animation 2704 $self->{other}->toggle_visibility;
2206 if ($self->{state} = !$self->{state}) {
2207 $CFClient::UI::ROOT->add ($self->{other});
2208 $self->{other}->move ($self->coord2global (0, $self->{h}));
2209 $self->emit ("open");
2210 } else {
2211 $CFClient::UI::ROOT->remove ($self->{other});
2212 $self->emit ("close");
2213 }
2214
2215 $self->emit (changed => $self->{state});
2216} 2705}
2217 2706
2218############################################################################# 2707#############################################################################
2219 2708
2220package CFClient::UI::Tooltip; 2709package CFClient::UI::Tooltip;
… …
2230 @_, 2719 @_,
2231 can_events => 0, 2720 can_events => 0,
2232 ) 2721 )
2233} 2722}
2234 2723
2235sub set_markup { 2724sub set_tooltip_from {
2236 my ($self, $text) = @_; 2725 my ($self, $widget) = @_;
2237 2726
2238 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2727 my $tooltip = $widget->{tooltip};
2239 $self->{label}->set_markup ($text); 2728
2240 $self->add ($self->{label}); 2729 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}";
2734 }
2735
2736 $self->add (new CFClient::UI::Label
2737 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8,
2740 fg => [0, 0, 0, 1],
2741 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 );
2241} 2744}
2242 2745
2243sub size_request { 2746sub size_request {
2244 my ($self) = @_; 2747 my ($self) = @_;
2245
2246 $self->child->set_max_size ($::WIDTH * 0.3);
2247 2748
2248 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249 2750
2250 ($w + 4, $h + 4) 2751 ($w + 4, $h + 4)
2251} 2752}
… …
2254 my ($self, $w, $h) = @_; 2755 my ($self, $w, $h) = @_;
2255 2756
2256 $self->SUPER::size_allocate ($w - 4, $h - 4); 2757 $self->SUPER::size_allocate ($w - 4, $h - 4);
2257} 2758}
2258 2759
2760sub visibility_change {
2761 my ($self, $visible) = @_;
2762
2763 return unless $visible;
2764
2765 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner}
2767 or return;
2768
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH;
2773
2774 $self->move_abs ($x, $y);
2775 });
2776}
2777
2259sub _draw { 2778sub _draw {
2260 my ($self) = @_; 2779 my ($self) = @_;
2261 2780
2262 glPushMatrix;
2263 glTranslate 0.375, 0.375; 2781 glTranslate 0.375, 0.375;
2264 2782
2265 my ($w, $h) = @$self{qw(w h)}; 2783 my ($w, $h) = @$self{qw(w h)};
2266 2784
2267 glColor 1, 0.8, 0.4; 2785 glColor 1, 0.8, 0.4;
… …
2278 glVertex 0 , $h; 2796 glVertex 0 , $h;
2279 glVertex $w, $h; 2797 glVertex $w, $h;
2280 glVertex $w, 0; 2798 glVertex $w, 0;
2281 glEnd; 2799 glEnd;
2282 2800
2283 glPopMatrix; 2801 glTranslate 2 - 0.375, 2 - 0.375;
2284 2802
2285 glTranslate 2, 2;
2286 $self->SUPER::_draw; 2803 $self->SUPER::_draw;
2287} 2804}
2288 2805
2289############################################################################# 2806#############################################################################
2290 2807
… …
2295use CFClient::OpenGL; 2812use CFClient::OpenGL;
2296 2813
2297sub new { 2814sub new {
2298 my $class = shift; 2815 my $class = shift;
2299 2816
2300 $class->SUPER::new ( 2817 my $self = $class->SUPER::new (
2301 aspect => 1, 2818 aspect => 1,
2819 can_events => 0,
2820 @_,
2821 );
2822
2823 if ($self->{anim} && $self->{animspeed}) {
2824 Scalar::Util::weaken (my $widget = $self);
2825
2826 $self->{timer} = Event->timer (
2827 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828 hard => 1,
2829 interval => $self->{animspeed},
2830 cb => sub {
2831 ++$widget->{frame};
2832 $widget->update;
2833 },
2834 );
2835 }
2836
2837 $self
2838}
2839
2840sub size_request {
2841 (32, 8)
2842}
2843
2844sub update {
2845 my ($self) = @_;
2846
2847 return unless $self->{visible};
2848
2849 $self->SUPER::update;
2850}
2851
2852sub _draw {
2853 my ($self) = @_;
2854
2855 return unless $::CONN;
2856
2857 my $face;
2858
2859 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}];
2861
2862 $face = $anim->[ $self->{frame} % @$anim ]
2863 if $anim && @$anim;
2864 }
2865
2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2867
2868 if ($tex) {
2869 glEnable GL_TEXTURE_2D;
2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871 glColor 0, 0, 0, 1;
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D;
2874 }
2875}
2876
2877sub DESTROY {
2878 my ($self) = @_;
2879
2880 $self->{timer}->cancel
2881 if $self->{timer};
2882
2883 $self->SUPER::DESTROY;
2884}
2885
2886#############################################################################
2887
2888package CFClient::UI::Buttonbar;
2889
2890our @ISA = CFClient::UI::HBox::;
2891
2892# TODO: should actualyl wrap buttons and other goodies.
2893
2894#############################################################################
2895
2896package CFClient::UI::Menu;
2897
2898our @ISA = CFClient::UI::FancyFrame::;
2899
2900use CFClient::OpenGL;
2901
2902sub new {
2903 my $class = shift;
2904
2905 my $self = $class->SUPER::new (
2906 items => [],
2907 z => 100,
2908 @_,
2909 );
2910
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2912
2913 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item;
2915
2916 # handle various types of items, only text for now
2917 if (!ref $widget) {
2918 $widget = new CFClient::UI::Label
2919 can_hover => 1,
2920 can_events => 1,
2921 text => $widget;
2922 }
2923
2924 $self->{item}{$widget} = $item;
2925
2926 $self->{vbox}->add ($widget);
2927 }
2928
2929 $self
2930}
2931
2932# popup given the event (must be a mouse button down event currently)
2933sub popup {
2934 my ($self, $ev) = @_;
2935
2936 $self->_emit ("popdown");
2937
2938 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self;
2940 $self->{button} = $ev->{button};
2941
2942 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944}
2945
2946sub mouse_motion {
2947 my ($self, $ev, $x, $y) = @_;
2948
2949 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER};
2952
2953 0
2954}
2955
2956sub button_up {
2957 my ($self, $ev, $x, $y) = @_;
2958
2959 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB;
2961 $self->hide;
2962
2963 $self->_emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover};
2965 } else {
2966 return 0
2967 }
2968
2969 1
2970}
2971
2972#############################################################################
2973
2974package CFClient::UI::Multiplexer;
2975
2976our @ISA = CFClient::UI::Container::;
2977
2978sub new {
2979 my $class = shift;
2980
2981 my $self = $class->SUPER::new (
2982 @_,
2983 );
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987
2988 $self
2989}
2990
2991sub add {
2992 my ($self, @widgets) = @_;
2993
2994 $self->SUPER::add (@widgets);
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998}
2999
3000sub set_current_page {
3001 my ($self, $page_or_widget) = @_;
3002
3003 my $widget = ref $page_or_widget
3004 ? $page_or_widget
3005 : $self->{children}[$page_or_widget];
3006
3007 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009
3010 $self->_emit (page_changed => $self->{current});
3011
3012 $self->realloc;
3013}
3014
3015sub visible_children {
3016 $_[0]{current}
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 $self->{current}->size_request
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
3028 $self->{current}->configure (0, 0, $w, $h);
3029}
3030
3031sub _draw {
3032 my ($self) = @_;
3033
3034 $self->{current}->draw;
3035}
3036
3037#############################################################################
3038
3039package CFClient::UI::Notebook;
3040
3041our @ISA = CFClient::UI::VBox::;
3042
3043sub new {
3044 my $class = shift;
3045
3046 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self
3050 @_,
3051 );
3052
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055
3056 $self
3057}
3058
3059sub add {
3060 my ($self, $title, $widget, $tooltip) = @_;
3061
3062 Scalar::Util::weaken $self;
3063
3064 $self->{buttonbar}->add (new CFClient::UI::Button
3065 markup => $title,
3066 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) },
3068 );
3069
3070 $self->{multiplexer}->add ($widget);
3071}
3072
3073sub set_current_page {
3074 my ($self, $page) = @_;
3075
3076 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current});
3078}
3079
3080#############################################################################
3081
3082package CFClient::UI::Statusbox;
3083
3084our @ISA = CFClient::UI::VBox::;
3085
3086sub new {
3087 my $class = shift;
3088
3089 my $self = $class->SUPER::new (
3090 fontsize => 0.8,
3091 @_,
3092 );
3093
3094 Scalar::Util::weaken (my $this = $self);
3095
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097
3098 $self
3099}
3100
3101sub reorder {
3102 my ($self) = @_;
3103 my $NOW = Time::HiRes::time;
3104
3105 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} };
3109
3110 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 }
3113
3114 my @widgets;
3115
3116 my @items = sort {
3117 $a->{pri} <=> $b->{pri}
3118 or $b->{id} <=> $a->{id}
3119 } values %{ $self->{item} };
3120
3121 $self->{timer}->interval (1);
3122
3123 my $count = 10 + 1;
3124 for my $item (@items) {
3125 last unless --$count;
3126
3127 my $label = $item->{label} ||= do {
3128 # TODO: doesn't handle markup well (read as: at all)
3129 my $short = $item->{count} > 1
3130 ? "<b>$item->{count} ×</b> $item->{text}"
3131 : $item->{text};
3132
3133 for ($short) {
3134 s/^\s+//;
3135 s/\s+/ /g;
3136 }
3137
3138 new CFClient::UI::Label
3139 markup => $short,
3140 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize},
3144 max_w => $::WIDTH * 0.44,
3145 fg => [@{ $item->{fg} }],
3146 can_events => 1,
3147 can_hover => 1
3148 };
3149
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1;
3155 $self->{timer}->interval (1/30);
3156 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 }
3159
3160 push @widgets, $label;
3161 }
3162
3163 $self->clear;
3164 $self->SUPER::add (reverse @widgets);
3165}
3166
3167sub add {
3168 my ($self, $text, %arg) = @_;
3169
3170 $text =~ s/^\s+//;
3171 $text =~ s/\s+$//;
3172
3173 return unless $text;
3174
3175 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3176
3177 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3178
3179 if (my $item = $self->{item}{$group}) {
3180 if ($item->{text} eq $text) {
3181 $item->{count}++;
3182 } else {
3183 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text;
3185 }
3186 $item->{id} = ++$self->{id};
3187 $item->{timeout} = $timeout;
3188 delete $item->{label};
3189 } else {
3190 $self->{item}{$group} = {
3191 id => ++$self->{id},
3192 text => $text,
3193 timeout => $timeout,
3194 tooltip => $text,
3195 fg => [0.8, 0.8, 0.8, 0.8],
3196 pri => 0,
3197 count => 1,
3198 %arg,
3199 };
3200 }
3201
3202 $self->reorder;
3203}
3204
3205sub reconfigure {
3206 my ($self) = @_;
3207
3208 delete $_->{label}
3209 for values %{ $self->{item} || {} };
3210
3211 $self->reorder;
3212 $self->SUPER::reconfigure;
3213}
3214
3215sub DESTROY {
3216 my ($self) = @_;
3217
3218 $self->{timer}->cancel;
3219
3220 $self->SUPER::DESTROY;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Inventory;
3226
3227our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
2302 @_, 3474 @_,
2303 ) 3475 )
2304} 3476}
2305 3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root;
3521
3522our @ISA = CFClient::UI::Container::;
3523
3524use List::Util qw(min max);
3525
3526use CFClient::OpenGL;
3527
3528sub new {
3529 my $class = shift;
3530
3531 my $self = $class->SUPER::new (
3532 visible => 1,
3533 @_,
3534 );
3535
3536 Scalar::Util::weaken ($self->{root} = $self);
3537
3538 $self
3539}
3540
2306sub size_request { 3541sub size_request {
2307 (32, 8)
2308}
2309
2310sub draw {
2311 my ($self) = @_; 3542 my ($self) = @_;
2312 3543
2313 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3544 ($self->{w}, $self->{h})
2314
2315 if ($tex) {
2316 glEnable GL_BLEND;
2317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318 glEnable GL_TEXTURE_2D;
2319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320 glColor 1, 1, 1, 1;
2321 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 }
2325} 3545}
2326 3546
2327############################################################################# 3547sub _to_pixel {
3548 my ($coord, $size, $max) = @_;
2328 3549
2329package CFClient::UI::Root; 3550 $coord =
3551 $coord eq "center" ? ($max - $size) * 0.5
3552 : $coord eq "max" ? $max
3553 : $coord;
2330 3554
2331our @ISA = CFClient::UI::Container::; 3555 $coord = 0 if $coord < 0;
3556 $coord = $max - $size if $coord > $max - $size;
2332 3557
2333use CFClient::OpenGL; 3558 int $coord + 0.5
2334
2335sub check_size {
2336 my ($self) = @_;
2337
2338 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2339} 3559}
2340 3560
2341sub size_request { 3561sub size_allocate {
2342 ($::WIDTH, $::HEIGHT)
2343}
2344
2345sub configure {
2346 my ($self, $x, $y, $w, $h) = @_; 3562 my ($self, $w, $h) = @_;
2347 3563
2348 $self->SUPER::configure ($x, $y, $w, $h);
2349
2350 for my $child (@{$self->{children}}) { 3564 for my $child ($self->children) {
2351 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2352 3566
2353 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3567 $X = $child->{force_x} if exists $child->{force_x};
2354 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3568 $Y = $child->{force_y} if exists $child->{force_y};
3569
3570 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h};
3572
2355 $child->configure ($X, $Y, $W,$H); 3573 $child->configure ($X, $Y, $W, $H);
2356 } 3574 }
2357} 3575}
2358 3576
2359sub _topleft { 3577sub coord2local {
2360 my ($self, $x, $y) = @_; 3578 my ($self, $x, $y) = @_;
2361 3579
2362 ($x, $y) 3580 ($x, $y)
2363} 3581}
2364 3582
3583sub coord2global {
3584 my ($self, $x, $y) = @_;
3585
3586 ($x, $y)
3587}
3588
2365sub update { 3589sub update {
2366 my ($self) = @_; 3590 my ($self) = @_;
2367 3591
2368 $self->check_size; 3592 $::WANT_REFRESH++;
2369 ::refresh ();
2370} 3593}
2371 3594
2372sub add { 3595sub add {
2373 my ($self, $child) = @_; 3596 my ($self, @children) = @_;
2374 3597
2375 # integerize window positions 3598 $_->{is_toplevel} = 1
2376 $child->{x} = int $child->{x}; 3599 for @children;
2377 $child->{y} = int $child->{y};
2378 3600
2379 $self->SUPER::add ($child); 3601 $self->SUPER::add (@children);
3602}
3603
3604sub remove {
3605 my ($self, @children) = @_;
3606
3607 $self->SUPER::remove (@children);
3608
3609 delete $self->{is_toplevel}
3610 for @children;
3611
3612 while (@children) {
3613 my $w = pop @children;
3614 push @children, $w->children;
3615 $w->set_invisible;
3616 }
2380} 3617}
2381 3618
2382sub on_refresh { 3619sub on_refresh {
2383 my ($self, $id, $cb) = @_; 3620 my ($self, $id, $cb) = @_;
2384 3621
2385 $self->{refresh_hook}{$id} = $cb; 3622 $self->{refresh_hook}{$id} = $cb;
2386} 3623}
2387 3624
3625sub on_post_alloc {
3626 my ($self, $id, $cb) = @_;
3627
3628 $self->{post_alloc_hook}{$id} = $cb;
3629}
3630
2388sub draw { 3631sub draw {
2389 my ($self) = @_; 3632 my ($self) = @_;
2390 3633
2391 while (my $rcb = delete $self->{refresh_hook}) { 3634 while ($self->{refresh_hook}) {
2392 $_->() for values %$rcb; 3635 $_->()
3636 for values %{delete $self->{refresh_hook}};
2393 } 3637 }
3638
3639 if ($self->{realloc}) {
3640 my %queue;
3641 my @queue;
3642 my $widget;
3643
3644 outer:
3645 while () {
3646 if (my $realloc = delete $self->{realloc}) {
3647 for $widget (values %$realloc) {
3648 $widget->{visible} or next; # do not resize invisible widgets
3649
3650 $queue{$widget+0}++ and next; # duplicates are common
3651
3652 push @{ $queue[$widget->{visible}] }, $widget;
3653 }
3654 }
3655
3656 while () {
3657 @queue or last outer;
3658
3659 $widget = pop @{ $queue[-1] || [] }
3660 and last;
3661
3662 pop @queue;
3663 }
3664
3665 delete $queue{$widget+0};
3666
3667 my ($w, $h) = $widget->size_request;
3668
3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3670 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3671
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3674
3675 $w = $widget->{force_w} if exists $widget->{force_w};
3676 $h = $widget->{force_h} if exists $widget->{force_h};
3677
3678 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3679 || delete $widget->{force_realloc}) {
3680 $widget->{req_w} = $w;
3681 $widget->{req_h} = $h;
3682
3683 $self->{size_alloc}{$widget+0} = $widget;
3684
3685 if (my $parent = $widget->{parent}) {
3686 $self->{realloc}{$parent+0} = $parent
3687 unless $queue{$parent+0};
3688
3689 $parent->{force_size_alloc} = 1;
3690 $self->{size_alloc}{$parent+0} = $parent;
3691 }
3692 }
3693
3694 delete $self->{realloc}{$widget+0};
3695 }
3696 }
3697
3698 while (my $size_alloc = delete $self->{size_alloc}) {
3699 my @queue = sort { $b->{visible} <=> $a->{visible} }
3700 values %$size_alloc;
3701
3702 while () {
3703 my $widget = pop @queue || last;
3704
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706
3707 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0;
3709
3710 $w = int $w + 0.5;
3711 $h = int $h + 0.5;
3712
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w};
3715 $widget->{old_h} = $widget->{h};
3716
3717 $widget->{w} = $w;
3718 $widget->{h} = $h;
3719
3720 $widget->emit (size_allocate => $w, $h);
3721 }
3722 }
3723 }
3724
3725 while ($self->{post_alloc_hook}) {
3726 $_->()
3727 for values %{delete $self->{post_alloc_hook}};
3728 }
3729
2394 3730
2395 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3731 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2396 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2397 glClear GL_COLOR_BUFFER_BIT; 3733 glClear GL_COLOR_BUFFER_BIT;
2398 3734
2399 glMatrixMode GL_PROJECTION; 3735 glMatrixMode GL_PROJECTION;
2400 glLoadIdentity; 3736 glLoadIdentity;
2401 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2402 glMatrixMode GL_MODELVIEW; 3738 glMatrixMode GL_MODELVIEW;
2403 glLoadIdentity; 3739 glLoadIdentity;
2404 3740
3741 {
3742 package CFClient::UI::Base;
3743
3744 ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h});
3746 }
3747
2405 $self->_draw; 3748 $self->_draw;
2406} 3749}
2407 3750
2408############################################################################# 3751#############################################################################
2409 3752
2410package CFClient::UI; 3753package CFClient::UI;
2411 3754
2412$ROOT = new CFClient::UI::Root; 3755$ROOT = new CFClient::UI::Root;
2413$TOOLTIP = new CFClient::UI::Tooltip; 3756$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2414 3757
24151 37581
2416 3759

Diff Legend

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