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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines