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

Diff Legend

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