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

Diff Legend

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