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

Diff Legend

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