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.39 by root, Sun Apr 9 21:39:08 2006 UTC vs.
Revision 1.47 by root, Sun Apr 9 22:24:43 2006 UTC

… …
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11 11
12# class methods for events 12# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
15sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { } 16sub feed_sdl_button_up_event { }
17 17
18sub new { 18sub new {
19 my $class = shift; 19 my $class = shift;
… …
37 Carp::confess "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38} 38}
39 39
40sub size_allocate { 40sub size_allocate {
41 my ($self, $w, $h) = @_; 41 my ($self, $w, $h) = @_;
42
42 $self->w ($w); 43 $self->{w} = $w;
43 $self->h ($h); 44 $self->{h} = $h;
44} 45}
45 46
46sub focus_in { 47sub focus_in {
47 my ($widget) = @_; 48 my ($widget) = @_;
48 $FOCUS = $widget; 49 $::FOCUS = $widget;
49} 50}
50 51
51sub focus_out { 52sub focus_out {
52 my ($widget) = @_; 53 my ($widget) = @_;
53} 54}
… …
78 my ($self) = @_; 79 my ($self) = @_;
79 80
80 glPushMatrix; 81 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 1;
86 glBegin GL_LINES;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glVertex 0, 0;
92 glEnd;
93 }
83 glPopMatrix; 94 glPopMatrix;
84} 95}
85 96
86sub _draw { 97sub _draw {
87 my ($self) = @_; 98 my ($self) = @_;
… …
159 170
160 @{$self->{children}} = 171 @{$self->{children}} =
161 sort { $a->{z} <=> $b->{z} } 172 sort { $a->{z} <=> $b->{z} }
162 @{$self->{children}}, $chld; 173 @{$self->{children}}, $chld;
163 174
164 $self->size_allocate ($self->{w}, $self->{h}); 175 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state"
165} 177}
166 178
167sub remove { 179sub remove {
168 my ($self, $widget) = @_; 180 my ($self, $widget) = @_;
169 181
… …
173} 185}
174 186
175sub find_widget { 187sub find_widget {
176 my ($self, $x, $y) = @_; 188 my ($self, $x, $y) = @_;
177 189
190 $x -= $self->{x};
191 $y -= $self->{y};
192
178 my $res; 193 my $res;
179 194
180 for (@{ $self->{children} }) { 195 for (reverse @{ $self->{children} }) {
181 $res = $_->find_widget ($x, $y) 196 $res = $_->find_widget ($x, $y)
182 and return $res; 197 and return $res;
183 } 198 }
184 199
185 () 200 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
186}
187
188sub size_request {
189 my ($self) = @_;
190
191 my ($hs, $ws) = (0, 0);
192 for (@{$self->{children} || []}) {
193 my ($w, $h) = $_->size_request;
194 $hs += $h;
195 if ($ws < $w) { $ws = $w }
196 }
197
198 return ($ws, $hs);
199} 201}
200 202
201sub _draw { 203sub _draw {
202 my ($self) = @_; 204 my ($self) = @_;
203 205
… …
216 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 218 $_[0]{children}[0]->size_request if $_[0]{children}[0];
217} 219}
218 220
219sub size_allocate { 221sub size_allocate {
220 my ($self, $w, $h) = @_; 222 my ($self, $w, $h) = @_;
223
221 $self->SUPER::size_allocate ($w, $h); 224 $self->SUPER::size_allocate ($w, $h);
222 $self->{children}[0]->size_allocate ($w, $h) 225 $self->{children}[0]->size_allocate ($w, $h)
223 if $self->{children}[0] 226 if $self->{children}[0]
224} 227}
225 228
… …
233 my ($self) = @_; 236 my ($self) = @_;
234 237
235 ::refresh (); 238 ::refresh ();
236} 239}
237 240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
238############################################################################# 249#############################################################################
239 250
240package Crossfire::Client::Widget::Window; 251package Crossfire::Client::Widget::Window;
241 252
242our @ISA = Crossfire::Client::Widget::Bin::; 253our @ISA = Crossfire::Client::Widget::Bin::;
243 254
244use SDL::OpenGL; 255use SDL::OpenGL;
245 256
246sub add { 257sub new {
247 my ($self, $chld) = @_; 258 my ($class, $x, $y, $z, $w, $h) = @_;
248 warn "ADD $chld\n";
249 $self->SUPER::add ($chld);
250 $chld->set_parent ($self);
251}
252 259
253sub remove { 260 my $self = $class->SUPER::new;
254 my ($self) = @_; 261
255 # TODO FIXME: removing a child from a window will crash, see render_chld 262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
256 # $self->update;
257} 263}
258 264
259sub update { 265sub update {
260 my ($self) = @_; 266 my ($self) = @_;
267
261 $self->render_chld; 268 $self->render_chld;
269 $self->SUPER::update;
262} 270}
263 271
264sub render_chld { 272sub render_chld {
265 my ($self) = @_; 273 my ($self) = @_;
266 my $chld = $self->get;
267 my ($w, $h) = $self->size_request;
268 274
269 require Carp;
270 Carp::cluck "RENDERCHI $w $h";
271 warn "RENDERCHI $w $h\n";
272 $self->{texture} = 275 $self->{texture} =
273 Crossfire::Client::Texture->new_from_opengl ( 276 Crossfire::Client::Texture->new_from_opengl (
274 $w, $h, sub { $chld->draw } 277 $self->{w}, $self->{h}, sub { $self->child->draw }
275 ); 278 );
276 $self->{texture}->upload;
277}
278
279sub size_request {
280 my ($self) = @_;
281 ($self->w, $self->h)
282} 279}
283 280
284sub size_allocate { 281sub size_allocate {
285 my ($self, $w, $h) = @_; 282 my ($self, $w, $h) = @_;
286 283
287 $self->w ($w); 284 $self->{w} = $w;
288 $self->h ($h); 285 $self->{h} = $h;
286
289 $self->get->size_allocate ($w, $h); 287 $self->child->size_allocate ($w, $h);
290 288
291 $self->update; #TODO: Move this to the size_request event propably? 289 $self->render_chld;
292} 290}
293 291
294sub _draw { 292sub _draw {
295 my ($self) = @_; 293 my ($self) = @_;
296 294
… …
333 map { $_ + 4 } $chld->size_request; 331 map { $_ + 4 } $chld->size_request;
334} 332}
335 333
336sub size_allocate { 334sub size_allocate {
337 my ($self, $w, $h) = @_; 335 my ($self, $w, $h) = @_;
338 336
339 $self->w ($w); 337 $self->{w} = $w;
340 $self->h ($h); 338 $self->{h} = $h;
341 339
342 $self->child->size_allocate ($w - 4, $h - 4); 340 $self->child->size_allocate ($w - 4, $h - 4);
343 $self->child->move (2, 2); 341 $self->child->move (2, 2);
344} 342}
345 343
… …
363 361
364############################################################################# 362#############################################################################
365 363
366package Crossfire::Client::Widget::FancyFrame; 364package Crossfire::Client::Widget::FancyFrame;
367 365
368our @ISA = Crossfire::Client::Widget::Frame::; 366our @ISA = Crossfire::Client::Widget::Bin::;
369 367
370use SDL::OpenGL; 368use SDL::OpenGL;
371 369
372sub new { 370my @tex =
373 my ($self, $theme) = @_;
374 $self = $self->SUPER::new;
375
376 $self->{txts} = [
377 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
378 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
379 ];
380 $self
381}
382 373
383sub size_request { 374sub size_request {
384 my ($self) = @_; 375 my ($self) = @_;
385 376
386 my ($w, $h) = $self->SUPER::size_request; 377 my ($w, $h) = $self->SUPER::size_request;
387 378
388 $h += $self->{txts}->[1]->{height}; 379 $h += $tex[1]->{height};
389 $h += $self->{txts}->[4]->{height}; 380 $h += $tex[4]->{height};
390 $w += $self->{txts}->[2]->{width}; 381 $w += $tex[2]->{width};
391 $w += $self->{txts}->[3]->{width}; 382 $w += $tex[3]->{width};
392 383
393 ($w, $h) 384 ($w, $h)
394} 385}
395 386
396sub size_allocate { 387sub size_allocate {
397 my ($self, $w, $h) = @_; 388 my ($self, $w, $h) = @_;
398 389
399 $self->w ($w); 390 $self->SUPER::size_allocate ($w, $h);
400 $self->h ($h); 391
401 $h -= $self->{txts}->[1]->{height}; 392 $h -= $tex[1]->{height};
402 $h -= $self->{txts}->[4]->{height}; 393 $h -= $tex[4]->{height};
403 $w -= $self->{txts}->[2]->{width}; 394 $w -= $tex[2]->{width};
404 $w -= $self->{txts}->[3]->{width}; 395 $w -= $tex[3]->{width};
405 396
406 $h = $h < 0 ? 0 : $h; 397 $h = $h < 0 ? 0 : $h;
407 $w = $w < 0 ? 0 : $w; 398 $w = $w < 0 ? 0 : $w;
408 warn "CHILD:$w $h\n"; 399
409 $self->child->size_allocate ($w, $h); 400 $self->child->size_allocate ($w, $h);
410 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 401 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
411} 402}
412 403
413sub _draw { 404sub _draw {
414 my ($self) = @_; 405 my ($self) = @_;
415 406
416 my ($w, $h) = ($self->w, $self->h); 407 my ($w, $h) = ($self->{w}, $self->{h});
417 my ($cw, $ch) = ($self->child->w, $self->child->h); 408 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
418 409
419 glEnable GL_BLEND; 410 glEnable GL_BLEND;
420 glEnable GL_TEXTURE_2D; 411 glEnable GL_TEXTURE_2D;
421 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
423 414
424 my $top = $self->{txts}->[1]; 415 my $top = $tex[1];
425 glBindTexture GL_TEXTURE_2D, $top->{name}; 416 glBindTexture GL_TEXTURE_2D, $top->{name};
426 417
427 glBegin GL_QUADS; 418 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , 0; 419 glTexCoord 0, 0; glVertex 0 , 0;
429 glTexCoord 0, 1; glVertex 0 , $top->{height}; 420 glTexCoord 0, 1; glVertex 0 , $top->{height};
430 glTexCoord 1, 1; glVertex $w , $top->{height}; 421 glTexCoord 1, 1; glVertex $w , $top->{height};
431 glTexCoord 1, 0; glVertex $w , 0; 422 glTexCoord 1, 0; glVertex $w , 0;
432 glEnd; 423 glEnd;
433 424
434 my $left = $self->{txts}->[3]; 425 my $left = $tex[3];
435 glBindTexture GL_TEXTURE_2D, $left->{name}; 426 glBindTexture GL_TEXTURE_2D, $left->{name};
436 427
437 glBegin GL_QUADS; 428 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $top->{height}; 429 glTexCoord 0, 0; glVertex 0 , $top->{height};
439 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
442 glEnd; 433 glEnd;
443 434
444 my $right = $self->{txts}->[2]; 435 my $right = $tex[2];
445 glBindTexture GL_TEXTURE_2D, $right->{name}; 436 glBindTexture GL_TEXTURE_2D, $right->{name};
446 437
447 glBegin GL_QUADS; 438 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
449 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
450 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
451 glTexCoord 1, 0; glVertex $w , $top->{height}; 442 glTexCoord 1, 0; glVertex $w , $top->{height};
452 glEnd; 443 glEnd;
453 444
454 my $bottom = $self->{txts}->[4]; 445 my $bottom = $tex[4];
455 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 446 glBindTexture GL_TEXTURE_2D, $bottom->{name};
456 447
457 glBegin GL_QUADS; 448 glBegin GL_QUADS;
458 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
459 glTexCoord 0, 1; glVertex 0 , $h; 450 glTexCoord 0, 1; glVertex 0 , $h;
460 glTexCoord 1, 1; glVertex $w , $h; 451 glTexCoord 1, 1; glVertex $w , $h;
461 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
462 glEnd; 453 glEnd;
463 454
464 my $bg = $self->{txts}->[0]; 455 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 456 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 460
… …
576package Crossfire::Client::Widget::VBox; 567package Crossfire::Client::Widget::VBox;
577 568
578our @ISA = Crossfire::Client::Widget::Container::; 569our @ISA = Crossfire::Client::Widget::Container::;
579 570
580use SDL::OpenGL; 571use SDL::OpenGL;
572
573sub size_request {
574 my ($self) = @_;
575
576 my @alloc = map [$_->size_request], @{$self->{children}};
577
578 (
579 (List::Util::max map $_->[0], @alloc),
580 (List::Util::sum map $_->[1], @alloc),
581 )
582}
581 583
582sub size_allocate { 584sub size_allocate {
583 my ($self, $w, $h) = @_; 585 my ($self, $w, $h) = @_;
584 586
585 $self->w ($w); 587 $self->w ($w);
… …
615 } else { 617 } else {
616 my ($cw, $h) = $_->size_request; 618 my ($cw, $h) = $_->size_request;
617 $_->size_allocate ($w, $h); 619 $_->size_allocate ($w, $h);
618 $y += $h; 620 $y += $h;
619 } 621 }
620 }
621}
622
623sub _draw {
624 my ($self) = @_;
625
626 my ($x, $y);
627 for (@{$self->{children} || []}) {
628 $_->draw;
629 $y += $_->h;
630 } 622 }
631} 623}
632 624
633############################################################################# 625#############################################################################
634 626

Diff Legend

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