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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

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

Diff Legend

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