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

Diff Legend

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