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.369 by root, Sun Jul 15 20:25:26 2007 UTC

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

Diff Legend

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