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.55 by root, Mon Apr 10 19:34:04 2006 UTC vs.
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
65 65
66 $hover->update if $hover; 66 $hover->update if $hover;
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
72 80
73sub new { 81sub new {
74 my $class = shift; 82 my $class = shift;
75 83
76 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
77} 100}
78 101
79sub move { 102sub move {
80 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 104 $self->{x} = $x;
… …
90sub size_request { 113sub size_request {
91 require Carp; 114 require Carp;
92 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
93} 116}
94 117
95sub size_allocate { 118sub _size_allocate {
96 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
97 125
98 $self->{w} = $w; 126 $self->{w} = $w;
99 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
100} 143}
101 144
102sub focus_in { 145sub focus_in {
103 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
104 150
105 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 152 $focus->update if $focus;
107 $FOCUS->update; 153 $FOCUS->update;
108} 154}
… …
116 $focus->update if $focus; #? 162 $focus->update if $focus; #?
117} 163}
118 164
119sub mouse_motion { } 165sub mouse_motion { }
120sub button_up { } 166sub button_up { }
121sub button_down { }
122sub key_down { } 167sub key_down { }
123sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
124 175
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 181
131sub draw { 182sub draw {
132 my ($self) = @_; 183 my ($self) = @_;
133 184
185 return unless $self->{h} && $self->{w};
186
134 glPushMatrix; 187 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 189 $self->_draw;
137 if ($self == $HOVER) { 190 glPopMatrix;
138 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
139 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 198 glBegin GL_QUADS;
141 glVertex 0 , 0; 199 glVertex $x , $y;
142 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
145 glEnd; 203 glEnd;
146 glDisable GL_BLEND; 204 glDisable GL_BLEND;
147 } 205 }
148 glPopMatrix;
149} 206}
150 207
151sub _draw { 208sub _draw {
152 my ($self) = @_; 209 my ($self) = @_;
153 210
154 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 212}
167 213
168sub find_widget { 214sub find_widget {
169 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
170 216
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 220
175 () 221 ()
176} 222}
177 223
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 224sub set_parent {
181 my ($self, $par) = @_; 225 my ($self, $par) = @_;
182 226
183 $self->{parent} = $par; 227 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
193 237
194 $self->{parent}->update 238 $self->{parent}->update
195 if $self->{parent}; 239 if $self->{parent};
196} 240}
197 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
198sub DESTROY { 255sub DESTROY {
199 my ($self) = @_; 256 my ($self) = @_;
200 257
201 #$self->deactivate; 258 #$self->deactivate;
202} 259}
203 260
204############################################################################# 261#############################################################################
205 262
206package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
207 264
208our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
209 269
210sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
211 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
212 321
322 my $children = delete $arg{children} || [];
323
213 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
215 326
216 $self 327 $self
217} 328}
218 329
219sub add { 330sub add {
220 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
221 332
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 333 $chld->set_parent ($self);
224 334
225 @{$self->{children}} = 335 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
228 339
229 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
231} 342}
232 343
233sub remove { 344sub remove {
234 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
235 346
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 348
238 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 350}
240 351
241sub find_widget { 352sub find_widget {
242 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
243 354
… …
260 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
261} 372}
262 373
263############################################################################# 374#############################################################################
264 375
265package Crossfire::Client::Widget::Bin; 376package CFClient::UI::Bin;
266 377
267our @ISA = Crossfire::Client::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
268 404
269sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
270 406
271sub size_request { 407sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
273} 409}
274 410
275sub size_allocate { 411sub size_allocate {
276 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
277 413
278 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
279 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 417}
282 418
283############################################################################# 419#############################################################################
284 420
285package Crossfire::Client::Widget::Window; 421package CFClient::UI::Window;
286 422
287our @ISA = Crossfire::Client::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
288 424
289use SDL::OpenGL; 425use SDL::OpenGL;
290 426
291sub new { 427sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
293 429
294 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 431}
298 432
299sub update { 433sub update {
300 my ($self) = @_; 434 my ($self) = @_;
301 435
436 # we want to do this delayed...
302 $self->render_chld; 437 $self->render_chld;
303 $self->SUPER::update; 438 $self->SUPER::update;
304} 439}
305 440
306sub render_chld { 441sub render_chld {
307 my ($self) = @_; 442 my ($self) = @_;
308 443
309 $self->{texture} = 444 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 445 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 447 );
313} 448}
314 449
315sub size_allocate { 450sub size_allocate {
316 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
317 452
318 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 454
321 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
322 456
323 $self->render_chld; 457 $self->render_chld;
324} 458}
325 459
326sub _draw { 460sub _draw {
… …
330 464
331 my $tex = $self->{texture} 465 my $tex = $self->{texture}
332 or return; 466 or return;
333 467
334 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name};
338 472
339 glBegin GL_QUADS; 473 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 474
346 glDisable GL_BLEND; 475 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
348} 477}
349 478
350############################################################################# 479#############################################################################
351 480
352package Crossfire::Client::Widget::Frame; 481package CFClient::UI::Frame;
353 482
354our @ISA = Crossfire::Client::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
355 484
356use SDL::OpenGL; 485use SDL::OpenGL;
357 486
358sub size_request { 487sub size_request {
359 my ($self) = @_; 488 my ($self) = @_;
… …
364 493
365 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
366} 495}
367 496
368sub size_allocate { 497sub size_allocate {
369 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
370 499
371 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 501
374 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
375 $self->child->move (2, 2);
376} 503}
377 504
378sub _draw { 505sub _draw {
379 my ($self) = @_; 506 my ($self) = @_;
380 507
… …
382 509
383 my ($w, $h) = $chld->size_request; 510 my ($w, $h) = $chld->size_request;
384 511
385 glBegin GL_QUADS; 512 glBegin GL_QUADS;
386 glColor 0, 0, 0; 513 glColor 0, 0, 0;
387 glTexCoord 0, 0; glVertex 0 , 0; 514 glVertex 0 , 0;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 515 glVertex 0 , $h + 4;
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 516 glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0; 517 glVertex $w + 4 , 0;
391 glEnd; 518 glEnd;
392 519
393 $chld->draw; 520 $chld->draw;
394} 521}
395 522
396############################################################################# 523#############################################################################
397 524
398package Crossfire::Client::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
399 526
400our @ISA = Crossfire::Client::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
401 528
402use SDL::OpenGL; 529use SDL::OpenGL;
403 530
404my @tex = 531my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
408sub size_request { 548sub size_request {
409 my ($self) = @_; 549 my ($self) = @_;
410 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
411 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
412 554
413 $h += $tex[1]->{height}; 555 (
414 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
415 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
416 $w += $tex[3]->{width}; 558 )
417
418 ($w, $h)
419} 559}
420 560
421sub size_allocate { 561sub size_allocate {
422 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
423 563
424 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
425 565
426 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
427 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
428 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width};
430 568
431 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
432 $w = $w < 0 ? 0 : $w; 570}
433 571
434 $self->child->size_allocate ($w, $h); 572sub button_down {
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
436} 618}
437 619
438sub _draw { 620sub _draw {
439 my ($self) = @_; 621 my ($self) = @_;
440 622
441 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
443 625
444 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
445 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
448 630
449 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
450 glBindTexture GL_TEXTURE_2D, $top->{name}; 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
451 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
452 glBegin GL_QUADS; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
453 glTexCoord 0, 0; glVertex 0 , 0; 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458
459 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name};
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468
469 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name};
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478
479 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name};
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488 636
489 my $bg = $tex[0]; 637 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494 638
639 # TODO: repeat texture not scale
495 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
496 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
497 642
498 glBegin GL_QUADS; 643 glColor @{ $self->{bg} };
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504 645
646 glDisable GL_TEXTURE_2D;
505 glDisable GL_BLEND; 647 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507 648
508 $self->child->draw; 649 $self->child->draw;
509
510} 650}
511 651
512############################################################################# 652#############################################################################
513 653
514package Crossfire::Client::Widget::Table; 654package CFClient::UI::Table;
515 655
516our @ISA = Crossfire::Client::Widget::Bin::; 656our @ISA = CFClient::UI::Base::;
657
658use List::Util qw(max sum);
517 659
518use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
519 670
520sub add { 671sub add {
521 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523 673
524 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
525 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
526 $self->update; 678 $self->update;
527} 679}
528 680
529sub max_row_height { 681sub get_wh {
530 my ($self, $row) = @_; 682 my ($self) = @_;
531 683
532 my $hs = 0; 684 my (@w, @h);
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
534 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
535 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
536 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
537 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
538 } 697 }
539 } 698 }
540 return $hs;
541}
542 699
543sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
544 my ($self, $col) = @_; 704 my ($self) = @_;
545 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
546 my $ws = 0; 739 my $x = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
548 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
549 if ($c) { 742 for my $c (0 .. $#$row) {
550 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
551 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
552 } 750 }
751
752 $y += $row_h;
553 } 753 }
554 return $ws; 754
555} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
556 788
557sub size_request { 789sub size_request {
558 my ($self) = @_; 790 my ($self) = @_;
559 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
560 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
561 806
562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
563 $hs += $self->max_row_height ($yi);
564 }
565 808
566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
567 my $wm = 0; 810
568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
569 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
570 } 826 }
571 if ($ws < $wm) { $ws = $wm }
572 } 827 }
573
574 return ($ws, $hs);
575}
576
577sub _draw {
578 my ($self) = @_;
579 828
580 my $y = 0; 829 my $y = 0;
581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
582 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
583 834
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
585
586 my $c = $self->{children}->[$yi]->[$xi];
587 if ($c) {
588 $c->move ($x, $y, 0); #TODO: Move to size_request
589 $c->draw if $c;
590 }
591
592 $x += $self->max_col_width ($xi);
593 }
594
595 $y += $self->max_row_height ($yi);
596 } 836 }
597} 837}
598 838
599############################################################################# 839#############################################################################
600 840
601package Crossfire::Client::Widget::VBox; 841package CFClient::UI::VBox;
602 842
843# TODO: wrap into common Box base class
844
603our @ISA = Crossfire::Client::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
604
605use SDL::OpenGL;
606 846
607sub size_request { 847sub size_request {
608 my ($self) = @_; 848 my ($self) = @_;
609 849
610 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
614 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
615 ) 855 )
616} 856}
617 857
618sub size_allocate { 858sub size_allocate {
619 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
620 860
621 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h);
622 $self->h ($h);
623 862
624 my $exp; 863 my $children = $self->{children};
625 my @oth; 864
626 # find expand widget 865 my @h = map +($_->size_request)[1], @$children;
627 for (@{$self->{children}}) { 866
628 if ($_->{expand}) { 867 my $req_h = List::Util::sum @h;
868
869 if ($req_h > $h) {
870 # ah well, not enough space
871 $_ *= $h / $req_h for @h;
872 } else {
873 my $exp = List::Util::sum map $_->{expand}, @$children;
629 $exp = $_; 874 $exp ||= 1;
630 last; 875
876 for (0 .. $#$children) {
877 my $child = $children->[$_];
878
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631 } 880 }
632 push @oth, $_;
633 }
634
635 my ($ow, $oh);
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 } 881 }
643 882
644 my $y = 0; 883 my $y = 0;
645 for (@{$self->{children}}) { 884 for (0 .. $#$children) {
646 $_->move (0, $y); 885 my $child = $children->[$_];
647 886 my $h = $h[$_];
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
888
654 $y += $h; 889 $y += $h;
655 }
656 } 890 }
657} 891}
658 892
659############################################################################# 893#############################################################################
660 894
661package Crossfire::Client::Widget::Label; 895package CFClient::UI::Label;
662 896
663our @ISA = Crossfire::Client::Widget::; 897our @ISA = CFClient::UI::Base::;
664 898
665use SDL::OpenGL; 899use SDL::OpenGL;
666 900
667sub new { 901sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 902 my ($class, %arg) = @_;
669 903
904 my $self = $class->SUPER::new (
905 fg => [1, 1, 1],
670 $height ||= $::FONTSIZE; 906 height => $::FONTSIZE,
907 text => "",
908 align => -1,
909 padding => 2,
910 layout => new CFClient::Layout,
911 %arg
912 );
671 913
672 # TODO: color, and make height, xyz etc. optional
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
674
675 $self->set_text ($text); 914 $self->set_text ($self->{text});
676 915
677 $self 916 $self
917}
918
919sub escape_text {
920 local $_ = $_[1];
921
922 s/&/&amp;/g;
923 s/>/&gt;/g;
924 s/</&lt;/g;
925
926 $_[1]
678} 927}
679 928
680sub set_text { 929sub set_text {
681 my ($self, $text) = @_; 930 my ($self, $text) = @_;
682 931
683 $self->{text} = $text; 932 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 933 $self->{layout}->set_markup ($text);
685 934
935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
686 $self->update; 937 $self->update;
687} 938}
688 939
689sub get_text { 940sub get_text {
690 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
693} 944}
694 945
695sub size_request { 946sub size_request {
696 my ($self) = @_; 947 my ($self) = @_;
697 948
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 949 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height});
951 my ($w, $h) = $self->{layout}->size;
952
953 (
954 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2,
956 )
957}
958
959sub size_allocate {
960 my ($self, $x, $y, $w, $h) = @_;
961
962 $self->_size_allocate ($x, $y, $w, $h) or return;
963
964 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
972}
973
974sub _draw {
975 my ($self) = @_;
976
977 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
980 new_from_layout CFClient::Texture $self->{layout}
981 };
982
983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987
988 glColor @{$self->{fg}};
989
990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
996 $tex->draw_quad (0, 0);
997
998 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND;
1000}
1001
1002#############################################################################
1003
1004package CFClient::UI::Entry;
1005
1006our @ISA = CFClient::UI::Label::;
1007
1008use SDL;
1009use SDL::OpenGL;
1010
1011sub new {
1012 my $class = shift;
1013
1014 $class->SUPER::new (
1015 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
699 ( 1021 @_
700 $self->{texture}{width}, 1022 )
701 $self->{texture}{height}, 1023}
702 ) 1024
1025sub _set_text {
1026 my ($self, $text) = @_;
1027
1028 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033
1034 $text =~ s/./*/g if $self->{hidden};
1035
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037
1038 $text = substr $text, 0, $self->{cursor};
1039 utf8::encode $text;
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042}
1043
1044sub size_request {
1045 my ($self) = @_;
1046
1047 my ($w, $h) = $self->SUPER::size_request;
1048
1049 ($w + 1, $h) # add 1 for cursor
1050}
1051
1052sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056
1057 $self->_set_text ($self->{text});
1058}
1059
1060sub set_text {
1061 my ($self, $text) = @_;
1062
1063 $self->{cursor} = length $text;
1064 $self->_set_text ($text);
1065 $self->update;
1066}
1067
1068sub key_down {
1069 my ($self, $ev) = @_;
1070
1071 my $mod = $ev->key_mod;
1072 my $sym = $ev->key_sym;
1073
1074 my $uni = $ev->key_unicode;
1075
1076 my $text = $self->get_text;
1077
1078 if ($sym == SDLK_BACKSPACE) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) {
1081 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
1090 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni;
1092 }
1093
1094 $self->_set_text ($text);
1095 $self->update;
1096}
1097
1098sub focus_in {
1099 my ($self) = @_;
1100
1101 $self->{last_activity} = $::NOW;
1102
1103 $self->SUPER::focus_in;
1104}
1105
1106sub button_down {
1107 my ($self, $ev, $x, $y) = @_;
1108
1109 $self->SUPER::button_down ($ev, $x, $y);
1110
1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
1112
1113 # byte-index to char-index
1114 my $text = $self->{text};
1115 utf8::encode $text;
1116 $self->{cursor} = length substr $text, 0, $idx;
1117
1118 $self->_set_text ($self->{text});
1119 $self->update;
1120}
1121
1122sub mouse_motion {
1123 my ($self, $ev, $x, $y) = @_;
1124# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1125}
1126
1127sub _draw {
1128 my ($self) = @_;
1129
1130 local $self->{fg} = $self->{fg};
1131
1132 if ($FOCUS == $self) {
1133 glColor @{$self->{active_bg}};
1134 $self->{fg} = $self->{active_fg};
703 } else { 1135 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 1136 glColor @{$self->{bg}};
1137 }
705 1138
706 ($w, $h) 1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1141 glBegin GL_QUADS;
1142 glVertex 0 , 0;
1143 glVertex 0 , $self->{h};
1144 glVertex $self->{w}, $self->{h};
1145 glVertex $self->{w}, 0;
1146 glEnd;
1147 glDisable GL_BLEND;
1148
1149 $self->SUPER::_draw;
1150
1151 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1153 glColor @{$self->{fg}};
1154 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157 glEnd;
1158 }
1159}
1160
1161package CFClient::UI::LineEntry;
1162
1163our @ISA = CFClient::UI::Entry::;
1164
1165use SDL;
1166use SDL::OpenGL;
1167
1168sub key_down {
1169 my ($self, $ev) = @_;
1170
1171 my $sym = $ev->key_sym;
1172
1173 if ($sym == SDLK_RETURN) {
1174 $self->emit (activate => $self->get_text);
1175 $self->update;
1176
1177 } else {
1178 $self->SUPER::key_down ($ev);
1179 }
1180
1181}
1182
1183#############################################################################
1184
1185package CFClient::UI::Button;
1186
1187our @ISA = CFClient::UI::Label::;
1188
1189use SDL;
1190use SDL::OpenGL;
1191
1192my @tex =
1193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1194 qw(b1_button_active.png);
1195
1196sub new {
1197 my $class = shift;
1198
1199 $class->SUPER::new (
1200 padding => 4,
1201 fg => [1, 1, 1],
1202 bg => [1, 1, 1, 0.2],
1203 active_fg => [1, 1, 0],
1204 can_hover => 1,
1205 @_
707 } 1206 )
1207}
708 1208
1209sub button_up {
1210 my ($self, $ev, $x, $y) = @_;
1211
1212 if ($x >= 0 && $x < $self->{w}
1213 && $y >= 0 && $y < $self->{h}) {
1214 $self->emit ("activate");
1215 }
709} 1216}
710 1217
711sub _draw { 1218sub _draw {
712 my ($self) = @_; 1219 my ($self) = @_;
713 1220
714 my $tex = $self->{texture}; 1221 local $self->{fg} = $self->{fg};
1222 my $tex = $tex[0];
715 1223
716 glEnable GL_BLEND; 1224 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 1225 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1227
1228 if ($GRAB == $self) {
1229 $self->{fg} = $self->{active_fg};
1230 }
1231
720 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1232 glBindTexture GL_TEXTURE_2D, $tex->{name};
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
721 1234
722 glColor 1, 0, 0, 1; # TODO color 1235 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
723 1236
724 glBegin GL_QUADS; 1237 glDisable GL_TEXTURE_2D;
725 glTexCoord 0, 0; glVertex 0 , 0; 1238 glDisable GL_BLEND;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1239
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1240 $self->SUPER::_draw;
728 glTexCoord 1, 0; glVertex $tex->{width}, 0; 1241}
1242
1243#############################################################################
1244
1245package CFClient::UI::CheckBox;
1246
1247our @ISA = CFClient::UI::DrawBG::;
1248
1249use SDL;
1250use SDL::OpenGL;
1251
1252sub new {
1253 my $class = shift;
1254
1255 $class->SUPER::new (
1256 padding => 2,
1257 fg => [1, 1, 1],
1258 active_fg => [1, 1, 0],
1259 state => 0,
1260 can_hover => 1,
1261 @_
1262 )
1263}
1264
1265sub size_request {
1266 my ($self) = @_;
1267
1268 ($self->{padding} * 2 + 6) x 2
1269}
1270
1271sub size_allocate {
1272 my ($self, $x, $y, $w, $h) = @_;
1273
1274 $self->_size_allocate ($x, $y, $w, $h);
1275}
1276
1277sub button_down {
1278 my ($self, $ev, $x, $y) = @_;
1279
1280 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1281 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1282 $self->{state} = !$self->{state};
1283 $self->emit (changed => $self->{state});
1284 }
1285}
1286
1287sub _draw {
1288 my ($self) = @_;
1289
1290 $self->SUPER::_draw;
1291
1292 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293
1294 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1295
1296 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1297
1298 glBegin GL_LINE_LOOP;
1299 glVertex 0 , 0;
1300 glVertex 0 , $s;
1301 glVertex $s, $s;
1302 glVertex $s, 0;
729 glEnd; 1303 glEnd;
1304
1305 if ($self->{state}) {
1306 glBegin GL_LINES;
1307 glVertex 0 , 0;
1308 glVertex $s, $s;
1309 glVertex $s, 0;
1310 glVertex 0 , $s;
1311 glEnd;
1312 }
1313}
1314
1315#############################################################################
1316
1317package CFClient::UI::Slider;
1318
1319use strict;
1320
1321use SDL::OpenGL;
1322
1323our @ISA = CFClient::UI::DrawBG::;
1324
1325my @tex =
1326 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1327 qw(s1_slider.png s1_slider_bg.png);
1328
1329sub new {
1330 my $class = shift;
1331
1332 # range [value, low, high, page]
1333
1334 # TODO: 0-width page
1335 # TODO: req_w/h are wrong with vertical
1336 # TODO: calculations are off
1337 my $self = $class->SUPER::new (
1338 fg => [1, 1, 1],
1339 active_fg => [0, 0, 0],
1340 range => [0, 0, 100, 10],
1341 req_w => 40,
1342 req_h => 13,
1343 vertical => 0,
1344 can_hover => 1,
1345 @_
1346 );
1347
1348 $self
1349}
1350
1351sub size_request {
1352 my ($self) = @_;
1353
1354 my $w = $self->{req_w};
1355 my $h = $self->{req_h};
1356
1357 $self->{vertical} ? ($h, $w) : ($w, $h)
1358}
1359
1360sub button_down {
1361 my ($self, $ev, $x, $y) = @_;
1362
1363 $self->SUPER::button_down ($ev, $x, $y);
1364 $self->mouse_motion ($ev, $x, $y);
1365}
1366
1367sub mouse_motion {
1368 my ($self, $ev, $x, $y) = @_;
1369
1370 if ($GRAB == $self) {
1371 my ($value, $lo, $hi, $page) = @{$self->{range}};
1372
1373 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374
1375 $x = $x * ($hi - $lo) / $w + $lo;
1376 $x = $lo if $x < $lo;
1377 $x = $hi - $page if $x > $hi - $page;
1378 $self->{range}[0] = $x;
1379
1380 $self->emit (changed => $x);
1381 $self->update;
1382 }
1383}
1384
1385sub _draw {
1386 my ($self) = @_;
1387
1388 $self->SUPER::_draw ();
1389
1390 my ($w, $h) = @$self{qw(w h)};
1391
1392 if ($self->{vertical}) {
1393 # draw a vertical slider like a rotated horizontal slider
1394
1395 glRotate 90, 0, 0, 1;
1396 glTranslate 0, -$self->{w}, 0;
1397
1398 ($w, $h) = ($h, $w);
1399 }
1400
1401 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403
1404 my ($value, $lo, $hi, $page) = @{$self->{range}};
1405
1406 # the inner_* stuff is for generating a padding for the slider handle,
1407 # so that the handle doesn't leave the texture. This calculation isn't 100%
1408 # correct propably, but it does the job for now
1409 my $inner_pad = 5; # 5% of width for slider bg texture border
1410 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412
1413 $page = int $page * $inner_w / ($hi - $lo);
1414 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415
1416 $w -= $page;
1417 $page &= ~1;
1418 glTranslate $page * 0.5, 0, 0;
1419 $page ||= 2;
1420
1421 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1422 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1423
1424 glEnable GL_BLEND;
1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1426 glEnable GL_TEXTURE_2D;
1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1428
1429 # draw background
1430 $tex[1]->draw_quad (0, 0, $w, $h);
1431
1432 # draw handle
1433 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
730 1434
731 glDisable GL_BLEND; 1435 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 1436 glDisable GL_TEXTURE_2D;
733} 1437}
734 1438
735############################################################################# 1439#############################################################################
736 1440
737package Crossfire::Client::Widget::Entry; 1441package CFClient::UI::TextView;
738 1442
739our @ISA = Crossfire::Client::Widget::Label::; 1443our @ISA = CFClient::UI::HBox::;
1444
1445use SDL::OpenGL;
1446
1447sub new {
1448 my $class = shift;
1449
1450 my $self = $class->SUPER::new (
1451 par => [],
1452 @_,
1453 children => [
1454 (new CFClient::UI::Empty expand => 1),
1455 (new CFClient::UI::Slider vertical => 1),
1456 ],
1457 );
1458
1459 $self
1460}
1461
1462sub add_paragraph {
1463 my ($self, $color, $text) = @_;
1464
1465 push @{$self->{par}}, [$color, $text];
1466 my $count = scalar @{$self->{par}};
1467 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1468 $self->{children}[1]->update;
1469}
1470
1471sub _draw {
1472 my ($self) = @_;
1473
1474 my $par = $self->{par};
1475
1476 my $bottom = (scalar @$par) - 1;
1477
1478 my $w = $self->{children}[0]{w};
1479 my $y = $self->{h};
1480
1481 glEnable GL_BLEND;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483 glEnable GL_TEXTURE_2D;
1484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1485
1486 # TODO: everything!
1487 while ($y > 0 && $bottom >= 0) {
1488 my $par = $par->[$bottom--];
1489
1490 my $layout = new CFClient::Layout;
1491
1492 $layout->set_height ($::FONTSIZE);
1493 $layout->set_width ($w);
1494 $layout->set_text ($par->[1]);
1495 my $tex = new_from_layout CFClient::Texture $layout;
1496 $y -= $tex->{h};
1497
1498 glColor @{ $par->[0] };
1499 $tex->draw_quad (0, $y);
1500 }
1501
1502 glDisable GL_TEXTURE_2D;
1503 glDisable GL_BLEND;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::MapWidget;
1509
1510use strict;
1511
1512use List::Util qw(min max);
740 1513
741use SDL; 1514use SDL;
742use SDL::OpenGL; 1515use SDL::OpenGL;
743 1516
744sub key_down { 1517our @ISA = CFClient::UI::Base::;
745 my ($self, $ev) = @_;
746 1518
747 my $mod = $ev->key_mod; 1519sub new {
748 my $sym = $ev->key_sym; 1520 my $class = shift;
749 1521
750 my $uni = $ev->key_unicode; 1522 $class->SUPER::new (
751 1523 z => -1,
752 my $text = $self->get_text; 1524 can_focus => 1,
753 1525 list => (glGenLists 1),
754 if ($sym == SDLK_BACKSPACE) { 1526 @_
755 substr $text, -1, 1, '';
756 } elsif ($uni) {
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 } 1527 )
760
761 $self->set_text ($text);
762} 1528}
763
764sub button_down {
765 my ($self, $ev) = @_;
766
767 $self->focus_in;
768}
769
770sub _draw {
771 my ($self) = @_;
772
773 if ($FOCUS == $self) {
774 glColor 1, 1, 1;
775 } else {
776 glColor 0.7, 0.7, 0.7;
777 }
778
779 glBegin GL_QUADS;
780 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1;
782 glVertex $self->{w} - 1, $self->{h} - 1;
783 glVertex $self->{w} - 1, 0;
784 glEnd;
785
786 $self->SUPER::_draw;
787}
788
789#############################################################################
790
791package Crossfire::Client::Widget::MapWidget;
792
793use strict;
794
795use List::Util qw(min max);
796
797use SDL;
798use SDL::OpenGL;
799use SDL::OpenGL::Constants;
800
801our @ISA = Crossfire::Client::Widget::;
802 1529
803sub key_down { 1530sub key_down {
804 print "MAPKEYDOWN\n"; 1531 print "MAPKEYDOWN\n";
805} 1532}
806 1533
807sub key_up { 1534sub key_up {
808} 1535}
809 1536
810sub size_request { 1537sub size_request {
811 ( 1538 (
812 1 + int $::WIDTH / 32, 1539 1 + 32 * int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32, 1540 1 + 32 * int $::HEIGHT / 32,
814 ) 1541 )
815} 1542}
816 1543
1544sub update {
1545 my ($self) = @_;
1546
1547 $self->{need_update} = 1;
1548 $self->SUPER::update;
1549}
1550
817sub _draw { 1551sub draw {
818 my ($self) = @_; 1552 my ($self) = @_;
819 1553
820 my $mx = $::CONN->{mapx}; 1554 $self->{need_update}++;#d#
821 my $my = $::CONN->{mapy}; 1555 if (delete $self->{need_update}) {
1556 glNewList $self->{list}, GL_COMPILE;
822 1557
823 my $map = $::CONN->{map};
824
825 my ($xofs, $yofs);
826
827 my $sw = 1 + int $::WIDTH / 32; 1558 my $sw = int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32; 1559 my $sh = int $::HEIGHT / 32;
829 1560
830 if ($::CONN->{mapw} > $sw) { 1561 if ($::MAP) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1562 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
832 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 }
835 1563
836 if ($::CONN->{maph} > $sh) { 1564 if ($::CFG->{fow_enable}) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1565 if ($::CFG->{fow_smooth}) { # smooth fog of war
838 } else { 1566 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1567 glConvolutionFilter2D
840 } 1568 GL_CONVOLUTION_2D,
841 1569 GL_ALPHA,
842 glEnable GL_TEXTURE_2D; 1570 3, 3,
843 glEnable GL_BLEND; 1571 GL_ALPHA, GL_FLOAT,
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1572 pack "f*",
845 1573 0.1, 0.1, 0.1,
846 my $sw4 = ($sw + 3) & ~3; 1574 0.1, 0.2, 0.1,
847 my $lighting = "\x00" x ($sw4 * $sh); 1575 0.1, 0.1, 0.1,
848 1576 ;
849 for my $x (0 .. $sw - 1) { 1577 glEnable GL_CONVOLUTION_2D;
850 for my $y (0 .. $sh - 1) {
851
852 my $cell = $map->[$x + $xofs][$y + $yofs]
853 or next;
854
855 my $darkness = $cell->[0] * (1 / 255);
856 if ($darkness < 0) {
857 $darkness = $cell->[1] ? 0.1 : 0;
858 } 1578 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860 1579
861 for my $num (grep $_, @$cell[1,2,3]) { 1580 my $tex = new CFClient::Texture
862 my $tex = $::CONN->{face}[$num]{texture} || next; 1581 w => $w,
1582 h => $h,
1583 data => $data,
1584 internalformat => GL_ALPHA,
1585 format => GL_ALPHA;
863 1586
864 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1587 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
865 1588
866 my $w = $tex->{width}; 1589 glEnable GL_BLEND;
867 my $h = $tex->{height}; 1590 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
868 1592
869 my $px = ($x + 1) * 32 - $w; 1593 glColor +($::CFG->{fow_intensity}) x 3, 1;
870 my $py = ($y + 1) * 32 - $h; 1594 $tex->draw_quad (0, 0, $w * 32, $h * 32);
871 1595
872 glBegin GL_QUADS; 1596 glDisable GL_TEXTURE_2D;
873 glTexCoord 0, 0; glVertex $px , $py; 1597 glDisable GL_BLEND;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd;
878 } 1598 }
879 } 1599 }
880 }
881 1600
882# if (1) { # higher quality darkness 1601 glEndList;
883# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885#
886# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887#
888# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs;
890# } 1602 }
891 1603
892 $lighting = new Crossfire::Client::Texture 1604 glCallList $self->{list};
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898 1605
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1606 if ($FOCUS != $self) {
900 glColor 0.45, 0.45, 0.45, 1; 1607 glColor 64/255, 64/255, 64/255;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1608 glLogicOp GL_AND;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1609 glEnable GL_COLOR_LOGIC_OP;
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS; 1610 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0; 1611 glVertex 0, 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1612 glVertex 0, $::HEIGHT;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1613 glVertex $::WIDTH, $::HEIGHT;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1614 glVertex $::WIDTH, 0;
909 glEnd; 1615 glEnd;
910 1616 glDisable GL_COLOR_LOGIC_OP;
911 glDisable GL_TEXTURE_2D; 1617 }
912 glDisable GL_BLEND;
913} 1618}
914 1619
915my %DIR = ( 1620my %DIR = (
916 SDLK_KP8, [1, "north"], 1621 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"], 1622 SDLK_KP9, [2, "northeast"],
… …
933 1638
934 my $mod = $ev->key_mod; 1639 my $mod = $ev->key_mod;
935 my $sym = $ev->key_sym; 1640 my $sym = $ev->key_sym;
936 1641
937 if ($sym == SDLK_KP5) { 1642 if ($sym == SDLK_KP5) {
938 $::CONN->send ("command stay fire"); 1643 $::CONN->user_send ("command stay fire");
1644 } elsif ($sym == SDLK_a) {
1645 $::CONN->user_send ("command apply");
939 } elsif (exists $DIR{$sym}) { 1646 } elsif (exists $DIR{$sym}) {
940 if ($mod & KMOD_SHIFT) { 1647 if ($mod & KMOD_SHIFT) {
941 $self->{shft}++; 1648 $self->{shft}++;
942 $::CONN->send ("command fire $DIR{$sym}[0]"); 1649 $::CONN->user_send ("command fire $DIR{$sym}[0]");
943 } elsif ($mod & KMOD_CTRL) { 1650 } elsif ($mod & KMOD_CTRL) {
944 $self->{ctrl}++; 1651 $self->{ctrl}++;
945 $::CONN->send ("command run $DIR{$sym}[0]"); 1652 $::CONN->user_send ("command run $DIR{$sym}[0]");
946 } else { 1653 } else {
947 $::CONN->send ("command $DIR{$sym}[1]"); 1654 $::CONN->user_send ("command $DIR{$sym}[1]");
948 } 1655 }
949 } 1656 }
950} 1657}
951 1658
952sub key_up { 1659sub key_up {
… …
954 1661
955 my $mod = $ev->key_mod; 1662 my $mod = $ev->key_mod;
956 my $sym = $ev->key_sym; 1663 my $sym = $ev->key_sym;
957 1664
958 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1665 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959 $::CONN->send ("command fire_stop"); 1666 $::CONN->user_send ("command fire_stop");
960 } 1667 }
961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1668 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962 $::CONN->send ("command run_stop"); 1669 $::CONN->user_send ("command run_stop");
963 } 1670 }
964} 1671}
965 1672
966############################################################################# 1673#############################################################################
967 1674
968package Crossfire::Client::Widget::Animator; 1675package CFClient::UI::Animator;
969 1676
970use SDL::OpenGL; 1677use SDL::OpenGL;
971 1678
972our @ISA = Crossfire::Client::Widget::Bin::; 1679our @ISA = CFClient::UI::Bin::;
973 1680
974sub moveto { 1681sub moveto {
975 my ($self, $x, $y) = @_; 1682 my ($self, $x, $y) = @_;
976 1683
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1684 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 1685 $self->{speed} = 0.001;
979 $self->{time} = 1; 1686 $self->{time} = 1;
980 1687
981 ::animation_start $self; 1688 ::animation_start $self;
982} 1689}
983 1690
… …
1005 glPopMatrix; 1712 glPopMatrix;
1006} 1713}
1007 1714
1008############################################################################# 1715#############################################################################
1009 1716
1010package Crossfire::Client::Widget::Toplevel; 1717package CFClient::UI::Flopper;
1011 1718
1719our @ISA = CFClient::UI::Button::;
1720
1721sub new {
1722 my $class = shift;
1723
1724 my $self = $class->SUPER::new (
1725 state => 0,
1726 connect_activate => \&toggle_flopper,
1727 @_
1728 );
1729
1730 if ($self->{state}) {
1731 $self->{state} = 0;
1732 $self->toggle_flopper;
1733 }
1734
1735 $self
1736}
1737
1738sub toggle_flopper {
1739 my ($self) = @_;
1740
1741 # TODO: use animation
1742 if ($self->{state} = !$self->{state}) {
1743 $CFClient::UI::TOPLEVEL->add ($self->{other});
1744 $self->{other}->move (
1745 ($::WIDTH - $self->{other}{w}) * 0.5,
1746 ($::HEIGHT - $self->{other}{h}) * 0.5,
1747 );
1748 } else {
1749 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1750 }
1751}
1752
1753#############################################################################
1754
1755package CFClient::UI::Toplevel;
1756
1012our @ISA = Crossfire::Client::Widget::Container::; 1757our @ISA = CFClient::UI::Container::;
1013 1758
1014sub size_request { 1759sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1760 ($::WIDTH, $::HEIGHT)
1016} 1761}
1017 1762
1018sub size_allocate { 1763sub size_allocate {
1019 my ($self, $w, $h) = @_; 1764 my ($self, $x, $y, $w, $h) = @_;
1020 1765
1021 $self->SUPER::size_allocate ($w, $h); 1766 $self->_size_allocate ($x, $y, $w, $h);
1022 1767
1023 $_->size_allocate ($_->size_request) 1768 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1024 for @{$self->{children}}; 1769 for @{$self->{children}};
1025} 1770}
1026 1771
1772sub translate {
1773 my ($self, $x, $y) = @_;
1774
1775 ($x, $y)
1776}
1777
1027sub update { 1778sub update {
1028 my ($self) = @_; 1779 my ($self) = @_;
1029 1780
1030 $self->size_allocate ($self->size_request); 1781 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1031 ::refresh (); 1782 ::refresh ();
1032} 1783}
1033 1784
1034sub add { 1785sub add {
1035 my ($self, $widget) = @_; 1786 my ($self, $widget) = @_;
1036 1787
1037 $self->SUPER::add ($widget); 1788 $self->SUPER::add ($widget);
1038 1789
1039 $widget->size_allocate ($widget->size_request); 1790 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1040} 1791}
1041 1792
1042sub draw { 1793sub draw {
1043 my ($self) = @_; 1794 my ($self) = @_;
1044 1795
1045 $self->_draw; 1796 $self->_draw;
1046} 1797}
1047 1798
1048############################################################################# 1799#############################################################################
1049 1800
1050package Crossfire::Client::Widget; 1801package CFClient::UI;
1051 1802
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1803$TOPLEVEL = new CFClient::UI::Toplevel;
1053 1804
10541 18051
1055 1806

Diff Legend

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