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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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