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

Diff Legend

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