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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.396 by root, Sat Jul 21 14:00:02 2007 UTC

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

Diff Legend

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