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

Diff Legend

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