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

Diff Legend

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