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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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