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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines