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.177 by root, Tue Apr 25 13:08:17 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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