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

Diff Legend

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