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.174 by root, Tue Apr 25 11:18:49 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
919 {
920 package CFPlus::UI::Base;
921
922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
926 }
674 }; 927 };
675} 928}
676 929
677sub _draw { 930sub _draw {
678 my ($self) = @_; 931 my ($self) = @_;
679
680 my ($w, $h) = ($self->w, $self->h);
681 932
682 my $tex = $self->{texture} 933 my $tex = $self->{texture}
683 or return; 934 or return;
684 935
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
690 939
691 $tex->draw_quad (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
692 941
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
695} 943}
696 944
697############################################################################# 945#############################################################################
698 946
699package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
700 948
701our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728 950
729sub new { 951sub new {
730 my $class = shift; 952 my $class = shift;
731 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
732 my $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
734 border_bg => [1, 1, 1, 1], 1057 can_events => 1,
735 border => 0.8, 1058 slider => $slider,
736 @_ 1059 %arg,
737 ); 1060 );
738 1061
1062 $self->SUPER::add ($self->{vp}, $self->{slider});
1063 $self->add ($child) if $child;
1064
739 $self 1065 $self
740} 1066}
741 1067
742sub _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 {
743 my ($self) = @_; 1077 my ($self, $ev) = @_;
744 1078
745 my ($w, $h) = ($self->{w}, $self->{h}); 1079 return 0 unless $ev->{dy}; # only vertical movements
746 1080
747 glEnable GL_BLEND; 1081 $self->{slider}->emit (mouse_wheel => $ev);
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D;
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 1082
752# glBegin GL_QUADS; 1083 1
753# glColor 0, 0, 0, 0; 1084}
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
759 1085
1086sub update_slider {
1087 my ($self) = @_;
760 1088
761 $self->child->draw; 1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
762 glDisable GL_BLEND; 1090}
763 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)
764} 1106}
765 1107
766############################################################################# 1108#############################################################################
767 1109
768package CFClient::UI::FancyFrame; 1110package CFPlus::UI::Frame;
769 1111
770our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
771 1113
772use CFClient::OpenGL; 1114use CFPlus::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777 1115
778sub new { 1116sub new {
779 my $class = shift; 1117 my $class = shift;
780 1118
781 # 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 }
782 1166
783 my $self = $class->SUPER::new ( 1167 my $self = $class->SUPER::new (
1168 # label => "",
784 bg => [1, 1, 1, 1], 1169 fg => [0.6, 0.3, 0.1],
785 border_bg => [1, 1, 1, 1],
786 border => 0.8, 1170 border => 0.8,
787 can_events => 1, 1171 style => 'single',
788 @_ 1172 %arg,
789 ); 1173 );
790 1174
791 $self->{title} &&= new CFClient::UI::Label
792 align => 0,
793 valign => 1,
794 text => $self->{title},
795 fontsize => 1;
796
797 $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};
798} 1183}
799 1184
800sub border { 1185sub border {
801 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
802} 1187}
803 1188
804sub size_request { 1189sub size_request {
805 my ($self) = @_; 1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
806 1194
807 my ($w, $h) = $self->SUPER::size_request; 1195 my ($w, $h) = $self->SUPER::size_request;
808 1196
809 ( 1197 (
810 $w + $self->border * 2, 1198 $w + $self->border * 2,
811 $h + $self->border * 2, 1199 $h + $self->border * 2,
812 ) 1200 )
813} 1201}
814 1202
815sub size_allocate { 1203sub invoke_size_allocate {
816 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
817 1205
818 $h -= List::Util::max 0, $self->border * 2; 1206 my $border = $self->border;
1207
819 $w -= List::Util::max 0, $self->border * 2; 1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
820 1210
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1211 if (my $label = $self->{label}) {
822 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 }
823 1216
824 $self->child->configure ($self->border, $self->border, $w, $h); 1217 $self->child->configure ($border, $border, $w, $h);
825}
826 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
827sub button_down { 1355sub invoke_button_down {
828 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
829 1357
1358 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 1359 my $border = $self->border;
831 1360
832 if ($x < $self->{w} && $x >= $self->{w} - $border 1361 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 1362 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 1363
1364 if ($lr & $td) {
1365 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1366 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 1367 my ($bw, $bh) = ($self->{w}, $self->{h});
837 1368
1369 my $mx = $x < $border;
1370 my $my = $y < $border;
1371
838 $self->{motion} = sub { 1372 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 1373 my ($ev, $x, $y) = @_;
840 1374
841 ($x, $y) = ($ev->{x}, $ev->{y}); 1375 my $dx = $ev->{x} - $ox;
1376 my $dy = $ev->{y} - $oy;
842 1377
843 $self->{user_w} = $bw + $x - $ox; 1378 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 1379 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
845 $self->check_size; 1380
1381 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1382 $self->realloc;
846 }; 1383 };
847 1384
848 } elsif ($x >= 0 && $x < $self->{w} 1385 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1386 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 1387 my ($bx, $by) = ($self->{x}, $self->{y});
853 1388
854 $self->{motion} = sub { 1389 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 1390 my ($ev, $x, $y) = @_;
856 1391
857 ($x, $y) = ($ev->{x}, $ev->{y}); 1392 ($x, $y) = ($ev->{x}, $ev->{y});
858 1393
859 $self->move ($bx + $x - $ox, $by + $y - $oy); 1394 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
860 $self->update; 1395 # HACK: the next line is required to enforce placement
1396 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
861 }; 1397 };
1398 } else {
1399 return 0;
1400 }
1401
862 } 1402 1
863} 1403}
864 1404
865sub button_up { 1405sub invoke_button_up {
866 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
867 1407
868 delete $self->{motion}; 1408 ! ! delete $self->{motion}
869} 1409}
870 1410
871sub mouse_motion { 1411sub invoke_mouse_motion {
872 my ($self, $ev, $x, $y) = @_; 1412 my ($self, $ev, $x, $y) = @_;
873 1413
874 $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
875} 1425}
876 1426
877sub _draw { 1427sub _draw {
878 my ($self) = @_; 1428 my ($self) = @_;
879 1429
1430 my $child = $self->{children}[0];
1431
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1432 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1433 my ($cw, $ch) = ($child->{w}, $child->{h});
882 1434
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1435 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1437
888 my $border = $self->border; 1438 my $border = $self->border;
889 1439
890 glColor @{ $self->{border_bg} }; 1440 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1441 $border[0]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1445
896 my $bg = $tex[0]; 1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447 glColor @{ $self->{bg} };
897 1448
898 # TODO: repeat texture not scale 1449 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1450 # solve this better(?)
900 my $rep_y = $ch / $bg->{h}; 1451 $bg->{s} = $cw / $bg->{w};
901 1452 $bg->{t} = $ch / $bg->{h};
902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1453 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1454 }
908 1455
909 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1457
912 $self->{title}->draw if $self->{title};
913 $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};
914} 1469}
915 1470
916############################################################################# 1471#############################################################################
917 1472
918package CFClient::UI::Table; 1473package CFPlus::UI::Table;
919 1474
920our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
921 1476
922use List::Util qw(max sum); 1477use List::Util qw(max sum);
923 1478
924use CFClient::OpenGL; 1479use CFPlus::OpenGL;
925 1480
926sub new { 1481sub new {
927 my $class = shift; 1482 my $class = shift;
928 1483
929 $class->SUPER::new ( 1484 $class->SUPER::new (
930 col_expand => [], 1485 col_expand => [],
931 @_ 1486 @_,
932 ) 1487 )
933}
934
935sub add {
936 my ($self, $x, $y, $child) = @_;
937
938 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child;
940
941 $child->check_size;
942} 1488}
943 1489
944sub children { 1490sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946} 1492}
947 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
948# 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?
949sub clear { 1515sub clear {
950 my ($self) = @_; 1516 my ($self) = @_;
951 1517
952 my @children = $self->children; 1518 my @children = $self->children;
953 delete $self->{children}; 1519 delete $self->{children};
… …
955 for (@children) { 1521 for (@children) {
956 delete $_->{parent}; 1522 delete $_->{parent};
957 $_->hide; 1523 $_->hide;
958 } 1524 }
959 1525
960 $self->update; 1526 $self->realloc;
961} 1527}
962 1528
963sub get_wh { 1529sub get_wh {
964 my ($self) = @_; 1530 my ($self) = @_;
965 1531
… …
991 (sum @$ws), 1557 (sum @$ws),
992 (sum @$hs), 1558 (sum @$hs),
993 ) 1559 )
994} 1560}
995 1561
996sub size_allocate { 1562sub invoke_size_allocate {
997 my ($self, $w, $h) = @_; 1563 my ($self, $w, $h) = @_;
998 1564
999 my ($ws, $hs) = $self->get_wh; 1565 my ($ws, $hs) = $self->get_wh;
1000 1566
1001 my $req_w = sum @$ws; 1567 my $req_w = (sum @$ws) || 1;
1002 my $req_h = sum @$hs; 1568 my $req_h = (sum @$hs) || 1;
1003 1569
1004 # TODO: nicer code && do row_expand 1570 # TODO: nicer code && do row_expand
1005 my @col_expand = @{$self->{col_expand}}; 1571 my @col_expand = @{$self->{col_expand}};
1006 @col_expand = (1) x @$ws unless @col_expand; 1572 @col_expand = (1) x @$ws unless @col_expand;
1007 my $col_expand = (sum @col_expand) || 1; 1573 my $col_expand = (sum @col_expand) || 1;
1008 1574
1009 # linearly scale sizes 1575 # linearly scale sizes
1010 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1011 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1012 1578
1013 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1014 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1015 1581
1016 my $y; 1582 my $y;
1017 1583
1018 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1019 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1033 } 1599 }
1034 1600
1035 $y += $row_h; 1601 $y += $row_h;
1036 } 1602 }
1037 1603
1604 1
1038} 1605}
1039 1606
1040sub find_widget { 1607sub find_widget {
1041 my ($self, $x, $y) = @_; 1608 my ($self, $x, $y) = @_;
1042 1609
… …
1061 } 1628 }
1062} 1629}
1063 1630
1064############################################################################# 1631#############################################################################
1065 1632
1066package CFClient::UI::HBox; 1633package CFPlus::UI::Box;
1067 1634
1068# TODO: wrap into common Box base class
1069
1070our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1071 1636
1072sub size_request { 1637sub size_request {
1073 my ($self) = @_; 1638 my ($self) = @_;
1074 1639
1075 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}
1076 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 }
1077 ( 1676 }
1078 (List::Util::sum map $_->[0], @alloc), 1677
1079 (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 @_,
1080 ) 1703 )
1081} 1704}
1082 1705
1083sub size_allocate {
1084 my ($self, $w, $h) = @_;
1085
1086 ($h, $w) = ($w, $h);
1087
1088 my $children = $self->{children};
1089
1090 my @h = map $_->{req_w}, @$children;
1091
1092 my $req_h = List::Util::sum @h;
1093
1094 if ($req_h > $h) {
1095 # ah well, not enough space
1096 $_ *= $h / $req_h for @h;
1097 } else {
1098 my $exp = List::Util::sum map $_->{expand}, @$children;
1099 $exp ||= 1;
1100
1101 for (0 .. $#$children) {
1102 my $child = $children->[$_];
1103
1104 my $alloc_h = $h[$_];
1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1106 $h[$_] = $alloc_h;
1107 }
1108 }
1109
1110 CFClient::UI::harmonize \@h;
1111
1112 my $y = 0;
1113 for (0 .. $#$children) {
1114 my $child = $children->[$_];
1115 my $h = $h[$_];
1116 $child->configure ($y, 0, $h, $w);
1117
1118 $y += $h;
1119 }
1120
1121 1
1122}
1123
1124############################################################################# 1706#############################################################################
1125 1707
1126package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1127 1709
1128# TODO: wrap into common Box base class 1710our @ISA = CFPlus::UI::Box::;
1129 1711
1130our @ISA = CFClient::UI::Container::; 1712sub new {
1713 my $class = shift;
1131 1714
1132sub size_request { 1715 $class->SUPER::new (
1133 my ($self) = @_; 1716 vertical => 1,
1134 1717 @_,
1135 my @alloc = map [$_->size_request], @{$self->{children}};
1136
1137 (
1138 (List::Util::max map $_->[0], @alloc),
1139 (List::Util::sum map $_->[1], @alloc),
1140 ) 1718 )
1141} 1719}
1142 1720
1143sub size_allocate {
1144 my ($self, $w, $h) = @_;
1145
1146 my $children = $self->{children};
1147
1148 my @h = map $_->{req_h}, @$children;
1149
1150 my $req_h = List::Util::sum @h;
1151
1152 if ($req_h > $h) {
1153 # ah well, not enough space
1154 $_ *= $h / $req_h for @h;
1155 } else {
1156 my $exp = List::Util::sum map $_->{expand}, @$children;
1157 $exp ||= 1;
1158
1159 for (0 .. $#$children) {
1160 my $child = $children->[$_];
1161
1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1163 }
1164 }
1165
1166 CFClient::UI::harmonize \@h;
1167
1168 my $y = 0;
1169 for (0 .. $#$children) {
1170 my $child = $children->[$_];
1171 my $h = $h[$_];
1172 $child->configure (0, $y, $w, $h);
1173
1174 $y += $h;
1175 }
1176
1177 1
1178}
1179
1180############################################################################# 1721#############################################################################
1181 1722
1182package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1183 1724
1184our @ISA = CFClient::UI::Base::; 1725our @ISA = CFPlus::UI::DrawBG::;
1185 1726
1186use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1187 1728
1188sub new { 1729sub new {
1189 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1190 1731
1191 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1733 fg => [1, 1, 1],
1734 #bg => none
1735 #active_bg => none
1193 #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),
1194 fontsize => 1, 1743 fontsize => 1,
1195 text => "",
1196 align => -1, 1744 align => -1,
1197 valign => -1, 1745 valign => -1,
1198 padding => 2, 1746 padding_x => 2,
1199 layout => new CFClient::Layout, 1747 padding_y => 2,
1200 can_events => 0, 1748 can_events => 0,
1201 %arg 1749 %arg
1202 ); 1750 );
1203 1751
1204 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1206 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1755 $self->{template} = $layout;
1208 } 1756 }
1209 1757
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1758 if (exists $self->{markup}) {
1211 $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 }
1212 1763
1213 $self 1764 $self
1214}
1215
1216sub escape {
1217 local $_ = $_[1];
1218
1219 s/&/&amp;/g;
1220 s/>/&gt;/g;
1221 s/</&lt;/g;
1222
1223 $_[1]
1224} 1765}
1225 1766
1226sub update { 1767sub update {
1227 my ($self) = @_; 1768 my ($self) = @_;
1228 1769
1229 delete $self->{texture}; 1770 delete $self->{texture};
1230 $self->SUPER::update; 1771 $self->SUPER::update;
1231} 1772}
1232 1773
1233sub reconfigure { 1774sub realloc {
1234 my ($self) = @_; 1775 my ($self) = @_;
1235 1776
1236 delete $self->{texture}; 1777 delete $self->{ox};
1778 $self->SUPER::realloc;
1237} 1779}
1238 1780
1239sub set_text { 1781sub set_text {
1240 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1241 1783
1242 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1244 1786
1245 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1246 1788
1247 delete $self->{texture}; 1789 delete $self->{size_req};
1790 $self->realloc;
1248 $self->update; 1791 $self->update;
1249 $self->check_size;
1250} 1792}
1251 1793
1252sub set_markup { 1794sub set_markup {
1253 my ($self, $markup) = @_; 1795 my ($self, $markup) = @_;
1254 1796
1255 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1257 1799
1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1801
1258 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1259 1803
1260 delete $self->{texture}; 1804 delete $self->{size_req};
1805 $self->realloc;
1261 $self->update; 1806 $self->update;
1262 $self->check_size;
1263} 1807}
1264 1808
1265sub size_request { 1809sub size_request {
1266 my ($self) = @_; 1810 my ($self) = @_;
1267 1811
1812 $self->{size_req} ||= do {
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $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});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1818
1272 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1273 1820
1274 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1275 $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);
1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1277 1825
1278 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1279 1827
1280 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1830 }
1831
1832 [$w, $h]
1282 } 1833 };
1283 1834
1284 ( 1835 @{ $self->{size_req} }
1285 $w + $self->{padding} * 2,
1286 $h + $self->{padding} * 2,
1287 )
1288} 1836}
1289 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1290sub size_allocate { 1842sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1292 1844
1845 delete $self->{ox};
1846
1293 delete $self->{texture}; 1847 delete $self->{texture}
1848 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1849
1850 1
1294} 1851}
1295 1852
1296sub set_fontsize { 1853sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1298 1855
1299 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1300 delete $self->{texture}; 1858 delete $self->{texture};
1301 $self->check_size; 1859
1302 $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;
1303} 1870}
1304 1871
1305sub _draw { 1872sub _draw {
1306 my ($self) = @_; 1873 my ($self) = @_;
1307 1874
1875 $self->SUPER::_draw; # draw background, if applicable
1876
1308 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1878 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $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});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1312 new_from_layout CFClient::Texture $self->{layout} 1884
1885 [$self->{layout}->size]
1313 }; 1886 };
1314 1887
1315 glEnable GL_BLEND; 1888 unless (exists $self->{ox}) {
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319
1320 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1325 : ($self->{w} - $tex->{w}) * 0.5 1891 : ($self->{w} - $size->[0]) * 0.5);
1326 );
1327 1892
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1331 : ($self->{h} - $tex->{h}) * 0.5 1895 : ($self->{h} - $size->[1]) * 0.5);
1332 ); 1896 };
1333 1897
1334 $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];
1335 1900
1336 glDisable GL_TEXTURE_2D; 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1337 glDisable GL_BLEND;
1338} 1902}
1339 1903
1340############################################################################# 1904#############################################################################
1341 1905
1342package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1343 1907
1344our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1345 1909
1346use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1347 1911
1348sub new { 1912sub new {
1349 my $class = shift; 1913 my $class = shift;
1350 1914
1351 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1355 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1356 can_hover => 1, 1920 can_hover => 1,
1357 can_focus => 1, 1921 can_focus => 1,
1358 valign => 0, 1922 valign => 0,
1359 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1925 #text => ...
1926 #hidden => "*",
1360 @_ 1927 @_
1361 ) 1928 )
1362} 1929}
1363 1930
1364sub _set_text { 1931sub _set_text {
… …
1366 1933
1367 delete $self->{cur_h}; 1934 delete $self->{cur_h};
1368 1935
1369 return if $self->{text} eq $text; 1936 return if $self->{text} eq $text;
1370 1937
1371 delete $self->{texture};
1372
1373 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1374 $self->{text} = $text; 1939 $self->{text} = $text;
1375 1940
1376 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1943 delete $self->{size_req};
1378 1944
1379 $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);
1380} 1956}
1381 1957
1382sub get_text { 1958sub get_text {
1383 $_[0]{text} 1959 $_[0]{text}
1384} 1960}
… …
1389 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1390 1966
1391 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1392} 1968}
1393 1969
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
1405 $self->update;
1406}
1407
1408sub key_down { 1970sub invoke_key_down {
1409 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1410 1972
1411 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1412 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1414 1976
1415 my $text = $self->get_text; 1977 my $text = $self->get_text;
1416 1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1980
1417 if ($sym == 8) { 1981 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1983 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } 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 = "";
1426 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 2004 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 2005 $self->emit ('escape');
1431 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
2010 } else {
2011 return 0;
1433 } 2012 }
1434 2013
1435 $self->_set_text ($text); 2014 $self->_set_text ($text);
2015
2016 $self->realloc;
1436 $self->update; 2017 $self->update;
1437}
1438 2018
2019 1
2020}
2021
1439sub focus_in { 2022sub invoke_focus_in {
1440 my ($self) = @_; 2023 my ($self) = @_;
1441 2024
1442 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1443 2026
1444 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1445} 2028}
1446 2029
1447sub button_down { 2030sub invoke_button_down {
1448 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1449 2032
1450 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1451 2034
1452 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1453 2036
1454 # byte-index to char-index 2037 # byte-index to char-index
1455 my $text = $self->{text}; 2038 my $text = $self->{text};
1456 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1457 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1458 2041
1459 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1460 $self->update; 2043 $self->update;
2044
2045 1
1461} 2046}
1462 2047
1463sub mouse_motion { 2048sub invoke_mouse_motion {
1464 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1465# 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
1466} 2053}
1467 2054
1468sub _draw { 2055sub _draw {
1469 my ($self) = @_; 2056 my ($self) = @_;
1470 2057
1471 local $self->{fg} = $self->{fg}; 2058 local $self->{fg} = $self->{fg};
1472 2059
1473 if ($FOCUS == $self) { 2060 if ($FOCUS == $self) {
1474 glColor @{$self->{active_bg}}; 2061 glColor_premultiply @{$self->{active_bg}};
1475 $self->{fg} = $self->{active_fg}; 2062 $self->{fg} = $self->{active_fg};
1476 } else { 2063 } else {
1477 glColor @{$self->{bg}}; 2064 glColor_premultiply @{$self->{bg}};
1478 } 2065 }
1479 2066
1480 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1482 glBegin GL_QUADS; 2069 glBegin GL_QUADS;
1483 glVertex 0 , 0; 2070 glVertex 0 , 0;
1484 glVertex 0 , $self->{h}; 2071 glVertex 0 , $self->{h};
1485 glVertex $self->{w}, $self->{h}; 2072 glVertex $self->{w}, $self->{h};
1486 glVertex $self->{w}, 0; 2073 glVertex $self->{w}, 0;
… …
1497 utf8::encode $text; 2084 utf8::encode $text;
1498 2085
1499 @$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)
1500 } 2087 }
1501 2088
1502 glColor @{$self->{fg}};
1503 glBegin GL_LINES; 2089 glBegin GL_LINES;
1504 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};
1505 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};
1506 glEnd; 2092 glEnd;
1507 } 2093 }
1508} 2094}
1509 2095
2096#############################################################################
2097
1510package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1511 2099
1512our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1513 2101
1514use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1515 2103
1516sub key_down { 2104sub invoke_key_down {
1517 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1518 2106
1519 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1520 2108
1521 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1522 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1523 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1524 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt); 2115 $self->emit (activate => $txt);
1527 $self->update; 2116 $self->update;
1528 2117
1529 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1532 } 2121 }
1533 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1536 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 } 2126 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 } 2128 }
1540 2129
1541 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1542 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544 2133
1545 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else { 2136 } else {
1548 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1549 } 2138 }
1550 2139
1551 } else { 2140 } else {
1552 $self->SUPER::key_down ($ev); 2141 return $self->SUPER::invoke_key_down ($ev)
2142 }
2143
1553 } 2144 1
1554
1555} 2145}
1556 2146
1557############################################################################# 2147#############################################################################
1558 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
1559package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1560 2189
1561our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1562 2191
1563use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1564 2193
1565my @tex = 2194my @tex =
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1567 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1568 2197
1569sub new { 2198sub new {
1570 my $class = shift; 2199 my $class = shift;
1571 2200
1572 $class->SUPER::new ( 2201 $class->SUPER::new (
1573 padding => 4, 2202 padding_x => 4,
2203 padding_y => 4,
1574 fg => [1, 1, 1], 2204 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 2205 active_fg => [0, 0, 1],
1577 can_hover => 1, 2206 can_hover => 1,
1578 align => 0, 2207 align => 0,
1579 valign => 0, 2208 valign => 0,
1580 can_events => 1, 2209 can_events => 1,
1581 @_ 2210 @_
1582 ) 2211 )
1583} 2212}
1584 2213
1585sub button_up { 2214sub invoke_button_up {
1586 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1587 2216
2217 $self->emit ("activate")
1588 if ($x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) { 2219 && $y >= 0 && $y < $self->{h};
1590 $self->emit ("activate"); 2220
1591 } 2221 1
1592} 2222}
1593 2223
1594sub _draw { 2224sub _draw {
1595 my ($self) = @_; 2225 my ($self) = @_;
1596 2226
1597 local $self->{fg} = $self->{fg}; 2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1598 2228
1599 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg};
1601 }
1602
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 2229 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 2231 glColor 0, 0, 0, 1;
1608 2232
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2233 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 2234
1611 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 2236
1614 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1615} 2238}
1616 2239
1617############################################################################# 2240#############################################################################
1618 2241
1619package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1620 2243
1621our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1622 2245
1623my @tex = 2246my @tex =
1624 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1625 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1626 2249
1627use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1628 2251
1629sub new { 2252sub new {
1630 my $class = shift; 2253 my $class = shift;
1631 2254
1632 $class->SUPER::new ( 2255 $class->SUPER::new (
1633 padding => 2, 2256 padding_x => 2,
2257 padding_y => 2,
1634 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1635 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],
1636 state => 0, 2262 state => 0,
1637 can_hover => 1, 2263 can_hover => 1,
1638 @_ 2264 @_
1639 ) 2265 )
1640} 2266}
1641 2267
1642sub size_request { 2268sub size_request {
1643 my ($self) = @_; 2269 my ($self) = @_;
1644 2270
1645 ($self->{padding} * 2 + 6) x 2 2271 (6) x 2
1646} 2272}
1647 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1648sub button_down { 2282sub invoke_button_down {
1649 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1650 2284
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1653 $self->{state} = !$self->{state}; 2287 $self->toggle;
1654 $self->emit (changed => $self->{state}); 2288 } else {
2289 return 0
2290 }
2291
1655 } 2292 1
1656} 2293}
1657 2294
1658sub _draw { 2295sub _draw {
1659 my ($self) = @_; 2296 my ($self) = @_;
1660 2297
1661 $self->SUPER::_draw; 2298 $self->SUPER::_draw;
1662 2299
1663 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1664 2301
1665 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;
1666 2305
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2306 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 2307
1669 glEnable GL_BLEND; 2308 my $tex = $self->{state} ? $tex[1] : $tex[0];
2309
1670 glEnable GL_TEXTURE_2D; 2310 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 2311 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 2313}
1680 2314
1681############################################################################# 2315#############################################################################
1682 2316
1683package CFClient::UI::Image; 2317package CFPlus::UI::Image;
1684 2318
1685our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
1686 2320
1687use CFClient::OpenGL; 2321use CFPlus::OpenGL;
1688use Carp qw/confess/;
1689 2322
1690our %loaded_images; 2323our %texture_cache;
1691 2324
1692sub new { 2325sub new {
1693 my $class = shift; 2326 my $class = shift;
1694 2327
1695 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
1696 2332
1697 $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";
1698 2335
1699 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1700 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;
1701 2338
1702 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
1703 2340
1704 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1705
1706 $self->{aspect} = $tex->{w} / $tex->{h};
1707 2342
1708 $self 2343 $self
1709} 2344}
1710 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
1711sub size_request { 2361sub size_request {
1712 my ($self) = @_; 2362 my ($self) = @_;
1713 2363
1714 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
1715} 2365}
1716 2366
1717sub _draw { 2367sub _draw {
1718 my ($self) = @_; 2368 my ($self) = @_;
1719 2369
… …
1726 glTranslate 0, -$self->{w}, 0; 2376 glTranslate 0, -$self->{w}, 0;
1727 2377
1728 ($w, $h) = ($h, $w); 2378 ($w, $h) = ($h, $w);
1729 } 2379 }
1730 2380
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 2383
1736 $tex->draw_quad (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
1737 2385
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
1740} 2387}
1741 2388
1742############################################################################# 2389#############################################################################
1743 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
1744package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
1745 2428
1746our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
1747 2430
1748use List::Util qw(min max); 2431use List::Util qw(min max);
1749 2432
1750use CFClient::OpenGL; 2433use CFPlus::OpenGL;
1751 2434
1752my %tex = ( 2435my %tex = (
1753 food => [ 2436 food => [
1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1756 ], 2439 ],
1757 grace => [ 2440 grace => [
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1759 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/
1760 ], 2443 ],
1761 hp => [ 2444 hp => [
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1764 ], 2447 ],
1765 mana => [ 2448 mana => [
1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1767 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/
1768 ], 2451 ],
1769); 2452);
1770 2453
1771# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1831 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
1832 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
1833 2516
1834 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
1835 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);
1836 2522
1837 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
1838 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;
1839 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 2528
1842 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2529 glBindTexture GL_TEXTURE_2D, $t1->{name};
1843 glBegin GL_QUADS; 2530 glBegin GL_QUADS;
… …
1858 2545
1859 if ($t3) { 2546 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd; 2553 glEnd;
1867 } 2554 }
1868 2555
1869 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
1870 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
1871} 2558}
1872 2559
1873############################################################################# 2560#############################################################################
1874 2561
1875package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
1876 2563
1877our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
1878 2565
1879sub new { 2566sub new {
1880 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
1881 2568
1882 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
1884 can_hover => 1, 2571 can_hover => 1,
1885 can_events => 1, 2572 can_events => 1,
1886 %arg, 2573 %arg,
1887 ); 2574 );
1888 2575
1889 $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");
1890 $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);
1891 $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");
1892 2579
1893 $self 2580 $self
1894} 2581}
1895 2582
1896sub set_fontsize { 2583sub set_fontsize {
… …
1917 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
1918} 2605}
1919 2606
1920############################################################################# 2607#############################################################################
1921 2608
1922package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
1923 2610
1924use strict; 2611use strict;
1925 2612
1926use CFClient::OpenGL; 2613use CFPlus::OpenGL;
1927 2614
1928our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
1929 2616
1930my @tex = 2617my @tex =
1931 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1932 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
1933 2620
1934sub new { 2621sub new {
1935 my $class = shift; 2622 my $class = shift;
1936 2623
1937 # range [value, low, high, page] 2624 # range [value, low, high, page, unit]
1938 2625
1939 # TODO: 0-width page 2626 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2627 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2628 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2630 fg => [1, 1, 1],
1944 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],
1945 range => [0, 0, 100, 10], 2634 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2635 min_w => $::WIDTH / 80,
1947 req_h => 20, 2636 min_h => $::WIDTH / 80,
1948 vertical => 0, 2637 vertical => 0,
1949 can_hover => 1, 2638 can_hover => 1,
1950 inner_pad => 5, 2639 inner_pad => 0.02,
1951 @_ 2640 @_
1952 ); 2641 );
1953 2642
2643 $self->set_value ($self->{range}[0]);
2644 $self->update;
2645
1954 $self 2646 $self
1955} 2647}
1956 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
1957sub size_request { 2683sub size_request {
1958 my ($self) = @_; 2684 my ($self) = @_;
1959 2685
1960 my $w = $self->{req_w}; 2686 ($self->{req_w}, $self->{req_h})
1961 my $h = $self->{req_h};
1962
1963 $self->{vertical} ? ($h, $w) : ($w, $h)
1964} 2687}
1965 2688
1966sub button_down { 2689sub invoke_button_down {
1967 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
1968 2691
1969 $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
1970 $self->mouse_motion ($ev, $x, $y); 2696 $self->invoke_mouse_motion ($ev, $x, $y)
1971} 2697}
1972 2698
1973sub mouse_motion { 2699sub invoke_mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
1975 2701
1976 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
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2742 my ($value, $lo, $hi, $page) = @{$self->{range}};
2743 my $range = ($hi - $page - $lo) || 1e-100;
1978 2744
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2745 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2746
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2747 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2748 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2749
1984 $x -= $inner_pad_px; # substract the padding 2750 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2751 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2752
1990 $self->emit (changed => $x); 2753 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2754 $self->{knob_w} = $knob_w;
1992 } 2755 }
1993}
1994
1995# the inner_* stuff is for generating a padding for the slider handle,
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001}
2002
2003sub _draw {
2004 my ($self) = @_;
2005 2756
2006 $self->SUPER::_draw (); 2757 $self->SUPER::_draw ();
2007 2758
2008 my ($w, $h) = @$self{qw(w h)}; 2759 glScale $self->{w}, $self->{h};
2009 2760
2010 if ($self->{vertical}) { 2761 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2762 # draw a vertical slider like a rotated horizontal slider
2012 2763
2764 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2765 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2766 }
2018 2767
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2768 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2769 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2770
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2771 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2773
2045 # draw background 2774 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2775 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2776
2048 # draw handle 2777 # draw handle
2049 $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);
2050 2779
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2053} 2781}
2054 2782
2055############################################################################# 2783#############################################################################
2056 2784
2057package CFClient::UI::TextView; 2785package CFPlus::UI::ValSlider;
2058 2786
2059our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2060 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
2061use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2062 2831
2063sub new { 2832sub new {
2064 my $class = shift; 2833 my $class = shift;
2065 2834
2066 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2067 fontsize => 1, 2836 fontsize => 1,
2068 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2069 #font => default_font 2839 #font => default_font
2070 @_, 2840 @_,
2071 2841
2072 layout => (new CFClient::Layout), 2842 layout => (new CFPlus::Layout),
2073 par => [], 2843 par => [],
2844 max_par => 0,
2074 height => 0, 2845 height => 0,
2075 children => [ 2846 children => [
2076 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2078 ], 2849 ],
2079 ); 2850 );
2080 2851
2081 $self->{children}[1]->connect (changed => sub { 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2853
2085 $self 2854 $self
2086} 2855}
2087 2856
2088sub set_fontsize { 2857sub set_fontsize {
… …
2090 2859
2091 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2861 $self->reflow;
2093} 2862}
2094 2863
2095sub 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 {
2096 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) = @_;
2097 2902
2098 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2099 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w}); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2102 $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}}
2103 2916 );
2104 ($layout->size)[1] 2917
2918 $layout
2105} 2919}
2106 2920
2107sub reflow { 2921sub reflow {
2108 my ($self) = @_; 2922 my ($self) = @_;
2109 2923
2110 $self->{need_reflow}++; 2924 $self->{need_reflow}++;
2111 $self->update; 2925 $self->update;
2112} 2926}
2113 2927
2114sub 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 {
2115 my ($self, $w, $h) = @_; 2942 my ($self, $para) = @_;
2116 2943
2117 $self->SUPER::size_allocate ($w, $h); 2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2118 2945
2119 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2946 $self->{scroll_to} = $para;
2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2947 $self->update;
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2948}
2122 2949
2123 $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]);
2124} 2959}
2125 2960
2126sub add_paragraph { 2961sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2962 my $self = shift;
2128 2963
2129 #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 };
2130 2974
2131 my $height = $self->text_height ($text); 2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2976 push @{$self->{par}}, $para;
2977 }
2132 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
2133 $self->{height} += $height; 3016 $self->{height} = $height;
3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2134 3018
2135 push @{$self->{par}}, [$height, $color, $text]; 3019 delete $self->{texture};
3020 }
2136 3021
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3022 if (my $paridx = delete $self->{scroll_to}) {
2138 $self->{children}[1]->update; 3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2139} 3025}
2140 3026
2141sub update { 3027sub update {
2142 my ($self) = @_; 3028 my ($self) = @_;
2143 3029
… …
2145 3031
2146 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2147 3033
2148 delete $self->{texture}; 3034 delete $self->{texture};
2149 3035
2150 $ROOT->on_refresh ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
2151 if (delete $self->{need_reflow}) { 3037 $self->force_uptodate;
2152 my $height = 0;
2153 3038
2154 $height += $_->[0] = $self->text_height ($_->[2]) 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2155 for @{$self->{par}};
2156 3040
2157 $self->{height} = $height;
2158
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2160
2161 delete $self->{texture};
2162 }
2163
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2165 glClearColor 0, 0, 0, 1; 3042 glClearColor 0, 0, 0, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2167 3044
2168 glEnable GL_BLEND; 3045 package CFPlus::UI::Base;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2170 glEnable GL_TEXTURE_2D; 3047 (0, 0, $self->{w}, $self->{h});
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172 3048
2173 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2174 3050
3051 my $paridx = 0;
3052 my $top_paragraph;
3053 my $top = int $self->{children}[1]{range}[0];
3054
2175 my $y0 = $top; 3055 my $y0 = $top;
2176 my $y1 = $top + $self->{h}; 3056 my $y1 = $top + $H;
2177 3057
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
2184 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2185 my $h = $par->[0]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2186 3061
2187 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2188 $layout->set_text ($par->[2]); 3063 my $layout = $self->get_layout ($para);
2189 3064
2190 glColor @{ $par->[1] }; 3065 $layout->render ($para->{indent}, $y - $y0);
2191 my ($W, $H) = $layout->size; 3066
2192 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 }
2193 } 3079 }
2194 3080
2195 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2196 } 3083 }
2197 3084
2198 glDisable GL_TEXTURE_2D; 3085 $self->{top_paragraph} = $top_paragraph;
2199 glDisable GL_BLEND;
2200 }; 3086 };
2201 }); 3087 });
2202} 3088}
2203 3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
3097}
3098
2204sub _draw { 3099sub _draw {
2205 my ($self) = @_; 3100 my ($self) = @_;
2206 3101
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 3102 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 3104 glColor 0, 0, 0, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 3105 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2213 }
2214 3107
2215 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2216
2217} 3109}
2218 3110
2219############################################################################# 3111#############################################################################
2220 3112
2221package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2222 3114
2223use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2224 3116
2225our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2226 3118
2227sub moveto { 3119sub moveto {
2228 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2229 3121
2230 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2258 glPopMatrix; 3150 glPopMatrix;
2259} 3151}
2260 3152
2261############################################################################# 3153#############################################################################
2262 3154
2263package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2264 3156
2265our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2266 3158
2267sub new { 3159sub new {
2268 my $class = shift; 3160 my $class = shift;
2269 3161
2270 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
2271 state => 0, 3163 state => 0,
2272 connect_activate => \&toggle_flopper, 3164 on_activate => \&toggle_flopper,
2273 @_ 3165 @_
2274 ); 3166 );
2275 3167
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self 3168 $self
2282} 3169}
2283 3170
2284sub toggle_flopper { 3171sub toggle_flopper {
2285 my ($self) = @_; 3172 my ($self) = @_;
2286 3173
2287 # TODO: use animation 3174 $self->{other}->toggle_visibility;
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298} 3175}
2299 3176
2300############################################################################# 3177#############################################################################
2301 3178
2302package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2303 3180
2304our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2305 3182
2306use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2307 3184
2308sub new { 3185sub new {
2309 my $class = shift; 3186 my $class = shift;
2310 3187
2311 $class->SUPER::new ( 3188 $class->SUPER::new (
2312 @_, 3189 @_,
2313 can_events => 0, 3190 can_events => 0,
2314 ) 3191 )
2315} 3192}
2316 3193
2317sub set_markup { 3194sub set_tooltip_from {
2318 my ($self, $text) = @_; 3195 my ($self, $widget) = @_;
2319 3196
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2321 $self->{label}->set_markup ($text); 3198 if $widget->{tooltip} =~ /^#(.*)$/;
2322 $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 );
2323} 3220}
2324 3221
2325sub size_request { 3222sub size_request {
2326 my ($self) = @_; 3223 my ($self) = @_;
2327 3224
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 3226
2332 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2333} 3228}
2334 3229
2335sub size_allocate { 3230sub invoke_size_allocate {
2336 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2337 3232
2338 $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 });
2339} 3256}
2340 3257
2341sub _draw { 3258sub _draw {
2342 my ($self) = @_; 3259 my ($self) = @_;
2343 3260
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 3261 glTranslate 0.375, 0.375;
2346 3262
2347 my ($w, $h) = @$self{qw(w h)}; 3263 my ($w, $h) = @$self{qw(w h)};
2348 3264
2349 glColor 1, 0.8, 0.4; 3265 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 3276 glVertex 0 , $h;
2361 glVertex $w, $h; 3277 glVertex $w, $h;
2362 glVertex $w, 0; 3278 glVertex $w, 0;
2363 glEnd; 3279 glEnd;
2364 3280
2365 glPopMatrix; 3281 glTranslate 2 - 0.375, 2 - 0.375;
2366 3282
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2369} 3284}
2370 3285
2371############################################################################# 3286#############################################################################
2372 3287
2373package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2374 3289
2375our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2376 3291
2377use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2378 3293
2379sub new { 3294sub new {
2380 my $class = shift; 3295 my $class = shift;
2381 3296
2382 $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
2383 aspect => 1, 3298 aspect => 1,
3299 can_events => 0,
2384 @_, 3300 @_,
2385 ) 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
2386} 3318}
2387 3319
2388sub size_request { 3320sub size_request {
2389 (32, 8) 3321 (32, 8)
2390} 3322}
2391 3323
3324sub update {
3325 my ($self) = @_;
3326
3327 return unless $self->{visible};
3328
3329 $self->SUPER::update;
3330}
3331
2392sub draw { 3332sub _draw {
2393 my ($self) = @_; 3333 my ($self) = @_;
2394 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
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 3349
2397 if ($tex) { 3350 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 3351 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 3353 glColor 0, 0, 0, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 } 3356 }
3357}
3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel
3363 if $self->{timer};
3364
3365 $self->SUPER::destroy;
2407} 3366}
2408 3367
2409############################################################################# 3368#############################################################################
2410 3369
2411package CFClient::UI::Root; 3370package CFPlus::UI::Buttonbar;
2412 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
2413our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
2414 3475
2415use CFClient::OpenGL; 3476sub new {
3477 my $class = shift;
2416 3478
2417sub 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 {
2418 my ($self) = @_; 3490 my ($self, @widgets) = @_;
2419 3491
2420 $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}
2421} 3521}
2422 3522
2423sub size_request { 3523sub size_request {
2424 ($::WIDTH, $::HEIGHT) 3524 my ($self) = @_;
2425}
2426 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
2427sub 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 {
2428 my ($self, $x, $y, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
2429 3838
2430 $self->SUPER::configure ($x, $y, $w, $h);
2431
2432 for my $child (@{$self->{children}}) { 3839 for my $child ($self->children) {
2433 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)};
2434 3841
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3842 $X = $child->{force_x} if exists $child->{force_x};
2436 $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
2437 $child->configure ($X, $Y, $W,$H); 3848 $child->configure ($X, $Y, $W, $H);
3849 }
3850
2438 } 3851 1
2439} 3852}
2440 3853
2441sub _topleft { 3854sub coord2local {
2442 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
2443 3856
2444 ($x, $y) 3857 ($x, $y)
2445} 3858}
2446 3859
3860sub coord2global {
3861 my ($self, $x, $y) = @_;
3862
3863 ($x, $y)
3864}
3865
2447sub update { 3866sub update {
2448 my ($self) = @_; 3867 my ($self) = @_;
2449 3868
2450 $self->check_size; 3869 $::WANT_REFRESH++;
2451 ::refresh ();
2452} 3870}
2453 3871
2454sub add { 3872sub add {
2455 my ($self, $child) = @_; 3873 my ($self, @children) = @_;
2456 3874
2457 # integerize window positions 3875 $_->{is_toplevel} = 1
2458 $child->{x} = int $child->{x}; 3876 for @children;
2459 $child->{y} = int $child->{y};
2460 3877
2461 $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 }
2462} 3894}
2463 3895
2464sub on_refresh { 3896sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3897 my ($self, $id, $cb) = @_;
2466 3898
2467 $self->{refresh_hook}{$id} = $cb; 3899 $self->{refresh_hook}{$id} = $cb;
2468} 3900}
2469 3901
3902sub on_post_alloc {
3903 my ($self, $id, $cb) = @_;
3904
3905 $self->{post_alloc_hook}{$id} = $cb;
3906}
3907
2470sub draw { 3908sub draw {
2471 my ($self) = @_; 3909 my ($self) = @_;
2472 3910
2473 while (my $rcb = delete $self->{refresh_hook}) { 3911 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 3912 $_->()
3913 for values %{delete $self->{refresh_hook}};
2475 } 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
2476 4016
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4017 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 4019 glClear GL_COLOR_BUFFER_BIT;
2480 4020
2481 glMatrixMode GL_PROJECTION; 4021 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 4022 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 4025 glLoadIdentity;
2486 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
2487 $self->_draw; 4033 $self->_draw;
4034 }
2488} 4035}
2489 4036
2490############################################################################# 4037#############################################################################
2491 4038
2492package CFClient::UI; 4039package CFPlus::UI;
2493 4040
2494$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2496 4043
24971 40441
2498 4045

Diff Legend

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