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

Diff Legend

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