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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC

… …
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 10our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
… …
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24 23
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 28 $self->{z} = $z if defined $z;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $FOCUS = $widget;
… …
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
… …
88 $self->_draw; 83 $self->_draw;
89 glPopMatrix; 84 glPopMatrix;
90} 85}
91 86
92sub _draw { 87sub _draw {
93 my ($widget) = @_; 88 my ($self) = @_;
89
90 warn "no draw defined for $self\n";
94} 91}
95 92
96sub bbox { 93sub bbox {
97 my ($self) = @_; 94 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 95 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 99 $self->{x} = $w,
103 $self->{y} = $h 100 $self->{y} = $h
104 ) 101 )
105} 102}
106 103
104sub find_widget {
105 my ($self, $x, $y) = @_;
106
107 return $self
108 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
109 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
110
111 ()
112}
113
107sub del_parent { $_[0]->{parent} = undef } 114sub del_parent { $_[0]->{parent} = undef }
108 115
109sub set_parent { 116sub set_parent {
110 my ($self, $par) = @_; 117 my ($self, $par) = @_;
111 118
… …
128 my ($self) = @_; 135 my ($self) = @_;
129 136
130 #$self->deactivate; 137 #$self->deactivate;
131} 138}
132 139
140#############################################################################
141
142package Crossfire::Client::Widget::Container;
143
144our @ISA = Crossfire::Client::Widget::;
145
146sub new {
147 my ($class, @widgets) = @_;
148
149 my $self = $class->SUPER::new (children => []);
150 $self->add ($_) for @widgets;
151
152 $self
153}
154
155sub add {
156 my ($self, $chld, $expand) = @_;
157
158 $chld->{expand} = $expand;
159 $chld->set_parent ($self);
160
161 @{$self->{children}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{children}}, $chld;
164
165 $self->size_allocate ($self->{w}, $self->{h});
166}
167
168sub remove {
169 my ($self, $widget) = @_;
170
171 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
172
173 $self->size_allocate ($self->{w}, $self->{h});
174}
175
176sub find_widget {
177 my ($self, $x, $y) = @_;
178
179 my $res;
180
181 for (@{ $self->{children} }) {
182 $res = $_->find_widget ($x, $y)
183 and return $res;
184 }
185
186 ()
187}
188
189sub size_request {
190 my ($self) = @_;
191
192 my ($hs, $ws) = (0, 0);
193 for (@{$self->{children} || []}) {
194 my ($w, $h) = $_->size_request;
195 $hs += $h;
196 if ($ws < $w) { $ws = $w }
197 }
198
199 return ($ws, $hs);
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
133package Crossfire::Client::Widget::Bin; 210package Crossfire::Client::Widget::Bin;
134 211
135our @ISA = Crossfire::Client::Widget::; 212our @ISA = Crossfire::Client::Widget::Container::;
136 213
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
139sub get { $_[0]->{child} } 214sub child { $_[0]->{children}[0] }
140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 215
147sub size_request { 216sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
149} 218}
150 219
151sub _draw { 220sub size_allocate {
152 my ($self) = @_; 221 my ($self, $w, $h) = @_;
153 222 $self->SUPER::size_allocate ($w, $h);
154 $self->{child}->draw; 223 $self->{children}[0]->size_allocate ($w, $h)
224 if $self->{children}[0]
155} 225}
226
227#############################################################################
156 228
157package Crossfire::Client::Widget::Toplevel; 229package Crossfire::Client::Widget::Toplevel;
158 230
231our @ISA = Crossfire::Client::Widget::Container::;
232
233sub update {
234 my ($self) = @_;
235
236 ::refresh ();
237}
238
239#############################################################################
240
241package Crossfire::Client::Widget::Window;
242
159our @ISA = Crossfire::Client::Widget::; 243our @ISA = Crossfire::Client::Widget::Bin::;
160 244
161use SDL::OpenGL; 245use SDL::OpenGL;
162 246
163sub add { 247sub add {
164 my ($self, $chld) = @_; 248 my ($self, $chld) = @_;
165 249 warn "ADD $chld\n";
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld); 250 $self->SUPER::add ($chld);
202 $chld->set_parent ($self); 251 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204} 252}
205 253
206sub remove { 254sub remove {
207 my ($self) = @_; 255 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld 256 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update; 257 # $self->update;
210} 258}
211 259
212sub update { 260sub update {
213 my ($self) = @_; 261 my ($self) = @_;
214 $self->render_chld; 262 $self->render_chld;
… …
217sub render_chld { 265sub render_chld {
218 my ($self) = @_; 266 my ($self) = @_;
219 my $chld = $self->get; 267 my $chld = $self->get;
220 my ($w, $h) = $self->size_request; 268 my ($w, $h) = $self->size_request;
221 269
270 require Carp;
271 Carp::cluck "RENDERCHI $w $h";
272 warn "RENDERCHI $w $h\n";
222 $self->{texture} = 273 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl ( 274 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw } 275 $w, $h, sub { $chld->draw }
225 ); 276 );
226 $self->{texture}->upload; 277 $self->{texture}->upload;
227} 278}
228 279
229sub size_request { 280sub size_request {
230 my ($self) = @_; 281 my ($self) = @_;
231 my $chld = $self->get 282 ($self->w, $self->h)
232 or return (0, 0); 283}
233 $chld->size_request 284
285sub size_allocate {
286 my ($self, $w, $h) = @_;
287
288 $self->w ($w);
289 $self->h ($h);
290 $self->get->size_allocate ($w, $h);
291
292 $self->update; #TODO: Move this to the size_request event propably?
234} 293}
235 294
236sub _draw { 295sub _draw {
237 my ($self) = @_; 296 my ($self) = @_;
238 297
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 298 my ($w, $h) = ($self->w, $self->h);
240 299
241 my $tex = $self->{texture} 300 my $tex = $self->{texture}
242 or return; 301 or return;
243 302
244 glEnable GL_BLEND; 303 glEnable GL_BLEND;
… …
255 314
256 glDisable GL_BLEND; 315 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 316 glDisable GL_TEXTURE_2D;
258} 317}
259 318
319#############################################################################
320
260package Crossfire::Client::Widget::Frame; 321package Crossfire::Client::Widget::Frame;
261 322
262our @ISA = Crossfire::Client::Widget::Bin::; 323our @ISA = Crossfire::Client::Widget::Bin::;
263 324
264use SDL::OpenGL; 325use SDL::OpenGL;
265 326
266sub size_request { 327sub size_request {
267 my ($self) = @_; 328 my ($self) = @_;
268 my $chld = $self->get 329 my $chld = $self->child
269 or return (0, 0); 330 or return (0, 0);
270 331
271 $chld->move (2, 2); 332 $chld->move (2, 2);
272 333
273 map { $_ + 4 } $chld->size_request; 334 map { $_ + 4 } $chld->size_request;
274} 335}
275 336
337sub size_allocate {
338 my ($self, $w, $h) = @_;
339
340 $self->w ($w);
341 $self->h ($h);
342
343 $self->child->size_allocate ($w - 4, $h - 4);
344 $self->child->move (2, 2);
345}
346
276sub _draw { 347sub _draw {
277 my ($self) = @_; 348 my ($self) = @_;
278 349
279 my $chld = $self->get; 350 my $chld = $self->child;
280 351
281 my ($w, $h) = $chld->size_request; 352 my ($w, $h) = $chld->size_request;
282 353
283 glBegin GL_QUADS; 354 glBegin GL_QUADS;
284 glColor 0, 0, 0; 355 glColor 0, 0, 0;
… …
289 glEnd; 360 glEnd;
290 361
291 $chld->draw; 362 $chld->draw;
292} 363}
293 364
365#############################################################################
366
294package Crossfire::Client::Widget::FancyFrame; 367package Crossfire::Client::Widget::FancyFrame;
295 368
296our @ISA = Crossfire::Client::Widget::Frame::; 369our @ISA = Crossfire::Client::Widget::Frame::;
297 370
298use SDL::OpenGL; 371use SDL::OpenGL;
… …
301 my ($self, $theme) = @_; 374 my ($self, $theme) = @_;
302 $self = $self->SUPER::new; 375 $self = $self->SUPER::new;
303 376
304 $self->{txts} = [ 377 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 378 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 379 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png)
307 ]; 380 ];
308 $self 381 $self
309
310} 382}
311 383
312sub size_request { 384sub size_request {
313 my ($self) = @_; 385 my ($self) = @_;
386
314 my ($w, $h) = $self->get->size_request; 387 my ($w, $h) = $self->SUPER::size_request;
315 388
316 $h += $self->{txts}->[1]->{height}; 389 $h += $self->{txts}->[1]->{height};
317 $h += $self->{txts}->[4]->{height}; 390 $h += $self->{txts}->[4]->{height};
318 $w += $self->{txts}->[2]->{width}; 391 $w += $self->{txts}->[2]->{width};
319 $w += $self->{txts}->[3]->{width}; 392 $w += $self->{txts}->[3]->{width};
320 393
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322
323 ($w, $h) 394 ($w, $h)
324} 395}
325 396
397sub size_allocate {
398 my ($self, $w, $h) = @_;
399
400 $self->SUPER::size_allocate ($w, $h);
401
402 $h -= $self->{txts}->[1]->{height};
403 $h -= $self->{txts}->[4]->{height};
404 $w -= $self->{txts}->[2]->{width};
405 $w -= $self->{txts}->[3]->{width};
406
407 $h = $h < 0 ? 0 : $h;
408 $w = $w < 0 ? 0 : $w;
409 warn "CHILD:$w $h\n";
410 $self->child->size_allocate ($w, $h);
411 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
412}
413
326sub _draw { 414sub _draw {
327 my ($self) = @_; 415 my ($self) = @_;
328 416
329 my ($w, $h) = $self->size_request; 417 my ($w, $h) = ($self->w, $self->h);
330 my ($cw, $ch) = $self->get->size_request; 418 my ($cw, $ch) = ($self->child->w, $self->child->h);
331 419
332 glEnable GL_BLEND; 420 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 421 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 422 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336
337 424
338 my $top = $self->{txts}->[1]; 425 my $top = $self->{txts}->[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 426 glBindTexture GL_TEXTURE_2D, $top->{name};
340 427
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS; 428 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0; 429 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height}; 430 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height}; 431 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0; 432 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd; 433 glEnd;
349 434
350 my $left = $self->{txts}->[3]; 435 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 436 glBindTexture GL_TEXTURE_2D, $left->{name};
352 437
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS; 438 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height}; 439 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 440 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 441 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 442 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd; 443 glEnd;
361 444
362 my $right = $self->{txts}->[2]; 445 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 446 glBindTexture GL_TEXTURE_2D, $right->{name};
364 447
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS; 448 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 449 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 450 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 451 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height}; 452 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd; 453 glEnd;
373 454
374 my $bottom = $self->{txts}->[4]; 455 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 456 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376 457
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS; 458 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 459 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h; 460 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h; 461 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 462 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd; 463 glEnd;
385 464
386 my $bg = $self->{txts}->[0]; 465 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 470
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 471 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height}; 472 my $rep_y = $ch / $bg->{height};
395 473
396 glBegin GL_QUADS; 474 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 475 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 476 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 477 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 478 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd; 479 glEnd;
402
403 $self->get->draw;
404 480
405 glDisable GL_BLEND; 481 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 482 glDisable GL_TEXTURE_2D;
483
484 $self->child->draw;
485
407} 486}
487
488#############################################################################
408 489
409package Crossfire::Client::Widget::Table; 490package Crossfire::Client::Widget::Table;
410 491
411our @ISA = Crossfire::Client::Widget::Bin::; 492our @ISA = Crossfire::Client::Widget::Bin::;
412 493
413use SDL::OpenGL; 494use SDL::OpenGL;
414 495
415sub add { 496sub add {
416 my ($self, $x, $y, $chld) = @_; 497 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x]; 498 my $old_chld = $self->{children}[$y][$x];
418 499
419 $self->{childs}[$y][$x] = $chld; 500 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 501 $chld->set_parent ($self);
421 $self->update; 502 $self->update;
422} 503}
423 504
424sub max_row_height { 505sub max_row_height {
425 my ($self, $row) = @_; 506 my ($self, $row) = @_;
426 507
427 my $hs = 0; 508 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi]; 510 my $c = $self->{children}->[$row]->[$xi];
430 if ($c) { 511 if ($c) {
431 my ($w, $h) = $c->size_request; 512 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h } 513 if ($hs < $h) { $hs = $h }
433 } 514 }
434 } 515 }
… …
437 518
438sub max_col_width { 519sub max_col_width {
439 my ($self, $col) = @_; 520 my ($self, $col) = @_;
440 521
441 my $ws = 0; 522 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 524 my $c = ($self->{children}->[$yi] || [])->[$col];
444 if ($c) { 525 if ($c) {
445 my ($w, $h) = $c->size_request; 526 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w } 527 if ($ws < $w) { $ws = $w }
447 } 528 }
448 } 529 }
… …
452sub size_request { 533sub size_request {
453 my ($self) = @_; 534 my ($self) = @_;
454 535
455 my ($hs, $ws) = (0, 0); 536 my ($hs, $ws) = (0, 0);
456 537
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 $hs += $self->max_row_height ($yi); 539 $hs += $self->max_row_height ($yi);
459 } 540 }
460 541
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
462 my $wm = 0; 543 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi) 545 $wm += $self->max_col_width ($xi)
465 } 546 }
466 if ($ws < $wm) { $ws = $wm } 547 if ($ws < $wm) { $ws = $wm }
467 } 548 }
468 549
… …
471 552
472sub _draw { 553sub _draw {
473 my ($self) = @_; 554 my ($self) = @_;
474 555
475 my $y = 0; 556 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
477 my $x = 0; 558 my $x = 0;
478 559
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
480 561
481 my $c = $self->{childs}->[$yi]->[$xi]; 562 my $c = $self->{children}->[$yi]->[$xi];
482 if ($c) { 563 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request 564 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c; 565 $c->draw if $c;
485 } 566 }
486 567
… …
489 570
490 $y += $self->max_row_height ($yi); 571 $y += $self->max_row_height ($yi);
491 } 572 }
492} 573}
493 574
575#############################################################################
576
494package Crossfire::Client::Widget::VBox; 577package Crossfire::Client::Widget::VBox;
495 578
496our @ISA = Crossfire::Client::Widget::Bin::; 579our @ISA = Crossfire::Client::Widget::Container::;
497 580
498use SDL::OpenGL; 581use SDL::OpenGL;
499 582
500sub add { 583sub size_allocate {
501 my ($self, $chld) = @_; 584 my ($self, $w, $h) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506 585
507sub size_request { 586 $self->w ($w);
508 my ($self) = @_; 587 $self->h ($h);
509 588
510 my ($hs, $ws) = (0, 0); 589 my $exp;
590 my @oth;
591 # find expand widget
511 for (@{$self->{childs} || []}) { 592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
512 my ($w, $h) = $_->size_request; 604 my ($w, $h) = $_->size_request;
513 $hs += $h; 605 $oh += $h;
514 if ($ws < $w) { $ws = $w } 606 if ($ow < $w) { $ow = $w }
515 } 607 }
516 608
517 return ($ws, $hs); 609 my $y = 0;
610 for (@{$self->{children}}) {
611 $_->move (0, $y);
612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
619 $y += $h;
620 }
621 }
518} 622}
519 623
520sub _draw { 624sub _draw {
521 my ($self) = @_; 625 my ($self) = @_;
522 626
523 my ($x, $y); 627 my ($x, $y);
524 for (@{$self->{childs} || []}) { 628 for (@{$self->{children} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw; 629 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h; 630 $y += $_->h;
529 } 631 }
530} 632}
633
634#############################################################################
531 635
532package Crossfire::Client::Widget::Label; 636package Crossfire::Client::Widget::Label;
533 637
534our @ISA = Crossfire::Client::Widget::; 638our @ISA = Crossfire::Client::Widget::;
535 639
… …
579 glEnable GL_TEXTURE_2D; 683 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name}; 686 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 687
584 glColor 1, 1, 1, 0.6; # TODO color 688 glColor 1, 0, 0, 1; # TODO color
585 689
586 glBegin GL_QUADS; 690 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0; 691 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 692 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 693 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
592 696
593 glDisable GL_BLEND; 697 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D; 698 glDisable GL_TEXTURE_2D;
595} 699}
596 700
701#############################################################################
702
597package Crossfire::Client::Widget::TextEntry; 703package Crossfire::Client::Widget::TextEntry;
598 704
599our @ISA = Crossfire::Client::Widget::Label::; 705our @ISA = Crossfire::Client::Widget::Label::;
600 706
601use SDL; 707use SDL;
… …
619 $text .= chr $uni; 725 $text .= chr $uni;
620 } 726 }
621 $self->set_text ($text); 727 $self->set_text ($text);
622} 728}
623 729
624 730#############################################################################
625# XXX: TextView isn't neccessary with pango multiline text rendering
626package Crossfire::Client::Widget::TextView;
627
628use strict;
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712 731
713package Crossfire::Client::Widget::MapWidget; 732package Crossfire::Client::Widget::MapWidget;
714 733
715use strict; 734use strict;
716 735
… …
725sub key_down { 744sub key_down {
726 print "MAPKEYDOWN\n"; 745 print "MAPKEYDOWN\n";
727} 746}
728 747
729sub key_up { 748sub key_up {
749}
750
751sub size_request {
752
753}
754
755sub size_allocate {
730} 756}
731 757
732sub _draw { 758sub _draw {
733 my ($self) = @_; 759 my ($self) = @_;
734 760
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 902 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 903 $::CONN->send ("command run_stop");
878 } 904 }
879} 905}
880 906
907#############################################################################
908
881package Crossfire::Client::Widget::Animator; 909package Crossfire::Client::Widget::Animator;
882 910
883use SDL::OpenGL; 911use SDL::OpenGL;
884 912
885our @ISA = Crossfire::Client::Widget::Bin::; 913our @ISA = Crossfire::Client::Widget::Bin::;
886 914
887sub moveto { 915sub moveto {
888 my ($self, $x, $y) = @_; 916 my ($self, $x, $y) = @_;
889 917
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 919 $self->{speed} = 0.2;
892 $self->{time} = 1; 920 $self->{time} = 1;
893 921
894 ::animation_start $self; 922 ::animation_start $self;
895} 923}
896 924
… …
912sub _draw { 940sub _draw {
913 my ($self) = @_; 941 my ($self) = @_;
914 942
915 glPushMatrix; 943 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 944 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw; 945 $self->{children}[0]->draw;
918 glPopMatrix; 946 glPopMatrix;
919} 947}
920 948
9211; 9491;
922 950

Diff Legend

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