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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

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

Diff Legend

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