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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.284 by root, Mon Jun 5 03:06:04 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 {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
17 if (!$GRAB) { 25 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 27 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 28 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide;
30
22 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
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->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
57 90
58 $GRAB = $widget; 91 $GRAB = $widget;
59 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
60 93
61 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
83 118
84 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
85 } 120 }
86} 121}
87 122
88sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
89 my ($ev) = @_; 124 my ($ev) = @_;
… …
95 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
96 131
97 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 $TOOLTIP_WATCHER->start;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 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
119############################################################################# 196#############################################################################
120 197
121package CFClient::UI::Base; 198package CFClient::UI::Base;
122 199
123use strict; 200use strict;
… …
126 203
127sub new { 204sub new {
128 my $class = shift; 205 my $class = shift;
129 206
130 my $self = bless { 207 my $self = bless {
131 x => 0, 208 x => "center",
132 y => 0, 209 y => "center",
133 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
134 can_events => 1, 213 can_events => 1,
135 @_ 214 @_
136 }, $class; 215 }, $class;
137 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
138 for (keys %$self) { 219 for (keys %$self) {
139 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
141 } 222 }
142 } 223 }
143 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
144 $self 237 $self
145} 238}
146 239
147sub destroy { 240sub destroy {
148 my ($self) = @_; 241 my ($self) = @_;
… …
157 return if $self->{parent}; 250 return if $self->{parent};
158 251
159 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
160} 253}
161 254
255sub set_visible {
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};
279
280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self;
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
162sub hide { 308sub hide {
163 my ($self) = @_; 309 my ($self) = @_;
164 310
165 return unless $self->{parent}; 311 $self->set_invisible;
166 312
167 $self->{parent}->remove ($self); 313 $self->{parent}->remove ($self)
314 if $self->{parent};
168} 315}
169 316
170sub move { 317sub move_abs {
171 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
172 319
173 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
176 323
177 $self->update; 324 $self->update;
178} 325}
179 326
180sub set_size { 327sub set_size {
181 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
182 329
183 $self->{user_w} = $w; 330 $self->{force_w} = $w;
184 $self->{user_h} = $h; 331 $self->{force_h} = $h;
185 332
186 $self->check_size; 333 $self->realloc;
187} 334}
188 335
189sub size_request { 336sub size_request {
190 require Carp; 337 require Carp;
191 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
193 340
194sub configure { 341sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
196 343
197 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
200 349
201 # use alignment to adjust x, y 350 # use alignment to adjust x, y
202 351
203 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 354 }
208 355
209 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 357 $self->{x} = $x;
211 $self->{y} = $y; 358 $self->{y} = $y;
212 $self->update; 359 $self->update;
213 } 360 }
214 361
215 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
216 $self->{w} = $w; 365 $self->{alloc_w} = $w;
217 $self->{h} = $h; 366 $self->{alloc_h} = $h;
218 367
219 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 369 }
222} 370}
223 371
224sub size_allocate { 372sub size_allocate {
225 # nothing to be done 373 # nothing to be done
226} 374}
227 375
376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
228sub set_max_size { 384sub set_max_size {
229 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
230 386
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
233}
234 389
235# return top left coordinates 390 $self->realloc;
236sub _topleft { 391}
392
393sub set_tooltip {
237 my ($self, $x, $y) = @_; 394 my ($self, $tooltip) = @_;
238 395
239 $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 }
240} 407}
241 408
242# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
243sub coord2local { 410sub coord2local {
244 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
245 412
246 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 414}
249 415
250# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
251sub coord2global { 417sub coord2global {
252 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
253 419
254 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 421}
257 422
258sub focus_in { 423sub focus_in {
259 my ($self) = @_; 424 my ($self) = @_;
260 425
261 return if $FOCUS == $self; 426 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
263 428
264 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
265 430
266 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
267 432
268 $focus->update if $focus; 433 $focus->update if $focus;
269 $FOCUS->update; 434 $FOCUS->update;
270} 435}
271 436
… …
274 439
275 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
276 441
277 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
278 443
279 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
280 445
281 $focus->update if $focus; #? 446 $focus->update if $focus; #?
282}
283 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
284sub mouse_motion { } 452sub mouse_motion { 0 }
285sub button_up { } 453sub button_up { 0 }
286sub key_down { } 454sub key_down { 0 }
287sub key_up { } 455sub key_up { 0 }
288 456
289sub button_down { 457sub button_down {
290 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
291 459
292 $self->focus_in; 460 $self->focus_in;
293}
294 461
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
299sub 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
300 538
301sub draw { 539sub draw {
302 my ($self) = @_; 540 my ($self) = @_;
303 541
304 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);
305 553
306 glPushMatrix; 554 glPushMatrix;
307 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
308 $self->_draw;
309 glPopMatrix;
310 556
311 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
312 my ($x, $y) = @$self{qw(x y)};
313
314 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
315 glEnable GL_BLEND; 559 glEnable GL_BLEND;
316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
317 glBegin GL_QUADS; 561 glBegin GL_QUADS;
318 glVertex $x , $y;
319 glVertex $x + $self->{w}, $y;
320 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h};
322 glEnd;
323 glDisable GL_BLEND;
324 }
325
326 if ($ENV{PCLIENT_DEBUG}) {
327 glPushMatrix;
328 glColor 1, 1, 0, 1;
329 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
330 glBegin GL_LINE_LOOP;
331 glVertex 0 , 0; 562 glVertex 0 , 0;
332 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
333 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
334 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
335 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;
336 glPopMatrix; 580 glPopMatrix;
337 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;
338 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
339} 586}
340 587
341sub _draw { 588sub _draw {
342 my ($self) = @_; 589 my ($self) = @_;
343 590
344 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
345} 592}
346 593
347sub find_widget {
348 my ($self, $x, $y) = @_;
349
350 return () unless $self->{can_events};
351
352 return $self
353 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
354 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
355
356 ()
357}
358
359sub set_parent {
360 my ($self, $parent) = @_;
361
362 Scalar::Util::weaken ($self->{parent} = $parent);
363}
364
365sub check_size {
366 my ($self) = @_;
367
368 $self->{parent}
369 or return 1;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389}
390
391sub update {
392 my ($self) = @_;
393
394 $self->{parent}->update
395 if $self->{parent};
396}
397
398sub connect {
399 my ($self, $signal, $cb) = @_;
400
401 push @{ $self->{signal_cb}{$signal} }, $cb;
402}
403
404sub emit {
405 my ($self, $signal, @args) = @_;
406
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
408 $cb->($self, @args);
409 }
410}
411
412sub DESTROY { 594sub DESTROY {
413 my ($self) = @_; 595 my ($self) = @_;
414 596
597 delete $WIDGET{$self+0};
415 #$self->deactivate; 598 #$self->deactivate;
416} 599}
417 600
418############################################################################# 601#############################################################################
419 602
… …
428 my $class = shift; 611 my $class = shift;
429 612
430 # range [value, low, high, page] 613 # range [value, low, high, page]
431 614
432 $class->SUPER::new ( 615 $class->SUPER::new (
433 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
434 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
435 @_ 618 @_
436 ) 619 )
437} 620}
438 621
439sub _draw { 622sub _draw {
440 my ($self) = @_; 623 my ($self) = @_;
441 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
442 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
443 631
444 glEnable GL_BLEND; 632 glEnable GL_BLEND;
445 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
446 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
447 635
448 glBegin GL_QUADS; 636 glBegin GL_QUADS;
449 glVertex 0 , 0; 637 glVertex 0 , 0;
450 glVertex 0 , $h; 638 glVertex 0 , $h;
451 glVertex $w, $h; 639 glVertex $w, $h;
452 glVertex $w, 0; 640 glVertex $w, 0;
453 glEnd; 641 glEnd;
454 642
455 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
456} 645}
457 646
458############################################################################# 647#############################################################################
459 648
460package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
465 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
467} 656}
468 657
469sub size_request { 658sub size_request {
470 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
471} 662}
472 663
473sub draw { } 664sub draw { }
474 665
475############################################################################# 666#############################################################################
… …
479our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
480 671
481sub new { 672sub new {
482 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
483 674
484 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
485 676
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 677 my $self = $class->SUPER::new (
678 children => [],
679 can_events => 0,
680 %arg,
681 );
682
487 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
488 685
489 $self 686 $self
490} 687}
491 688
492sub add { 689sub add {
493 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
494 691
495 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
496 694
497 use sort 'stable'; 695 use sort 'stable';
498 696
499 $self->{children} = [ 697 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
502 ]; 700 ];
503 701
504 $child->check_size; 702 $self->realloc;
703}
704
705sub children {
706 @{ $_[0]{children} }
505} 707}
506 708
507sub remove { 709sub remove {
508 my ($self, $child) = @_; 710 my ($self, $child) = @_;
509 711
510 delete $child->{parent}; 712 delete $child->{parent};
713 $child->hide;
511 714
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 716
514 $self->check_size; 717 $self->realloc;
515 $self->update;
516} 718}
517 719
518sub clear { 720sub clear {
519 my ($self) = @_; 721 my ($self) = @_;
520 722
521 delete $_->{parent} 723 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 724 $self->{children} = [];
725
726 for (@$children) {
727 delete $_->{parent};
728 $_->hide;
729 }
730
731 $self->realloc;
525} 732}
526 733
527sub find_widget { 734sub find_widget {
528 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
529 736
530 $x -= $self->{x}; 737 $x -= $self->{x};
531 $y -= $self->{y}; 738 $y -= $self->{y};
532 739
533 my $res; 740 my $res;
534 741
535 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
536 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
537 and return $res; 744 and return $res;
538 } 745 }
539 746
540 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
589 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
590} 797}
591 798
592############################################################################# 799#############################################################################
593 800
801# back-buffered drawing area
802
594package CFClient::UI::Window; 803package CFClient::UI::Window;
595 804
596our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
597 806
598use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
604} 813}
605 814
606sub update { 815sub update {
607 my ($self) = @_; 816 my ($self) = @_;
608 817
609 # we want to do this delayed... 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 819 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 820}
623 821
624sub size_allocate { 822sub size_allocate {
625 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
626 824
627 $self->child->configure (0, 0, $w, $h); 825 $self->SUPER::size_allocate ($w, $h);
826 $self->update;
827}
628 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
629 $self->render_chld; 849 $self->_render;
850 };
630} 851}
631 852
632sub _draw { 853sub _draw {
633 my ($self) = @_; 854 my ($self) = @_;
634 855
635 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
636 857
637 my $tex = $self->{texture} 858 my $tex = $self->{texture}
638 or return; 859 or return;
639 860
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
643 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;
644 864
645 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 866
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
649} 868}
650 869
651############################################################################# 870#############################################################################
652 871
653package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
654 873
655our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
656
657sub new { die }
658
659sub size_request {
660 my ($self) = @_;
661
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
664
665 @$self{qw(child_w child_h)}
666}
667
668sub _draw {
669 my ($self) = @_;
670
671 $self->{children}[1]->draw;
672}
673
674
675#############################################################################
676
677package CFClient::UI::Frame;
678
679our @ISA = CFClient::UI::Bin::;
680
681use CFClient::OpenGL;
682 875
683sub new { 876sub new {
684 my $class = shift; 877 my $class = shift;
685 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
686 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
688 border_bg => [1, 1, 1, 1], 980 slider => $slider,
689 border => 0.8, 981 %arg,
690 @_
691 ); 982 );
692 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
693 $self 987 $self
694} 988}
695 989
696sub _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 {
697 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
698 1008
699 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
700 1010
701 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
702 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]);
703 glEnable GL_TEXTURE_2D;
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705
706# glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0;
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713
714
715 $self->child->draw;
716 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D;
718} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
719 1017
720############################################################################# 1018#############################################################################
721 1019
722package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
723 1021
724our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
725 1023
726use CFClient::OpenGL; 1024use CFClient::OpenGL;
727
728my @tex =
729 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
730 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
731 1025
732sub new { 1026sub new {
733 my $class = shift; 1027 my $class = shift;
734 1028
735 # 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};
736 1078
737 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
740 border => 0.8, 1082 border => 0.6,
741 can_events => 1, 1083 can_events => 1,
742 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
743 ); 1087 );
744 1088
745 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
746 align => 0, 1090 align => 0,
747 valign => 1, 1091 valign => 1,
748 text => $self->{title}, 1092 text => $title,
749 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
750 1095
751 $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};
752} 1104}
753 1105
754sub border { 1106sub border {
755 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
756} 1108}
757 1109
758sub size_request { 1110sub size_request {
759 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
760 1115
761 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
762 1117
763 ( 1118 (
764 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
767} 1122}
768 1123
769sub size_allocate { 1124sub size_allocate {
770 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
771 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
772 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
774 1137
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
776 if $self->{title};
777
778 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
779} 1139}
780 1140
781sub button_down { 1141sub button_down {
782 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
783 1143
1144 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 1145 my $border = $self->border;
785 1146
786 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
791 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
792 $self->{motion} = sub { 1158 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
794 1160
795 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
796 1163
797 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
799 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
800 }; 1169 };
801 1170
802 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
807 1174
808 $self->{motion} = sub { 1175 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
810 1177
811 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
812 1179
813 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
814 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
815 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
816 } 1188 1
817} 1189}
818 1190
819sub button_up { 1191sub button_up {
820 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
821 1193
822 delete $self->{motion}; 1194 !!delete $self->{motion}
823} 1195}
824 1196
825sub mouse_motion { 1197sub mouse_motion {
826 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
827 1199
828 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
829} 1203}
830 1204
831sub _draw { 1205sub _draw {
832 my ($self) = @_; 1206 my ($self) = @_;
833 1207
1208 my $child = $self->{children}[0];
1209
834 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
836 1212
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 1215
842 my $border = $self->border; 1216 my $border = $self->border;
843 1217
844 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
849 1223
850 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
851 1226
852 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
854 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
855 1230 $bg->{t} = $ch / $bg->{h};
856 glColor @{ $self->{bg} };
857
858 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
862 1233
863 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 1235
866 $self->{title}->draw if $self->{title};
867 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
868} 1242}
869 1243
870############################################################################# 1244#############################################################################
871 1245
872package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
880sub new { 1254sub new {
881 my $class = shift; 1255 my $class = shift;
882 1256
883 $class->SUPER::new ( 1257 $class->SUPER::new (
884 col_expand => [], 1258 col_expand => [],
885 @_ 1259 @_,
886 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
887} 1265}
888 1266
889sub add { 1267sub add {
890 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
891 1269
892 $child->set_parent ($self); 1270 $child->set_parent ($self);
893 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
894 1272
895 $child->check_size; 1273 $self->realloc;
896} 1274}
897 1275
898# 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?
899sub clear { 1277sub clear {
900 my ($self) = @_; 1278 my ($self) = @_;
901 1279
1280 my @children = $self->children;
902 delete $self->{children}; 1281 delete $self->{children};
903 $self->update; 1282
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287
1288 $self->realloc;
904} 1289}
905 1290
906sub get_wh { 1291sub get_wh {
907 my ($self) = @_; 1292 my ($self) = @_;
908 1293
… …
939sub size_allocate { 1324sub size_allocate {
940 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
941 1326
942 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
943 1328
944 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
945 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
946 1331
947 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
948 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
949 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
950 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1004 } 1389 }
1005} 1390}
1006 1391
1007############################################################################# 1392#############################################################################
1008 1393
1009package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1010
1011# TODO: wrap into common Box base class
1012 1395
1013our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1014 1397
1015sub size_request { 1398sub size_request {
1016 my ($self) = @_; 1399 my ($self) = @_;
1017 1400
1018 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1019 1402 ? (
1020 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1021 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1022 (List::Util::max map $_->[1], @alloc), 1405 )
1023 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1024} 1410}
1025 1411
1026sub size_allocate { 1412sub size_allocate {
1027 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1028 1414
1029 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1030
1031 my $children = $self->{children}; 1416 my $children = $self->{children};
1032 1417
1033 my @h = map $_->{req_w}, @$children; 1418 my @req;
1034 1419
1035 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1036 1421 @req = ($space / (@$children || 1)) x @$children;
1037 if ($req_h > $h) {
1038 # ah well, not enough space
1039 $_ *= $h / $req_h for @h;
1040 } else { 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 {
1041 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1042 $exp ||= 1;
1043 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1044 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1045 my $child = $children->[$_];
1046
1047 my $alloc_h = $h[$_];
1048 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1049 $h[$_] = $alloc_h;
1050 } 1436 }
1051 } 1437 }
1052 1438
1053 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1054 1440
1055 my $y = 0; 1441 my $pos = 0;
1056 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1057 my $child = $children->[$_];
1058 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1059 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1060 1445
1061 $y += $h; 1446 $pos += $alloc;
1062 } 1447 }
1063 1448
1064 1 1449 1
1065} 1450}
1066 1451
1067############################################################################# 1452#############################################################################
1068 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
1069package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1070 1470
1071# TODO: wrap into common Box base class
1072
1073our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1074 1472
1075sub size_request { 1473sub new {
1076 my ($self) = @_; 1474 my $class = shift;
1077 1475
1078 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1079 1477 vertical => 1,
1080 ( 1478 @_,
1081 (List::Util::max map $_->[0], @alloc),
1082 (List::Util::sum map $_->[1], @alloc),
1083 ) 1479 )
1084} 1480}
1085 1481
1086sub size_allocate {
1087 my ($self, $w, $h) = @_;
1088
1089 my $children = $self->{children};
1090
1091 my @h = map $_->{req_h}, @$children;
1092
1093 my $req_h = List::Util::sum @h;
1094
1095 if ($req_h > $h) {
1096 # ah well, not enough space
1097 $_ *= $h / $req_h for @h;
1098 } else {
1099 my $exp = List::Util::sum map $_->{expand}, @$children;
1100 $exp ||= 1;
1101
1102 for (0 .. $#$children) {
1103 my $child = $children->[$_];
1104
1105 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1106 }
1107 }
1108
1109 CFClient::UI::harmonize \@h;
1110
1111 my $y = 0;
1112 for (0 .. $#$children) {
1113 my $child = $children->[$_];
1114 my $h = $h[$_];
1115 $child->configure (0, $y, $w, $h);
1116
1117 $y += $h;
1118 }
1119
1120 1
1121}
1122
1123############################################################################# 1482#############################################################################
1124 1483
1125package CFClient::UI::Label; 1484package CFClient::UI::Label;
1126 1485
1127our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1128 1487
1129use CFClient::OpenGL; 1488use CFClient::OpenGL;
1130 1489
1131sub new { 1490sub new {
1132 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1133 1492
1134 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1136 #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),
1137 fontsize => 1, 1503 fontsize => 1,
1138 text => "",
1139 align => -1, 1504 align => -1,
1140 valign => -1, 1505 valign => -1,
1141 padding => 2, 1506 padding_x => 2,
1142 layout => new CFClient::Layout, 1507 padding_y => 2,
1143 can_events => 0, 1508 can_events => 0,
1144 %arg 1509 %arg
1145 ); 1510 );
1146 1511
1147 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1515 $self->{template} = $layout;
1151 } 1516 }
1152 1517
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1154 $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 }
1155 1523
1156 $self 1524 $self
1157} 1525}
1158 1526
1159sub escape { 1527sub escape($) {
1160 local $_ = $_[1]; 1528 local $_ = $_[0];
1161 1529
1162 s/&/&amp;/g; 1530 s/&/&amp;/g;
1163 s/>/&gt;/g; 1531 s/>/&gt;/g;
1164 s/</&lt;/g; 1532 s/</&lt;/g;
1165 1533
1166 $_[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;
1167} 1549}
1168 1550
1169sub set_text { 1551sub set_text {
1170 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1171 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;
1172 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1173
1174 delete $self->{texture}; 1559 delete $self->{req_h};
1175 $self->check_size; 1560
1561 $self->realloc;
1176 $self->update; 1562 $self->update;
1177} 1563}
1178 1564
1179sub set_markup { 1565sub set_markup {
1180 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1181 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;
1182 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1183
1184 delete $self->{texture}; 1575 delete $self->{req_h};
1185 $self->check_size; 1576
1577 $self->realloc;
1186 $self->update; 1578 $self->update;
1187} 1579}
1188 1580
1189sub size_request { 1581sub size_request {
1190 my ($self) = @_; 1582 my ($self) = @_;
1191 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $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});
1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195 1592
1196 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1197 1594
1198 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1199 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1200 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1201 1598
1202 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1203 1600
1204 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1205 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1206 } 1603 }
1207 1604
1605 ($w, $h)
1208 ( 1606 }
1209 $w + $self->{padding} * 2,
1210 $h + $self->{padding} * 2,
1211 )
1212} 1607}
1213 1608
1214sub size_allocate { 1609sub size_allocate {
1215 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1216 1611
1612 delete $self->{ox};
1613
1217 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1218} 1616}
1219 1617
1220sub set_fontsize { 1618sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1222 1620
1223 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1622 delete $self->{texture};
1225 $self->check_size; 1623
1226 $self->update; 1624 $self->realloc;
1227} 1625}
1228 1626
1229sub _draw { 1627sub _draw {
1230 my ($self) = @_; 1628 my ($self) = @_;
1231 1629
1630 $self->SUPER::_draw; # draw background, if applicable
1631
1232 my $tex = $self->{texture} ||= do { 1632 my $tex = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $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});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639
1236 new_from_layout CFClient::Texture $self->{layout} 1640 new_from_layout CFClient::Texture $self->{layout}
1237 }; 1641 };
1238 1642
1239 glEnable GL_BLEND; 1643 unless (exists $self->{ox}) {
1240 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
1241 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1655
1244 glColor @{$self->{fg}}; 1656 glColor_premultiply @{$self->{fg}}
1657 if $tex->{format} == GL_ALPHA;
1245 1658
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1259 1660
1260 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1662}
1263 1663
1264############################################################################# 1664#############################################################################
1265 1665
1266package CFClient::UI::EntryBase; 1666package CFClient::UI::EntryBase;
… …
1271 1671
1272sub new { 1672sub new {
1273 my $class = shift; 1673 my $class = shift;
1274 1674
1275 $class->SUPER::new ( 1675 $class->SUPER::new (
1276 fg => [1, 1, 1], 1676 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1677 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1678 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1679 active_fg => [0, 0, 0],
1280 can_hover => 1, 1680 can_hover => 1,
1281 can_focus => 1, 1681 can_focus => 1,
1282 valign => 0, 1682 valign => 0,
1283 can_events => 1, 1683 can_events => 1,
1684 #text => ...
1284 @_ 1685 @_
1285 ) 1686 )
1286} 1687}
1287 1688
1288sub _set_text { 1689sub _set_text {
… …
1290 1691
1291 delete $self->{cur_h}; 1692 delete $self->{cur_h};
1292 1693
1293 return if $self->{text} eq $text; 1694 return if $self->{text} eq $text;
1294 1695
1295 delete $self->{texture};
1296
1297 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1298 $self->{text} = $text; 1697 $self->{text} = $text;
1299 1698
1300 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1301 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1302 1702
1303 $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);
1304} 1714}
1305 1715
1306sub get_text { 1716sub get_text {
1307 $_[0]{text} 1717 $_[0]{text}
1308} 1718}
… …
1311 my ($self) = @_; 1721 my ($self) = @_;
1312 1722
1313 my ($w, $h) = $self->SUPER::size_request; 1723 my ($w, $h) = $self->SUPER::size_request;
1314 1724
1315 ($w + 1, $h) # add 1 for cursor 1725 ($w + 1, $h) # add 1 for cursor
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text {
1325 my ($self, $text) = @_;
1326
1327 $self->{cursor} = length $text;
1328 $self->_set_text ($text);
1329 $self->update;
1330} 1726}
1331 1727
1332sub key_down { 1728sub key_down {
1333 my ($self, $ev) = @_; 1729 my ($self, $ev) = @_;
1334 1730
… …
1336 my $sym = $ev->{sym}; 1732 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1733 my $uni = $ev->{unicode};
1338 1734
1339 my $text = $self->get_text; 1735 my $text = $self->get_text;
1340 1736
1341 if ($sym == 8) { 1737 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1739 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1740 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1741 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1742 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1743 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1744 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1745 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1746 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1747 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1748 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1749 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1750 $self->_emit ('escape');
1355 } elsif ($uni) { 1751 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1752 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else {
1754 return 0;
1357 } 1755 }
1358 1756
1359 $self->_set_text ($text); 1757 $self->_set_text ($text);
1360 $self->update; 1758
1759 $self->realloc;
1760
1761 1
1361} 1762}
1362 1763
1363sub focus_in { 1764sub focus_in {
1364 my ($self) = @_; 1765 my ($self) = @_;
1365 1766
… …
1380 utf8::encode $text; 1781 utf8::encode $text;
1381 $self->{cursor} = length substr $text, 0, $idx; 1782 $self->{cursor} = length substr $text, 0, $idx;
1382 1783
1383 $self->_set_text ($self->{text}); 1784 $self->_set_text ($self->{text});
1384 $self->update; 1785 $self->update;
1786
1787 1
1385} 1788}
1386 1789
1387sub mouse_motion { 1790sub mouse_motion {
1388 my ($self, $ev, $x, $y) = @_; 1791 my ($self, $ev, $x, $y) = @_;
1389# 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
1390} 1795}
1391 1796
1392sub _draw { 1797sub _draw {
1393 my ($self) = @_; 1798 my ($self) = @_;
1394 1799
1395 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1396 1801
1397 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1398 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1399 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1400 } else { 1805 } else {
1401 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1402 } 1807 }
1403 1808
1404 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1405 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1406 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1407 glVertex 0 , 0; 1812 glVertex 0 , 0;
1408 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1409 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1410 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1441 my ($self, $ev) = @_; 1846 my ($self, $ev) = @_;
1442 1847
1443 my $sym = $ev->{sym}; 1848 my $sym = $ev->{sym};
1444 1849
1445 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} = '';
1446 $self->emit (activate => $self->get_text); 1855 $self->_emit (activate => $txt);
1447 $self->update; 1856 $self->update;
1448 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
1449 } else { 1880 } else {
1450 $self->SUPER::key_down ($ev); 1881 return $self->SUPER::key_down ($ev)
1882 }
1883
1451 } 1884 1
1452
1453} 1885}
1454 1886
1455############################################################################# 1887#############################################################################
1456 1888
1457package CFClient::UI::Button; 1889package CFClient::UI::Button;
… …
1466 1898
1467sub new { 1899sub new {
1468 my $class = shift; 1900 my $class = shift;
1469 1901
1470 $class->SUPER::new ( 1902 $class->SUPER::new (
1471 padding => 4, 1903 padding_x => 4,
1904 padding_y => 4,
1472 fg => [1, 1, 1], 1905 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1906 active_fg => [0, 0, 1],
1475 can_hover => 1, 1907 can_hover => 1,
1476 align => 0, 1908 align => 0,
1477 valign => 0, 1909 valign => 0,
1478 can_events => 1, 1910 can_events => 1,
1479 @_ 1911 @_
1480 ) 1912 )
1481} 1913}
1482 1914
1915sub activate { }
1916
1483sub button_up { 1917sub button_up {
1484 my ($self, $ev, $x, $y) = @_; 1918 my ($self, $ev, $x, $y) = @_;
1485 1919
1920 $self->emit ("activate")
1486 if ($x >= 0 && $x < $self->{w} 1921 if $x >= 0 && $x < $self->{w}
1487 && $y >= 0 && $y < $self->{h}) { 1922 && $y >= 0 && $y < $self->{h};
1488 $self->emit ("activate"); 1923
1489 } 1924 1
1490} 1925}
1491 1926
1492sub _draw { 1927sub _draw {
1493 my ($self) = @_; 1928 my ($self) = @_;
1494 1929
1495 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1496 1931
1497 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg};
1499 }
1500
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1932 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1506 1935
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1937
1509 glDisable GL_TEXTURE_2D; 1938 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1939
1512 $self->SUPER::_draw; 1940 $self->SUPER::_draw;
1513} 1941}
1514 1942
1515############################################################################# 1943#############################################################################
… …
1526 1954
1527sub new { 1955sub new {
1528 my $class = shift; 1956 my $class = shift;
1529 1957
1530 $class->SUPER::new ( 1958 $class->SUPER::new (
1531 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1532 fg => [1, 1, 1], 1961 fg => [1, 1, 1],
1533 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],
1534 state => 0, 1965 state => 0,
1535 can_hover => 1, 1966 can_hover => 1,
1536 @_ 1967 @_
1537 ) 1968 )
1538} 1969}
1539 1970
1540sub size_request { 1971sub size_request {
1541 my ($self) = @_; 1972 my ($self) = @_;
1542 1973
1543 ($self->{padding} * 2 + 6) x 2 1974 (6) x 2
1544} 1975}
1545 1976
1546sub button_down { 1977sub button_down {
1547 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1548 1979
1549 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1550 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1551 $self->{state} = !$self->{state}; 1982 $self->{state} = !$self->{state};
1552 $self->emit (changed => $self->{state}); 1983 $self->_emit (changed => $self->{state});
1984 } else {
1985 return 0
1986 }
1987
1553 } 1988 1
1554} 1989}
1555 1990
1556sub _draw { 1991sub _draw {
1557 my ($self) = @_; 1992 my ($self) = @_;
1558 1993
1559 $self->SUPER::_draw; 1994 $self->SUPER::_draw;
1560 1995
1561 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1562 1997
1563 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;
1564 2001
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2002 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 2003
1567 glEnable GL_BLEND; 2004 my $tex = $self->{state} ? $tex[1] : $tex[0];
2005
1568 glEnable GL_TEXTURE_2D; 2006 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 2007 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 2008 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 2009}
1578 2010
1579############################################################################# 2011#############################################################################
1580 2012
1581package CFClient::UI::Image; 2013package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 2056 glTranslate 0, -$self->{w}, 0;
1625 2057
1626 ($w, $h) = ($h, $w); 2058 ($w, $h) = ($h, $w);
1627 } 2059 }
1628 2060
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 2061 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 2063
1634 $tex->draw_quad (0, 0, $w, $h); 2064 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 2065
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 2066 glDisable GL_TEXTURE_2D;
1638} 2067}
1639 2068
1640############################################################################# 2069#############################################################################
1641 2070
… …
1689} 2118}
1690 2119
1691sub set_max { 2120sub set_max {
1692 my ($self, $max) = @_; 2121 my ($self, $max) = @_;
1693 2122
2123 return if $self->{max_val} == $max;
2124
1694 $self->{max_val} = $max; 2125 $self->{max_val} = $max;
2126 $self->update;
1695} 2127}
1696 2128
1697sub set_value { 2129sub set_value {
1698 my ($self, $val, $max) = @_; 2130 my ($self, $val, $max) = @_;
1699 2131
1700 $self->set_max ($max) 2132 $self->set_max ($max)
1701 if defined $max; 2133 if defined $max;
1702 2134
1703 $max = $self->{max_val}; 2135 return if $self->{val} == $val;
2136
1704 $self->{val} = $val; 2137 $self->{val} = $val;
1705
1706 $self->update; 2138 $self->update;
1707} 2139}
1708 2140
1709sub _draw { 2141sub _draw {
1710 my ($self) = @_; 2142 my ($self) = @_;
… …
1728 2160
1729 my $h1 = $self->{h} * (1 - $ycut1); 2161 my $h1 = $self->{h} * (1 - $ycut1);
1730 my $h2 = $self->{h} * (1 - $ycut2); 2162 my $h2 = $self->{h} * (1 - $ycut2);
1731 2163
1732 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
1733 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;
1734 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
1735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1736 2169
1737 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
1738 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
… …
1773 2206
1774sub new { 2207sub new {
1775 my ($class, %arg) = @_; 2208 my ($class, %arg) = @_;
1776 2209
1777 my $self = $class->SUPER::new ( 2210 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2211 tooltip => $arg{type},
2212 can_hover => 1,
1779 can_events => 1, 2213 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2214 %arg,
1782 ); 2215 );
1783 2216
1784 $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");
1785 $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);
… …
1793 2226
1794 $self->{value}->set_fontsize ($fsize); 2227 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2228 $self->{max} ->set_fontsize ($fsize);
1796} 2229}
1797 2230
2231sub set_max {
2232 my ($self, $max) = @_;
2233
2234 $self->{gauge}->set_max ($max);
2235 $self->{max}->set_text ($max);
2236}
2237
1798sub set_value { 2238sub set_value {
1799 my ($self, $val, $max) = @_; 2239 my ($self, $val, $max) = @_;
1800 2240
1801 $self->set_max ($max) 2241 $self->set_max ($max)
1802 if defined $max; 2242 if defined $max;
1803 2243
1804 $self->{gauge}->set_value ($val, $max); 2244 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2245 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2246}
1814 2247
1815############################################################################# 2248#############################################################################
1816 2249
1817package CFClient::UI::Slider; 2250package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2260 qw(s1_slider.png s1_slider_bg.png);
1828 2261
1829sub new { 2262sub new {
1830 my $class = shift; 2263 my $class = shift;
1831 2264
1832 # range [value, low, high, page] 2265 # range [value, low, high, page, unit]
1833 2266
1834 # TODO: 0-width page 2267 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2268 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2269 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2271 fg => [1, 1, 1],
1839 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],
1840 range => [0, 0, 100, 10], 2275 range => [0, 0, 100, 10, 0],
1841 req_w => 20, 2276 min_w => $::WIDTH / 80,
1842 req_h => 20, 2277 min_h => $::WIDTH / 80,
1843 vertical => 0, 2278 vertical => 0,
1844 can_hover => 1, 2279 can_hover => 1,
1845 inner_pad => 5, 2280 inner_pad => 0.02,
1846 @_ 2281 @_
1847 ); 2282 );
1848 2283
2284 $self->set_value ($self->{range}[0]);
2285 $self->update;
2286
1849 $self 2287 $self
1850} 2288}
1851 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
1852sub size_request { 2324sub size_request {
1853 my ($self) = @_; 2325 my ($self) = @_;
1854 2326
1855 my $w = $self->{req_w}; 2327 ($self->{req_w}, $self->{req_h})
1856 my $h = $self->{req_h};
1857
1858 $self->{vertical} ? ($h, $w) : ($w, $h)
1859} 2328}
1860 2329
1861sub button_down { 2330sub button_down {
1862 my ($self, $ev, $x, $y) = @_; 2331 my ($self, $ev, $x, $y) = @_;
1863 2332
1864 $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
1865 $self->mouse_motion ($ev, $x, $y); 2337 $self->mouse_motion ($ev, $x, $y)
1866} 2338}
1867 2339
1868sub mouse_motion { 2340sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2341 my ($self, $ev, $x, $y) = @_;
1870 2342
1871 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
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2371 my ($value, $lo, $hi, $page) = @{$self->{range}};
2372 my $range = ($hi - $page - $lo) || 1e-100;
1873 2373
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2374 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1875 2375
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2376 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1877 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2377 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1878 2378
1879 $x -= $inner_pad_px; # substract the padding 2379 $value = ($value - $lo) / $range;
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2380 $value = $value * $self->{scale} + $self->{offset};
1881 $x = $lo if $x < $lo;
1882 $x = $hi - $page if $x > $hi - $page;
1883 $self->{range}[0] = $x;
1884 2381
1885 $self->emit (changed => $x); 2382 $self->{knob_x} = $value - $knob_w * 0.5;
1886 $self->update; 2383 $self->{knob_w} = $knob_w;
1887 } 2384 }
1888}
1889
1890# the inner_* stuff is for generating a padding for the slider handle,
1891# so that the handle doesn't leave the texture. This calculation isn't 100%
1892# correct propably, but it does the job for now
1893sub _calc_inner_pad_px {
1894 my ($self, $w) = @_;
1895 ($w / 100) * $self->{inner_pad} # % to pixels
1896}
1897
1898sub _draw {
1899 my ($self) = @_;
1900 2385
1901 $self->SUPER::_draw (); 2386 $self->SUPER::_draw ();
1902 2387
1903 my ($w, $h) = @$self{qw(w h)}; 2388 glScale $self->{w}, $self->{h};
1904 2389
1905 if ($self->{vertical}) { 2390 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2391 # draw a vertical slider like a rotated horizontal slider
1907 2392
2393 glTranslate 1, 0, 0;
1908 glRotate 90, 0, 0, 1; 2394 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2395 }
1913 2396
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2397 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2398 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2399
1917 my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919 $hi = $value + 1 if $lo == $hi;
1920
1921 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924 $page = int $page * $inner_w / ($hi - $lo);
1925 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927 $w -= $page;
1928 $page &= ~1;
1929 glTranslate $page * 0.5, 0, 0;
1930 $page ||= 2;
1931
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2402
1940 # draw background 2403 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2404 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2405
1943 # draw handle 2406 # draw handle
1944 $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);
1945 2408
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1948} 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 (@_) }
1949 2452
1950############################################################################# 2453#############################################################################
1951 2454
1952package CFClient::UI::TextView; 2455package CFClient::UI::TextView;
1953 2456
… …
1957 2460
1958sub new { 2461sub new {
1959 my $class = shift; 2462 my $class = shift;
1960 2463
1961 my $self = $class->SUPER::new ( 2464 my $self = $class->SUPER::new (
1962 fontsize => 1, 2465 fontsize => 1,
2466 can_events => 0,
1963 #font => default_font 2467 #font => default_font
1964 @_, 2468 @_,
1965 2469
1966 layout => (new CFClient::Layout), 2470 layout => (new CFClient::Layout 1),
1967 par => [], 2471 par => [],
1968 height => 0, 2472 height => 0,
1969 children => [ 2473 children => [
1970 (new CFClient::UI::Empty expand => 1), 2474 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2475 (new CFClient::UI::Slider vertical => 1),
1972 ], 2476 ],
1973 ); 2477 );
1974 2478
1975 $self->{children}[1]->connect (changed => sub { 2479 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2480
1979 $self 2481 $self
1980} 2482}
1981 2483
1982sub set_fontsize { 2484sub set_fontsize {
1983 my ($self, $fontsize) = @_; 2485 my ($self, $fontsize) = @_;
1984 2486
1985 $self->{fontsize} = $fontsize; 2487 $self->{fontsize} = $fontsize;
1986 $self->reflow; 2488 $self->reflow;
1987}
1988
1989sub text_height {
1990 my ($self, $text) = @_;
1991
1992 my $layout = $self->{layout};
1993
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w});
1996 $layout->set_text ($text);
1997
1998 ($layout->size)[1]
1999}
2000
2001sub reflow {
2002 my ($self) = @_;
2003
2004 $self->{need_reflow}++;
2005 $self->update;
2006} 2489}
2007 2490
2008sub size_allocate { 2491sub size_allocate {
2009 my ($self, $w, $h) = @_; 2492 my ($self, $w, $h) = @_;
2010 2493
… …
2015 $self->{layout}->set_width ($self->{children}[0]{w}); 2498 $self->{layout}->set_width ($self->{children}[0]{w});
2016 2499
2017 $self->reflow; 2500 $self->reflow;
2018} 2501}
2019 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
2020sub add_paragraph { 2537sub add_paragraph {
2021 my ($self, $color, $text) = @_; 2538 my ($self, $color, $text, $indent) = @_;
2022 2539
2023 #TODO: intelligently "reformat" paragraph 2540 for my $line (split /\n/, $text) {
2024 2541 my ($w, $h) = $self->text_size ($line);
2025 my $height = $self->text_height ($text);
2026
2027 $self->{height} += $height; 2542 $self->{height} += $h;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2544 }
2028 2545
2029 push @{$self->{par}}, [$height, $color, $text];
2030
2031 $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]);
2032 $self->{children}[1]->update;
2033} 2547}
2034 2548
2035sub update { 2549sub update {
2036 my ($self) = @_; 2550 my ($self) = @_;
2037 2551
… …
2039 2553
2040 return unless $self->{h} > 0; 2554 return unless $self->{h} > 0;
2041 2555
2042 delete $self->{texture}; 2556 delete $self->{texture};
2043 2557
2044 $ROOT->on_refresh ($self, sub { 2558 $ROOT->on_post_alloc ($self, sub {
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560
2045 if (delete $self->{need_reflow}) { 2561 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2562 my $height = 0;
2047 2563
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2049 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 }
2050 2579
2051 $self->{height} = $height; 2580 $self->{height} = $height;
2052 2581
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2054 2583
2055 delete $self->{texture}; 2584 delete $self->{texture};
2056 } 2585 }
2057 2586
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2059 glClearColor 0, 0, 0, 1; 2588 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2061 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
2062 glEnable GL_BLEND; 2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066
2067 my $top = int $self->{children}[1]{range}[0];
2068
2069 my $y0 = $top;
2070 my $y1 = $top + $self->{h};
2071
2072 my $y = 0;
2073
2074 my $layout = $self->{layout};
2075
2076 $layout->set_font ($self->{font}) if $self->{font};
2077 2605
2078 for my $par (@{$self->{par}}) { 2606 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2607 my $h = $par->[1];
2080 2608
2081 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]);
2082 $layout->set_text ($par->[2]); 2612 $layout->set_markup ($par->[4]);
2083 2613
2084 glColor @{ $par->[1] }; 2614 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2085 my ($W, $H) = $layout->size; 2615
2086 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;
2087 } 2618 }
2088 2619
2089 $y += $h; 2620 $y += $h;
2090 } 2621 }
2091 2622
2092 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND; 2623 glDisable GL_BLEND;
2094 }; 2624 };
2095 }); 2625 });
2096} 2626}
2097 2627
2098sub _draw { 2628sub _draw {
2099 my ($self) = @_; 2629 my ($self) = @_;
2100 2630
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $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});
2105 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2106 }
2107 2636
2108 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2109 2638
2110} 2639}
2111 2640
… …
2159 2688
2160sub new { 2689sub new {
2161 my $class = shift; 2690 my $class = shift;
2162 2691
2163 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2164 state => 0, 2693 state => 0,
2165 connect_activate => \&toggle_flopper, 2694 on_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2695 @_
2168 ); 2696 );
2169 2697
2170 if ($self->{state}) {
2171 $self->{state} = 0;
2172 $self->toggle_flopper;
2173 }
2174
2175 $self 2698 $self
2176} 2699}
2177 2700
2178sub toggle_flopper { 2701sub toggle_flopper {
2179 my ($self) = @_; 2702 my ($self) = @_;
2180 2703
2181 # TODO: use animation 2704 $self->{other}->toggle_visibility;
2182 if ($self->{state} = !$self->{state}) {
2183 $CFClient::UI::ROOT->add ($self->{other});
2184 $self->{other}->move ($self->coord2global (0, $self->{h}));
2185 $self->emit ("open");
2186 } else {
2187 $CFClient::UI::ROOT->remove ($self->{other});
2188 $self->emit ("close");
2189 }
2190
2191 $self->emit (changed => $self->{state});
2192} 2705}
2193 2706
2194############################################################################# 2707#############################################################################
2195 2708
2196package CFClient::UI::Tooltip; 2709package CFClient::UI::Tooltip;
… …
2206 @_, 2719 @_,
2207 can_events => 0, 2720 can_events => 0,
2208 ) 2721 )
2209} 2722}
2210 2723
2211sub set_markup { 2724sub set_tooltip_from {
2212 my ($self, $text) = @_; 2725 my ($self, $widget) = @_;
2213 2726
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2727 my $tooltip = $widget->{tooltip};
2215 $self->{label}->set_markup ($text); 2728
2216 $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 );
2217} 2744}
2218 2745
2219sub size_request { 2746sub size_request {
2220 my ($self) = @_; 2747 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2748
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2750
2226 ($w + 4, $h + 4) 2751 ($w + 4, $h + 4)
2227} 2752}
… …
2230 my ($self, $w, $h) = @_; 2755 my ($self, $w, $h) = @_;
2231 2756
2232 $self->SUPER::size_allocate ($w - 4, $h - 4); 2757 $self->SUPER::size_allocate ($w - 4, $h - 4);
2233} 2758}
2234 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
2235sub _draw { 2778sub _draw {
2236 my ($self) = @_; 2779 my ($self) = @_;
2237 2780
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2781 glTranslate 0.375, 0.375;
2240 2782
2241 my ($w, $h) = @$self{qw(w h)}; 2783 my ($w, $h) = @$self{qw(w h)};
2242 2784
2243 glColor 1, 0.8, 0.4; 2785 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2796 glVertex 0 , $h;
2255 glVertex $w, $h; 2797 glVertex $w, $h;
2256 glVertex $w, 0; 2798 glVertex $w, 0;
2257 glEnd; 2799 glEnd;
2258 2800
2259 glPopMatrix; 2801 glTranslate 2 - 0.375, 2 - 0.375;
2260 2802
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2803 $self->SUPER::_draw;
2263} 2804}
2264 2805
2265############################################################################# 2806#############################################################################
2266 2807
… …
2271use CFClient::OpenGL; 2812use CFClient::OpenGL;
2272 2813
2273sub new { 2814sub new {
2274 my $class = shift; 2815 my $class = shift;
2275 2816
2276 $class->SUPER::new ( 2817 my $self = $class->SUPER::new (
2277 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 => [],
2278 @_, 3474 @_,
2279 ) 3475 )
2280} 3476}
2281 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
2282sub size_request { 3541sub size_request {
2283 (32, 8)
2284}
2285
2286sub draw {
2287 my ($self) = @_; 3542 my ($self) = @_;
2288 3543
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3544 ($self->{w}, $self->{h})
2290
2291 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 }
2301} 3545}
2302 3546
2303############################################################################# 3547sub _to_pixel {
3548 my ($coord, $size, $max) = @_;
2304 3549
2305package CFClient::UI::Root; 3550 $coord =
3551 $coord eq "center" ? ($max - $size) * 0.5
3552 : $coord eq "max" ? $max
3553 : $coord;
2306 3554
2307our @ISA = CFClient::UI::Container::; 3555 $coord = 0 if $coord < 0;
3556 $coord = $max - $size if $coord > $max - $size;
2308 3557
2309use CFClient::OpenGL; 3558 int $coord + 0.5
2310
2311sub check_size {
2312 my ($self) = @_;
2313
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2315} 3559}
2316 3560
2317sub size_request { 3561sub size_allocate {
2318 ($::WIDTH, $::HEIGHT)
2319}
2320
2321sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 3562 my ($self, $w, $h) = @_;
2323 3563
2324 $self->SUPER::configure ($x, $y, $w, $h);
2325
2326 for my $child (@{$self->{children}}) { 3564 for my $child ($self->children) {
2327 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)};
2328 3566
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3567 $X = $child->{force_x} if exists $child->{force_x};
2330 $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
2331 $child->configure ($X, $Y, $W,$H); 3573 $child->configure ($X, $Y, $W, $H);
2332 } 3574 }
2333} 3575}
2334 3576
2335sub _topleft { 3577sub coord2local {
2336 my ($self, $x, $y) = @_; 3578 my ($self, $x, $y) = @_;
2337 3579
2338 ($x, $y) 3580 ($x, $y)
2339} 3581}
2340 3582
3583sub coord2global {
3584 my ($self, $x, $y) = @_;
3585
3586 ($x, $y)
3587}
3588
2341sub update { 3589sub update {
2342 my ($self) = @_; 3590 my ($self) = @_;
2343 3591
2344 $self->check_size; 3592 $::WANT_REFRESH++;
2345 ::refresh ();
2346} 3593}
2347 3594
2348sub add { 3595sub add {
2349 my ($self, $child) = @_; 3596 my ($self, @children) = @_;
2350 3597
2351 # integerize window positions 3598 $_->{is_toplevel} = 1
2352 $child->{x} = int $child->{x}; 3599 for @children;
2353 $child->{y} = int $child->{y};
2354 3600
2355 $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 }
2356} 3617}
2357 3618
2358sub on_refresh { 3619sub on_refresh {
2359 my ($self, $id, $cb) = @_; 3620 my ($self, $id, $cb) = @_;
2360 3621
2361 $self->{refresh_hook}{$id} = $cb; 3622 $self->{refresh_hook}{$id} = $cb;
2362} 3623}
2363 3624
3625sub on_post_alloc {
3626 my ($self, $id, $cb) = @_;
3627
3628 $self->{post_alloc_hook}{$id} = $cb;
3629}
3630
2364sub draw { 3631sub draw {
2365 my ($self) = @_; 3632 my ($self) = @_;
2366 3633
2367 while (my $rcb = delete $self->{refresh_hook}) { 3634 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 3635 $_->()
3636 for values %{delete $self->{refresh_hook}};
2369 } 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
2370 3730
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3731 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 3733 glClear GL_COLOR_BUFFER_BIT;
2374 3734
2375 glMatrixMode GL_PROJECTION; 3735 glMatrixMode GL_PROJECTION;
2376 glLoadIdentity; 3736 glLoadIdentity;
2377 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2378 glMatrixMode GL_MODELVIEW; 3738 glMatrixMode GL_MODELVIEW;
2379 glLoadIdentity; 3739 glLoadIdentity;
2380 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
2381 $self->_draw; 3748 $self->_draw;
2382} 3749}
2383 3750
2384############################################################################# 3751#############################################################################
2385 3752
2386package CFClient::UI; 3753package CFClient::UI;
2387 3754
2388$ROOT = new CFClient::UI::Root; 3755$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 3756$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390 3757
23911 37581
2392 3759

Diff Legend

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