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

Diff Legend

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