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

Diff Legend

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