Hello community, here is the log from the commit of package rasmol checked in at Wed Nov 8 18:39:54 CET 2006. -------- --- rasmol/rasmol.changes 2006-07-27 14:11:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/rasmol/rasmol.changes 2006-11-08 18:26:52.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 8 14:33:48 CET 2006 - lmichnovic@suse.cz + +- fix for bug [#141227] rewritten (array.patch) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rasmol.spec ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:01.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:01.000000000 +0100 @@ -13,12 +13,12 @@ Name: rasmol BuildRequires: xorg-x11 xorg-x11-devel URL: http://www.bernstein-plus-sons.com/software/rasmol/ -License: distributable +License: Public Domain, Freeware Group: Productivity/Scientific/Chemistry Provides: RasMol Autoreqprov: on Version: 2.7.3.1 -Release: 2 +Release: 22 Summary: Molecular Graphics Visualization Tool Source: RasMol_2.7.3.tar.bz2 Patch: RasMol_%{version}.patch @@ -86,6 +86,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -n rasmol +* Wed Nov 08 2006 - lmichnovic@suse.cz +- fix for bug [#141227] rewritten (array.patch) * Wed Jul 26 2006 - lmichnovic@suse.cz - builds also with new X.org 7.x, checks the version of X.org. - renamed patches from upstream with prefix rasmol-upstream_* @@ -93,13 +95,13 @@ - set up the version number * Thu Jun 15 2006 - lmichnovic@suse.cz - added upstream patches and change the version to 2.7.3.1 -- mouserun2.patch - Correction to mouse handling to avoid run + - mouserun2.patch - Correction to mouse handling to avoid run away rotation in the X-windows versions. -- ztrl.patch - Correction to trailing bits of Z-coordinate when + - ztrl.patch - Correction to trailing bits of Z-coordinate when writing out PDB files. -- distfix.patch - rection to handling of distance monitors for + - distfix.patch - rection to handling of distance monitors for atoms more than 170 Ã ngstroms apart. -- version_2.7.3.1.patch - Patches the version in rasmol.h, etc. + - version_2.7.3.1.patch - Patches the version in rasmol.h, etc. * Mon Jan 30 2006 - lmichnovic@suse.cz - Fixed possible acces beyond the range of array. [#141227] * Wed Jan 25 2006 - mls@suse.de ++++++ RasMol_2.7.3.1-array.patch ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:01.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:01.000000000 +0100 @@ -8,3 +8,14 @@ for (i = 0; i < NumMolecules; i++) { SwitchMolecule (i); #ifdef DirChar +@@ -525,8 +526,8 @@ + } else { + sprintf(buf, "%d. %s", i+1, s); + } +- MolName[i][MAX_MOLNAME]='\0'; +- strncpy(MolName[i],buf,MAX_MOLNAME-1); ++ strncpy(MolName[i],buf,MAX_MOLNAME-1); ++ MolName[i][MAX_MOLNAME-1]='\0'; + MolNStr[i] = &(MolName[i][0]); + MolNLen[i] = strlen(MolName[i]); + } ++++++ rasmol-upstream_distfix.patch ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:02.000000000 +0100 @@ -1,170 +1,108 @@ -*** src/abstree.c Mon Apr 25 08:31:12 2005 ---- src/abstree.c Fri Apr 21 11:46:57 2006 -*************** -*** 1289,1303 **** - - double CalcDistance( RAtom __far *atm1, RAtom __far *atm2 ) - { -! register Long dx,dy,dz; - register double dist2; - -! dx = atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg; -! dy = atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg; -! dz = atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg; -! if( dx || dy || dz ) - { dist2 = dx*dx + dy*dy + dz*dz; -! return( sqrt(dist2)/250.0 ); - } else return 0.0; - } - ---- 1289,1303 ---- - - double CalcDistance( RAtom __far *atm1, RAtom __far *atm2 ) - { -! register double dx,dy,dz; - register double dist2; - -! dx = (double)(atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg); -! dy = (double)(atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg); -! dz = (double)(atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg); -! if( dx != 0.0 || dy != 0.0 || dz != 0.0 ) - { dist2 = dx*dx + dy*dy + dz*dz; -! return( sqrt(dist2/62500.) ); - } else return 0.0; - } - -*** src/render.c Mon Apr 25 08:31:12 2005 ---- src/render.c Fri Apr 21 12:13:21 2006 -*************** -*** 1919,1924 **** ---- 1919,1930 ---- - for( i=0; str[i] && i<12; i++ ) - if( str[i]!=' ' ) - WriteChar(str[i]); -+ -+ if (ptr->atm->model) -+ { -+ sprintf(buffer,"/%d",ptr->atm->model); -+ WriteString(buffer); -+ } - - if( flag ) - { sprintf(buffer," (%ld)",ptr->atm->serno); -*************** -*** 2182,2188 **** - /* [GSG 11/21/95] */ - AddMonitors2(PickHist[0].atm, PickHist[2].atm, - PickHist[1].atm, (RAtom __far *)NULL, -! (short) (rint(temp*100)), 128, PickAngle); - ReDrawFlag |= RFRefresh; - - ---- 2188,2194 ---- - /* [GSG 11/21/95] */ - AddMonitors2(PickHist[0].atm, PickHist[2].atm, - PickHist[1].atm, (RAtom __far *)NULL, -! (Long) (rint(temp*100)), 128, PickAngle); - ReDrawFlag |= RFRefresh; - - -*************** -*** 2207,2213 **** - /* [GSG 11/21/95] */ - AddMonitors2(PickHist[0].atm, PickHist[3].atm, - PickHist[1].atm, PickHist[2].atm, -! (short) (rint(temp*100)), 128, PickTorsn); - ReDrawFlag |= RFRefresh; - } - } ---- 2213,2219 ---- - /* [GSG 11/21/95] */ - AddMonitors2(PickHist[0].atm, PickHist[3].atm, - PickHist[1].atm, PickHist[2].atm, -! (Long) (rint(temp*100)), 128, PickTorsn); - ReDrawFlag |= RFRefresh; - } - } -*** src/repres.c Mon Apr 25 08:31:12 2005 ---- src/repres.c Fri Apr 21 11:56:01 2006 -*************** -*** 523,529 **** - /* [GSG 11/21/95] AddMonitors2 can add a monitor w/a given number */ - void AddMonitors2( RAtom __far *src, RAtom __far *dst, - RAtom __far *mid1, RAtom __far *mid2, -! short dist, unsigned char units, int monmode ) - { - register Monitor **prev; - register Monitor *ptr; ---- 523,529 ---- - /* [GSG 11/21/95] AddMonitors2 can add a monitor w/a given number */ - void AddMonitors2( RAtom __far *src, RAtom __far *dst, - RAtom __far *mid1, RAtom __far *mid2, -! Long dist, unsigned char units, int monmode ) - { - register Monitor **prev; - register Monitor *ptr; -*************** -*** 567,583 **** - - void AddMonitors( RAtom __far *src, RAtom __far *dst ) - { -! register Long dx, dy, dz; -! register Long dist; -! short temp; -! -! dx = src->xorg - dst->xorg + src->fxorg - dst->fxorg; -! dy = src->yorg - dst->yorg + src->fyorg - dst->fyorg; -! dz = src->zorg - dst->zorg + src->fzorg - dst->fzorg; -! -! /* ptr->dist = 100.0*CalcDistance(src,dst) */ -! dist = isqrt( dx*dx + dy*dy + dz*dz ); -! temp = rint(100.0*CalcDistance(src,dst)); - - AddMonitors2(src, dst, - (RAtom __far *)NULL, (RAtom __far *)NULL, temp, 127, PickDist); ---- 567,575 ---- - - void AddMonitors( RAtom __far *src, RAtom __far *dst ) - { -! Long temp; -! -! temp = (Long)rint(100.0*CalcDistance(src,dst)); - - AddMonitors2(src, dst, - (RAtom __far *)NULL, (RAtom __far *)NULL, temp, 127, PickDist); -*** src/repres.h Mon Apr 25 08:31:12 2005 ---- src/repres.h Fri Apr 21 14:27:12 2006 -*************** -*** 99,105 **** - RAtom __far *mid2; - RAtom __far *dst; - int monmode; -! int dist; - short col; - unsigned char units; - } Monitor; ---- 99,105 ---- - RAtom __far *mid2; - RAtom __far *dst; - int monmode; -! Long dist; - short col; - unsigned char units; - } Monitor; -*************** -*** 162,168 **** - void DeleteMonitors( void ); - void AddMonitors2( RAtom __far*, RAtom __far*, - RAtom __far*, RAtom __far*, -! short, unsigned char, int ); - void AddMonitors( RAtom __far*, RAtom __far* ); - void CreateMonitor( Long, Long ); - void DisplayMonitors( void ); ---- 162,168 ---- - void DeleteMonitors( void ); - void AddMonitors2( RAtom __far*, RAtom __far*, - RAtom __far*, RAtom __far*, -! Long, unsigned char, int ); - void AddMonitors( RAtom __far*, RAtom __far* ); - void CreateMonitor( Long, Long ); - void DisplayMonitors( void ); +--- src/abstree.c ++++ src/abstree.c +@@ -1289,15 +1289,15 @@ + + double CalcDistance( RAtom __far *atm1, RAtom __far *atm2 ) + { +- register Long dx,dy,dz; ++ register double dx,dy,dz; + register double dist2; + +- dx = atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg; +- dy = atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg; +- dz = atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg; +- if( dx || dy || dz ) ++ dx = (double)(atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg); ++ dy = (double)(atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg); ++ dz = (double)(atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg); ++ if( dx != 0.0 || dy != 0.0 || dz != 0.0 ) + { dist2 = dx*dx + dy*dy + dz*dz; +- return( sqrt(dist2)/250.0 ); ++ return( sqrt(dist2/62500.) ); + } else return 0.0; + } + +--- src/render.c ++++ src/render.c +@@ -1919,6 +1919,12 @@ + for( i=0; str[i] && i<12; i++ ) + if( str[i]!=' ' ) + WriteChar(str[i]); ++ ++ if (ptr->atm->model) ++ { ++ sprintf(buffer,"/%d",ptr->atm->model); ++ WriteString(buffer); ++ } + + if( flag ) + { sprintf(buffer," (%ld)",ptr->atm->serno); +@@ -2182,7 +2188,7 @@ + /* [GSG 11/21/95] */ + AddMonitors2(PickHist[0].atm, PickHist[2].atm, + PickHist[1].atm, (RAtom __far *)NULL, +- (short) (rint(temp*100)), 128, PickAngle); ++ (Long) (rint(temp*100)), 128, PickAngle); + ReDrawFlag |= RFRefresh; + + +@@ -2207,7 +2213,7 @@ + /* [GSG 11/21/95] */ + AddMonitors2(PickHist[0].atm, PickHist[3].atm, + PickHist[1].atm, PickHist[2].atm, +- (short) (rint(temp*100)), 128, PickTorsn); ++ (Long) (rint(temp*100)), 128, PickTorsn); + ReDrawFlag |= RFRefresh; + } + } +--- src/repres.c ++++ src/repres.c +@@ -523,7 +523,7 @@ + /* [GSG 11/21/95] AddMonitors2 can add a monitor w/a given number */ + void AddMonitors2( RAtom __far *src, RAtom __far *dst, + RAtom __far *mid1, RAtom __far *mid2, +- short dist, unsigned char units, int monmode ) ++ Long dist, unsigned char units, int monmode ) + { + register Monitor **prev; + register Monitor *ptr; +@@ -567,17 +567,9 @@ + + void AddMonitors( RAtom __far *src, RAtom __far *dst ) + { +- register Long dx, dy, dz; +- register Long dist; +- short temp; ++ Long temp; + +- dx = src->xorg - dst->xorg + src->fxorg - dst->fxorg; +- dy = src->yorg - dst->yorg + src->fyorg - dst->fyorg; +- dz = src->zorg - dst->zorg + src->fzorg - dst->fzorg; +- +- /* ptr->dist = 100.0*CalcDistance(src,dst) */ +- dist = isqrt( dx*dx + dy*dy + dz*dz ); +- temp = rint(100.0*CalcDistance(src,dst)); ++ temp = (Long)rint(100.0*CalcDistance(src,dst)); + + AddMonitors2(src, dst, + (RAtom __far *)NULL, (RAtom __far *)NULL, temp, 127, PickDist); +--- src/repres.h ++++ src/repres.h +@@ -99,7 +99,7 @@ + RAtom __far *mid2; + RAtom __far *dst; + int monmode; +- int dist; ++ Long dist; + short col; + unsigned char units; + } Monitor; +@@ -162,7 +162,7 @@ + void DeleteMonitors( void ); + void AddMonitors2( RAtom __far*, RAtom __far*, + RAtom __far*, RAtom __far*, +- short, unsigned char, int ); ++ Long, unsigned char, int ); + void AddMonitors( RAtom __far*, RAtom __far* ); + void CreateMonitor( Long, Long ); + void DisplayMonitors( void ); ++++++ rasmol-upstream_mouserun2.patch ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:02.000000000 +0100 @@ -1,218 +1,123 @@ -*** src/x11win.c Mon Apr 25 08:31:12 2005 ---- src/x11win.c Thu Dec 15 22:37:33 2005 -*************** -*** 385,391 **** - static int IdentCount; - #endif - -! static int HeldStep; - - static Byte Intensity[LutSize]; - static Pixel WhiteCol; ---- 385,392 ---- - static int IdentCount; - #endif - -! static int XHeldButton; -! static int XHeldStep; - - static Byte Intensity[LutSize]; - static Pixel WhiteCol; -*************** -*** 1766,1772 **** - UseHourGlass = True; - DisableMenu = False; - Monochrome = False; -! HeldButton = -1; - - for( i=0; i<8; i++ ) - DialValue[i] = 0.0; ---- 1767,1773 ---- - UseHourGlass = True; - DisableMenu = False; - Monochrome = False; -! XHeldButton = -1; - - for( i=0; i<8; i++ ) - DialValue[i] = 0.0; -*************** -*** 2321,2328 **** - register Real temp; - register int index; - -! if( HeldButton == YScrlDial ) -! { index = NewScrlY+HeldStep; - #ifdef ORIG - if( YScrlDial < 3 ) - { if( index<16 ) ---- 2322,2329 ---- - register Real temp; - register int index; - -! if( XHeldButton == YScrlDial ) -! { index = NewScrlY+XHeldStep; - #ifdef ORIG - if( YScrlDial < 3 ) - { if( index<16 ) -*************** -*** 2354,2361 **** - ScrlY = NewScrlY; - } - -! if( HeldButton == XScrlDial ) -! { index = NewScrlX+HeldStep; - #ifdef ORIG - if( XScrlDial<3 ) - { if( index < 16 ) ---- 2355,2362 ---- - ScrlY = NewScrlY; - } - -! if( XHeldButton == XScrlDial ) -! { index = NewScrlX+XHeldStep; - #ifdef ORIG - if( XScrlDial<3 ) - { if( index < 16 ) -*************** -*** 2408,2414 **** - { case(ButtonPress): - { XButtonPressedEvent *ptr; - -! HeldButton = -1; - ptr = (XButtonPressedEvent*)event; - - if( ptr->window==CanvWin ) ---- 2409,2415 ---- - { case(ButtonPress): - { XButtonPressedEvent *ptr; - -! XHeldButton = -1; - ptr = (XButtonPressedEvent*)event; - - if( ptr->window==CanvWin ) -*************** -*** 2421,2431 **** - } else if( ptr->window==XScrlWin ) - { ReDrawFlag |= RFRotateY; - if( ptr->x<16 ) -! { HeldButton = XScrlDial; -! HeldStep = -XScrlSkip; - } else if( ptr->x>=XRange-16 ) -! { HeldButton = XScrlDial; -! HeldStep = XScrlSkip; - } else - { index = ptr->x-8; - #ifdef ORIG ---- 2422,2432 ---- - } else if( ptr->window==XScrlWin ) - { ReDrawFlag |= RFRotateY; - if( ptr->x<16 ) -! { XHeldButton = XScrlDial; -! XHeldStep = -XScrlSkip; - } else if( ptr->x>=XRange-16 ) -! { XHeldButton = XScrlDial; -! XHeldStep = XScrlSkip; - } else - { index = ptr->x-8; - #ifdef ORIG -*************** -*** 2448,2458 **** - } else if( ptr->window==YScrlWin ) - { ReDrawFlag |= RFRotateX; - if( ptr->y<16 ) -! { HeldButton = YScrlDial; -! HeldStep = -YScrlSkip; - } else if( ptr->y>=YRange-16 ) -! { HeldButton = YScrlDial; -! HeldStep = YScrlSkip; - } else - { index = ptr->y-8; - #ifdef ORIG ---- 2449,2459 ---- - } else if( ptr->window==YScrlWin ) - { ReDrawFlag |= RFRotateX; - if( ptr->y<16 ) -! { XHeldButton = YScrlDial; -! XHeldStep = -YScrlSkip; - } else if( ptr->y>=YRange-16 ) -! { XHeldButton = YScrlDial; -! XHeldStep = YScrlSkip; - } else - { index = ptr->y-8; - #ifdef ORIG -*************** -*** 2482,2488 **** - if( ptr->window==CanvWin ) - { stat = GetStatus(ptr->state); - ProcessMouseMove(ptr->x,ptr->y,stat); -! } else if( HeldButton == -1 ) - { if( ptr->window==XScrlWin ) - { index = ptr->x-8; - NewScrlX = CropRange(index,16,XRange-32); ---- 2483,2489 ---- - if( ptr->window==CanvWin ) - { stat = GetStatus(ptr->state); - ProcessMouseMove(ptr->x,ptr->y,stat); -! } else if( XHeldButton == -1 ) - { if( ptr->window==XScrlWin ) - { index = ptr->x-8; - NewScrlX = CropRange(index,16,XRange-32); -*************** -*** 2496,2504 **** - case(ButtonRelease): - { XButtonReleasedEvent *ptr; - -! if( HeldButton != -1 ) - { /* Three button emulation fix! */ -! DoneEvents(); HeldButton = -1; - } - - ptr = (XButtonReleasedEvent*)event; ---- 2497,2505 ---- - case(ButtonRelease): - { XButtonReleasedEvent *ptr; - -! if( XHeldButton != -1 ) - { /* Three button emulation fix! */ -! DoneEvents(); XHeldButton = -1; - } - - ptr = (XButtonReleasedEvent*)event; -*************** -*** 2671,2677 **** - GrabModeAsync,GrabModeAsync, - None,None,CurrentTime); - -! HeldButton = -1; - MenuFocus = True; - DrawMenuBar(); - ---- 2672,2678 ---- - GrabModeAsync,GrabModeAsync, - None,None,CurrentTime); - -! XHeldButton = -1; - MenuFocus = True; - DrawMenuBar(); - -*************** -*** 2812,2818 **** - NewScrlX = ScrlX; - NewScrlY = ScrlY; - -! if( HeldButton != -1 ) wait = False; - while( XPending(dpy) || (wait && !ReDrawFlag) ) - { XNextEvent( dpy, &event ); - result = ProcessEvent(&event); ---- 2813,2819 ---- - NewScrlX = ScrlX; - NewScrlY = ScrlY; - -! if( XHeldButton != -1 ) wait = False; - while( XPending(dpy) || (wait && !ReDrawFlag) ) - { XNextEvent( dpy, &event ); - result = ProcessEvent(&event); - - - - +--- src/x11win.c ++++ src/x11win.c +@@ -385,7 +385,8 @@ + static int IdentCount; + #endif + +-static int HeldStep; ++static int XHeldButton; ++static int XHeldStep; + + static Byte Intensity[LutSize]; + static Pixel WhiteCol; +@@ -1766,7 +1767,7 @@ + UseHourGlass = True; + DisableMenu = False; + Monochrome = False; +- HeldButton = -1; ++ XHeldButton = -1; + + for( i=0; i<8; i++ ) + DialValue[i] = 0.0; +@@ -2321,8 +2322,8 @@ + register Real temp; + register int index; + +- if( HeldButton == YScrlDial ) +- { index = NewScrlY+HeldStep; ++ if( XHeldButton == YScrlDial ) ++ { index = NewScrlY+XHeldStep; + #ifdef ORIG + if( YScrlDial < 3 ) + { if( index<16 ) +@@ -2354,8 +2355,8 @@ + ScrlY = NewScrlY; + } + +- if( HeldButton == XScrlDial ) +- { index = NewScrlX+HeldStep; ++ if( XHeldButton == XScrlDial ) ++ { index = NewScrlX+XHeldStep; + #ifdef ORIG + if( XScrlDial<3 ) + { if( index < 16 ) +@@ -2408,7 +2409,7 @@ + { case(ButtonPress): + { XButtonPressedEvent *ptr; + +- HeldButton = -1; ++ XHeldButton = -1; + ptr = (XButtonPressedEvent*)event; + + if( ptr->window==CanvWin ) +@@ -2421,11 +2422,11 @@ + } else if( ptr->window==XScrlWin ) + { ReDrawFlag |= RFRotateY; + if( ptr->x<16 ) +- { HeldButton = XScrlDial; +- HeldStep = -XScrlSkip; ++ { XHeldButton = XScrlDial; ++ XHeldStep = -XScrlSkip; + } else if( ptr->x>=XRange-16 ) +- { HeldButton = XScrlDial; +- HeldStep = XScrlSkip; ++ { XHeldButton = XScrlDial; ++ XHeldStep = XScrlSkip; + } else + { index = ptr->x-8; + #ifdef ORIG +@@ -2448,11 +2449,11 @@ + } else if( ptr->window==YScrlWin ) + { ReDrawFlag |= RFRotateX; + if( ptr->y<16 ) +- { HeldButton = YScrlDial; +- HeldStep = -YScrlSkip; ++ { XHeldButton = YScrlDial; ++ XHeldStep = -YScrlSkip; + } else if( ptr->y>=YRange-16 ) +- { HeldButton = YScrlDial; +- HeldStep = YScrlSkip; ++ { XHeldButton = YScrlDial; ++ XHeldStep = YScrlSkip; + } else + { index = ptr->y-8; + #ifdef ORIG +@@ -2482,7 +2483,7 @@ + if( ptr->window==CanvWin ) + { stat = GetStatus(ptr->state); + ProcessMouseMove(ptr->x,ptr->y,stat); +- } else if( HeldButton == -1 ) ++ } else if( XHeldButton == -1 ) + { if( ptr->window==XScrlWin ) + { index = ptr->x-8; + NewScrlX = CropRange(index,16,XRange-32); +@@ -2496,9 +2497,9 @@ + case(ButtonRelease): + { XButtonReleasedEvent *ptr; + +- if( HeldButton != -1 ) ++ if( XHeldButton != -1 ) + { /* Three button emulation fix! */ +- DoneEvents(); HeldButton = -1; ++ DoneEvents(); XHeldButton = -1; + } + + ptr = (XButtonReleasedEvent*)event; +@@ -2671,7 +2672,7 @@ + GrabModeAsync,GrabModeAsync, + None,None,CurrentTime); + +- HeldButton = -1; ++ XHeldButton = -1; + MenuFocus = True; + DrawMenuBar(); + +@@ -2812,7 +2813,7 @@ + NewScrlX = ScrlX; + NewScrlY = ScrlY; + +- if( HeldButton != -1 ) wait = False; ++ if( XHeldButton != -1 ) wait = False; + while( XPending(dpy) || (wait && !ReDrawFlag) ) + { XNextEvent( dpy, &event ); + result = ProcessEvent(&event); ++++++ rasmol-upstream_version_2.7.3.1.patch ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:02.000000000 +0100 @@ -1,171 +1,120 @@ -*** src/rasmol.h Thu Apr 28 18:57:25 2005 ---- src/rasmol.h Fri Apr 21 22:42:29 2006 -*************** -*** 152,160 **** - /*==============================*/ - - #define MAIN_COPYRIGHT "Copyright (C) Roger Sayle 1992-1999" -! #define VERSION "2.7.3" -! #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2005" -! #define VER_DATE "January 2005" - - #ifndef True - #define True 1 ---- 152,160 ---- - /*==============================*/ - - #define MAIN_COPYRIGHT "Copyright (C) Roger Sayle 1992-1999" -! #define VERSION "2.7.3.1" -! #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2006" -! #define VER_DATE "April 2006" - - #ifndef True - #define True 1 -*** src/mac/RasMac.r Sat Feb 5 22:07:58 2005 ---- src/mac/RasMac.r Sat Apr 22 17:02:04 2006 -*************** -*** 835,852 **** - }; - - data 'vers' (1) { -! $"0273 4000 0000 0676 322E 372E 3340 5261" /* .s@....v2.7.3@Ra */ -! $"734D 6F6C 2076 3220 A920 522E 2053 6179" /* sMol v2 © R. Say */ -! $"6C65 3139 3932 2D31 3939 392C 0D32 2E37" /* le1992-1999,.2.7 */ -! $"2E33 20A9 2048 2E20 4A2E 2042 6572 6E73" /* .3 © H. J. Berns */ -! $"7465 696E 2031 3939 382D 3230 3035" /* tein 1998-2005 */ - }; - - data 'vers' (2) { -! $"0273 4000 0000 0676 322E 372E 3328 4D6F" /* .s@....v2.7.3(Mo */ -! $"6C65 6375 6C61 7220 4772 6170 6869 6373" /* lecular Graphics */ -! $"2050 726F 6772 616D 0D56 6572 7369 6F6E" /* Program.Version */ -! $"2032 2E37 2E33" /* 2.7.3 */ - }; - - data 'ICN#' (130) { ---- 835,853 ---- - }; - - data 'vers' (1) { -! $"0273 4001 0000 0876 322E 372E 332E 3142" /* .s@....v2.7.3.1B */ -! $"5261 734D 6F6C 2076 3220 A920 522E 2053" /* RasMol v2 © R. S */ -! $"6179 6C65 3139 3932 2D31 3939 392C 0D32" /* ayle1992-1999,.2 */ -! $"2E37 2E33 2E31 20A9 2048 2E20 4A2E 2042" /* .7.3.1 © H. J. B */ -! $"6572 6E73 7465 696E 2031 3939 382D 3230" /* ernstein 1998-20 */ -! $"3036" /* 06 */ - }; - - data 'vers' (2) { -! $"0273 4001 0000 0876 322E 372E 332E 312B" /* .s@....v2.7.3.1+ */ -! $"4D6F 6C65 6375 6C61 7220 4772 6170 6869" /* Molecular Graphi */ -! $"6373 2050 726F 6772 616D 0D56 6572 7369" /* cs Program.Versi */ -! $"6F6E 2032 2E37 2E33 2E31 60" /* on 2.7.3.1` */ - }; - - data 'ICN#' (130) { -*************** -*** 1393,1416 **** - $"00A0 0000 0000 000B 004E 001B 0148 8819" /* . .......N...H. */ - $"5261 734D 6163 204D 6F6C 6563 756C 6172" /* RasMac Molecular */ - $"2047 7261 7068 6963 7361 0000 0000 0034" /* Graphicsa.....4 */ -! $"0013 0044 010D 8817 4D61 6369 6E74 6F73" /* ...D...Macintos */ -! $"6820 5665 7273 696F 6E20 322E 372E 3300" /* h Version 2.7.3. */ -! $"0000 0000 0019 004D 0029 0147 881D 436F" /* .......M.).G.Co */ -! $"7079 7269 6768 7420 A920 522E 5361 796C" /* pyright © R.Sayl */ -! $"6520 3139 3932 2D31 3939 3900 0000 0000" /* e 1992-1999..... */ -! $"0075 0012 0085 0143 881D 3332 4D62 204D" /* .u... .C.32Mb M */ -! $"6163 696E 746F 7368 2020 284D 6163 4F53" /* acintosh (MacOS */ -! $"2037 2E36 2E31 2900 0000 0000 0085 0013" /* 7.6.1)...... .. */ -! $"0095 0144 8824 5050 4320 6F72 204D 4336" /* ..D$PPC or MC6 */ -! $"3830 3230 2077 6974 6820 6D61 7468 2063" /* 8020 with math c */ -! $"6F70 726F 6365 7373 6F72 0000 0000 0043" /* oprocessor.....C */ -! $"0013 0053 013F 8825 436F 7079 7269 6768" /* ...S.?%Copyrigh */ -! $"7420 A920 482E 204A 2E20 4265 726E 7374" /* t © H. J. Bernst */ -! $"6569 6E20 3139 3938 2D32 3030 3500 0000" /* ein 1998-2005... */ -! $"0000 005C 0013 006D 0139 8829 2268 656C" /* ...\...m.9)"hel */ -! $"7020 6E6F 7469 6365 7322 2066 6F72 206E" /* p notices" for n */ -! $"6F74 6963 6573 2061 6E64 2063 6F70 7972" /* otices and copyr */ -! $"6967 6874 7300" /* ights. */ - }; - - data 'DITL' (177) { ---- 1394,1417 ---- - $"00A0 0000 0000 000B 004E 001B 0148 8819" /* . .......N...H. */ - $"5261 734D 6163 204D 6F6C 6563 756C 6172" /* RasMac Molecular */ - $"2047 7261 7068 6963 7361 0000 0000 0034" /* Graphicsa.....4 */ -! $"0013 0044 010D 8819 4D61 6369 6E74 6F73" /* ...D...Macintos */ -! $"6820 5665 7273 696F 6E20 322E 372E 332E" /* h Version 2.7.3. */ -! $"3100 0000 0000 0019 004D 0029 0147 881D" /* 1........M.).G. */ -! $"436F 7079 7269 6768 7420 A920 522E 5361" /* Copyright © R.Sa */ -! $"796C 6520 3139 3932 2D31 3939 3900 0000" /* yle 1992-1999... */ -! $"0000 0075 0012 0085 0143 881D 3332 4D62" /* ...u... .C.32Mb */ -! $"204D 6163 696E 746F 7368 2020 284D 6163" /* Macintosh (Mac */ -! $"4F53 2037 2E36 2E31 2900 0000 0000 0085" /* OS 7.6.1)...... */ -! $"0013 0095 0144 8824 5050 4320 6F72 204D" /* ....D$PPC or M */ -! $"4336 3830 3230 2077 6974 6820 6D61 7468" /* C68020 with math */ -! $"2063 6F70 726F 6365 7373 6F72 0000 0000" /* coprocessor.... */ -! $"0043 0013 0053 013F 8825 436F 7079 7269" /* .C...S.?%Copyri */ -! $"6768 7420 A920 482E 204A 2E20 4265 726E" /* ght © H. J. Bern */ -! $"7374 6569 6E20 3139 3938 2D32 3030 3600" /* stein 1998-2006. */ -! $"0000 0000 005C 0013 006D 0139 8829 2268" /* .....\...m.9)"h */ -! $"656C 7020 6E6F 7469 6365 7322 2066 6F72" /* elp notices" for */ -! $"206E 6F74 6963 6573 2061 6E64 2063 6F70" /* notices and cop */ -! $"7972 6967 6874 7300" /* yrights. */ - }; - - data 'DITL' (177) { -*************** -*** 1431,1437 **** - $"7563 7469 6F6E 2E00 0000 0000 0028 004D" /* uction.......(.M */ - $"0038 0147 8821 436F 7079 7269 6768 7420" /* .8.G!Copyright */ - $"A920 482E 4265 726E 7374 6569 6E20 3139" /* © H.Bernstein 19 */ -! $"3938 2D32 3030 3500" /* 98-2005. */ - }; - - data 'CNTL' (172) { ---- 1432,1438 ---- - $"7563 7469 6F6E 2E00 0000 0000 0028 004D" /* uction.......(.M */ - $"0038 0147 8821 436F 7079 7269 6768 7420" /* .8.G!Copyright */ - $"A920 482E 4265 726E 7374 6569 6E20 3139" /* © H.Bernstein 19 */ -! $"3938 2D32 3030 3600" /* 98-2006. */ - }; - - data 'CNTL' (172) { -*** src/mswin/raswin.rc Sat Apr 22 18:35:16 2006 ---- src/mswin/raswin.rc Sat Apr 22 18:36:57 2006 -*************** -*** 114,121 **** - ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON - CTEXT "RasWin Molecular Graphics" -1, 25, 5, 125, 8 - CTEXT "Copyright (C) R.Sayle 1992-1999" -1, 0, 23, 150, 8 -! CTEXT "Windows Version 2.7.2.1.1" -1, 0, 32, 150, 8 -! CTEXT "Copyright (C) H. Bernstein 1998-2004" -1, 0, 41, 150, 8 - CTEXT "yaya@bernstein-plus-sons.com" -1, 0, 50, 150, 8 - CTEXT "" IDD_HARDWARE, 0, 68, 150, 8 - DEFPUSHBUTTON "OK" IDOK, 56, 88, 32, 14, WS_GROUP ---- 114,121 ---- - ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON - CTEXT "RasWin Molecular Graphics" -1, 25, 5, 125, 8 - CTEXT "Copyright (C) R.Sayle 1992-1999" -1, 0, 23, 150, 8 -! CTEXT "Windows Version 2.7.3.1 " -1, 0, 32, 150, 8 -! CTEXT "Copyright (C) H. Bernstein 1998-2006" -1, 0, 41, 150, 8 - CTEXT "yaya@bernstein-plus-sons.com" -1, 0, 50, 150, 8 - CTEXT "" IDD_HARDWARE, 0, 68, 150, 8 - DEFPUSHBUTTON "OK" IDOK, 56, 88, 32, 14, WS_GROUP -*************** -*** 129,135 **** - BEGIN - ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON - CTEXT "RasWin Molecular Graphics" -1, 25, 5, 175, 8 -! CTEXT "Windows Version 2.7.2.1.1" -1, 25, 14, 175, 8 - DEFPUSHBUTTON "OK" IDOK, 81, 96, 32, 14, WS_GROUP - - LTEXT "" IDD_INFOTEXT1, 0, 32, 200, 8, SS_LEFTNOWORDWRAP ---- 129,135 ---- - BEGIN - ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON - CTEXT "RasWin Molecular Graphics" -1, 25, 5, 175, 8 -! CTEXT "Windows Version 2.7.3.1 " -1, 25, 14, 175, 8 - DEFPUSHBUTTON "OK" IDOK, 81, 96, 32, 14, WS_GROUP - - LTEXT "" IDD_INFOTEXT1, 0, 32, 200, 8, SS_LEFTNOWORDWRAP +--- src/mac/RasMac.r ++++ src/mac/RasMac.r +@@ -835,18 +835,19 @@ + }; + + data 'vers' (1) { +- $"0273 4000 0000 0676 322E 372E 3340 5261" /* .s@....v2.7.3@Ra */ +- $"734D 6F6C 2076 3220 A920 522E 2053 6179" /* sMol v2 © R. Say */ +- $"6C65 3139 3932 2D31 3939 392C 0D32 2E37" /* le1992-1999,.2.7 */ +- $"2E33 20A9 2048 2E20 4A2E 2042 6572 6E73" /* .3 © H. J. Berns */ +- $"7465 696E 2031 3939 382D 3230 3035" /* tein 1998-2005 */ ++ $"0273 4001 0000 0876 322E 372E 332E 3142" /* .s@....v2.7.3.1B */ ++ $"5261 734D 6F6C 2076 3220 A920 522E 2053" /* RasMol v2 © R. S */ ++ $"6179 6C65 3139 3932 2D31 3939 392C 0D32" /* ayle1992-1999,.2 */ ++ $"2E37 2E33 2E31 20A9 2048 2E20 4A2E 2042" /* .7.3.1 © H. J. B */ ++ $"6572 6E73 7465 696E 2031 3939 382D 3230" /* ernstein 1998-20 */ ++ $"3036" /* 06 */ + }; + + data 'vers' (2) { +- $"0273 4000 0000 0676 322E 372E 3328 4D6F" /* .s@....v2.7.3(Mo */ +- $"6C65 6375 6C61 7220 4772 6170 6869 6373" /* lecular Graphics */ +- $"2050 726F 6772 616D 0D56 6572 7369 6F6E" /* Program.Version */ +- $"2032 2E37 2E33" /* 2.7.3 */ ++ $"0273 4001 0000 0876 322E 372E 332E 312B" /* .s@....v2.7.3.1+ */ ++ $"4D6F 6C65 6375 6C61 7220 4772 6170 6869" /* Molecular Graphi */ ++ $"6373 2050 726F 6772 616D 0D56 6572 7369" /* cs Program.Versi */ ++ $"6F6E 2032 2E37 2E33 2E31 60" /* on 2.7.3.1` */ + }; + + data 'ICN#' (130) { +@@ -1393,24 +1394,24 @@ + $"00A0 0000 0000 000B 004E 001B 0148 8819" /* . .......N...H. */ + $"5261 734D 6163 204D 6F6C 6563 756C 6172" /* RasMac Molecular */ + $"2047 7261 7068 6963 7361 0000 0000 0034" /* Graphicsa.....4 */ +- $"0013 0044 010D 8817 4D61 6369 6E74 6F73" /* ...D...Macintos */ +- $"6820 5665 7273 696F 6E20 322E 372E 3300" /* h Version 2.7.3. */ +- $"0000 0000 0019 004D 0029 0147 881D 436F" /* .......M.).G.Co */ +- $"7079 7269 6768 7420 A920 522E 5361 796C" /* pyright © R.Sayl */ +- $"6520 3139 3932 2D31 3939 3900 0000 0000" /* e 1992-1999..... */ +- $"0075 0012 0085 0143 881D 3332 4D62 204D" /* .u... .C.32Mb M */ +- $"6163 696E 746F 7368 2020 284D 6163 4F53" /* acintosh (MacOS */ +- $"2037 2E36 2E31 2900 0000 0000 0085 0013" /* 7.6.1)...... .. */ +- $"0095 0144 8824 5050 4320 6F72 204D 4336" /* ..D$PPC or MC6 */ +- $"3830 3230 2077 6974 6820 6D61 7468 2063" /* 8020 with math c */ +- $"6F70 726F 6365 7373 6F72 0000 0000 0043" /* oprocessor.....C */ +- $"0013 0053 013F 8825 436F 7079 7269 6768" /* ...S.?%Copyrigh */ +- $"7420 A920 482E 204A 2E20 4265 726E 7374" /* t © H. J. Bernst */ +- $"6569 6E20 3139 3938 2D32 3030 3500 0000" /* ein 1998-2005... */ +- $"0000 005C 0013 006D 0139 8829 2268 656C" /* ...\...m.9)"hel */ +- $"7020 6E6F 7469 6365 7322 2066 6F72 206E" /* p notices" for n */ +- $"6F74 6963 6573 2061 6E64 2063 6F70 7972" /* otices and copyr */ +- $"6967 6874 7300" /* ights. */ ++ $"0013 0044 010D 8819 4D61 6369 6E74 6F73" /* ...D...Macintos */ ++ $"6820 5665 7273 696F 6E20 322E 372E 332E" /* h Version 2.7.3. */ ++ $"3100 0000 0000 0019 004D 0029 0147 881D" /* 1........M.).G. */ ++ $"436F 7079 7269 6768 7420 A920 522E 5361" /* Copyright © R.Sa */ ++ $"796C 6520 3139 3932 2D31 3939 3900 0000" /* yle 1992-1999... */ ++ $"0000 0075 0012 0085 0143 881D 3332 4D62" /* ...u... .C.32Mb */ ++ $"204D 6163 696E 746F 7368 2020 284D 6163" /* Macintosh (Mac */ ++ $"4F53 2037 2E36 2E31 2900 0000 0000 0085" /* OS 7.6.1)...... */ ++ $"0013 0095 0144 8824 5050 4320 6F72 204D" /* ....D$PPC or M */ ++ $"4336 3830 3230 2077 6974 6820 6D61 7468" /* C68020 with math */ ++ $"2063 6F70 726F 6365 7373 6F72 0000 0000" /* coprocessor.... */ ++ $"0043 0013 0053 013F 8825 436F 7079 7269" /* .C...S.?%Copyri */ ++ $"6768 7420 A920 482E 204A 2E20 4265 726E" /* ght © H. J. Bern */ ++ $"7374 6569 6E20 3139 3938 2D32 3030 3600" /* stein 1998-2006. */ ++ $"0000 0000 005C 0013 006D 0139 8829 2268" /* .....\...m.9)"h */ ++ $"656C 7020 6E6F 7469 6365 7322 2066 6F72" /* elp notices" for */ ++ $"206E 6F74 6963 6573 2061 6E64 2063 6F70" /* notices and cop */ ++ $"7972 6967 6874 7300" /* yrights. */ + }; + + data 'DITL' (177) { +@@ -1431,7 +1432,7 @@ + $"7563 7469 6F6E 2E00 0000 0000 0028 004D" /* uction.......(.M */ + $"0038 0147 8821 436F 7079 7269 6768 7420" /* .8.G!Copyright */ + $"A920 482E 4265 726E 7374 6569 6E20 3139" /* © H.Bernstein 19 */ +- $"3938 2D32 3030 3500" /* 98-2005. */ ++ $"3938 2D32 3030 3600" /* 98-2006. */ + }; + + data 'CNTL' (172) { +--- src/mswin/raswin.rc ++++ src/mswin/raswin.rc +@@ -114,8 +114,8 @@ + ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON + CTEXT "RasWin Molecular Graphics" -1, 25, 5, 125, 8 + CTEXT "Copyright (C) R.Sayle 1992-1999" -1, 0, 23, 150, 8 +- CTEXT "Windows Version 2.7.2.1.1" -1, 0, 32, 150, 8 +- CTEXT "Copyright (C) H. Bernstein 1998-2004" -1, 0, 41, 150, 8 ++ CTEXT "Windows Version 2.7.3.1 " -1, 0, 32, 150, 8 ++ CTEXT "Copyright (C) H. Bernstein 1998-2006" -1, 0, 41, 150, 8 + CTEXT "yaya@bernstein-plus-sons.com" -1, 0, 50, 150, 8 + CTEXT "" IDD_HARDWARE, 0, 68, 150, 8 + DEFPUSHBUTTON "OK" IDOK, 56, 88, 32, 14, WS_GROUP +@@ -129,7 +129,7 @@ + BEGIN + ICON "RasWinIcon" -1, 2, 2, 0, 0, SS_ICON + CTEXT "RasWin Molecular Graphics" -1, 25, 5, 175, 8 +- CTEXT "Windows Version 2.7.2.1.1" -1, 25, 14, 175, 8 ++ CTEXT "Windows Version 2.7.3.1 " -1, 25, 14, 175, 8 + DEFPUSHBUTTON "OK" IDOK, 81, 96, 32, 14, WS_GROUP + + LTEXT "" IDD_INFOTEXT1, 0, 32, 200, 8, SS_LEFTNOWORDWRAP +--- src/rasmol.h ++++ src/rasmol.h +@@ -152,9 +152,9 @@ + /*==============================*/ + + #define MAIN_COPYRIGHT "Copyright (C) Roger Sayle 1992-1999" +-#define VERSION "2.7.3" +-#define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2005" +-#define VER_DATE "January 2005" ++#define VERSION "2.7.3.1" ++#define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2006" ++#define VER_DATE "April 2006" + + #ifndef True + #define True 1 ++++++ rasmol-upstream_ztrl.patch ++++++ --- /var/tmp/diff_new_pack.k3DfaG/_old 2006-11-08 18:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k3DfaG/_new 2006-11-08 18:39:02.000000000 +0100 @@ -1,280 +1,152 @@ -*** src/abstree.c 2005/07/16 14:40:23 1.2 ---- src/abstree.c 2005/07/16 14:47:46 -*************** -*** 1353,1359 **** - ay = atm2->yorg - atm1->yorg + atm2->fyorg - atm1->fyorg - + (double)(atm2->ytrl - atm1->ytrl)/40.; - az = atm2->zorg - atm1->zorg + atm2->fzorg - atm1->fzorg -! - (double)(atm2->ztrl - atm1->ztrl)/40.; - if( !ax && !ay && !az ) - return 0.0; - ---- 1353,1359 ---- - ay = atm2->yorg - atm1->yorg + atm2->fyorg - atm1->fyorg - + (double)(atm2->ytrl - atm1->ytrl)/40.; - az = atm2->zorg - atm1->zorg + atm2->fzorg - atm1->fzorg -! + (double)(atm2->ztrl - atm1->ztrl)/40.; - if( !ax && !ay && !az ) - return 0.0; - -*************** -*** 1362,1368 **** - by = atm3->yorg - atm2->yorg + atm3->fyorg - atm2->fyorg - + (double)(atm3->ytrl - atm2->ytrl)/40.; - bz = atm3->zorg - atm2->zorg + atm3->fzorg - atm2->fzorg -! - (double)(atm3->ztrl - atm2->ztrl)/40.; - if( !bx && !by && !bz ) - return 0.0; - ---- 1362,1368 ---- - by = atm3->yorg - atm2->yorg + atm3->fyorg - atm2->fyorg - + (double)(atm3->ytrl - atm2->ytrl)/40.; - bz = atm3->zorg - atm2->zorg + atm3->fzorg - atm2->fzorg -! + (double)(atm3->ztrl - atm2->ztrl)/40.; - if( !bx && !by && !bz ) - return 0.0; - -*************** -*** 1371,1377 **** - cy = atm4->yorg - atm3->yorg + atm4->fyorg - atm3->fyorg - + (double)(atm4->ytrl - atm3->ytrl)/40.; - cz = atm4->zorg - atm3->zorg + atm4->fzorg - atm3->fzorg -! - (double)(atm4->ztrl - atm3->ztrl)/40.; - if( !cx && !cy && !cz ) - return 0.0; - ---- 1371,1377 ---- - cy = atm4->yorg - atm3->yorg + atm4->fyorg - atm3->fyorg - + (double)(atm4->ytrl - atm3->ytrl)/40.; - cz = atm4->zorg - atm3->zorg + atm4->fzorg - atm3->fzorg -! + (double)(atm4->ztrl - atm3->ztrl)/40.; - if( !cx && !cy && !cz ) - return 0.0; - -*************** -*** 1567,1573 **** - y = (double)(ptr->atm->yorg + ptr->atm->fyorg + OrigCY)/250.0 - +(double)(ptr->atm->ytrl)/10000.0; - z = (double)(ptr->atm->zorg + ptr->atm->fzorg + OrigCZ)/250.0 -! -(double)(ptr->atm->ztrl)/10000.0; - - #ifdef INVERT - sprintf(eptr, "\n Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); ---- 1567,1573 ---- - y = (double)(ptr->atm->yorg + ptr->atm->fyorg + OrigCY)/250.0 - +(double)(ptr->atm->ytrl)/10000.0; - z = (double)(ptr->atm->zorg + ptr->atm->fzorg + OrigCZ)/250.0 -! +(double)(ptr->atm->ztrl)/10000.0; - - #ifdef INVERT - sprintf(eptr, "\n Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); -*** src/infile.c 2005/07/16 14:40:23 1.2 ---- src/infile.c 2005/07/16 14:45:10 -*************** -*** 3050,3056 **** - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! -(double)(aptr->ztrl)/10000.0; - - #ifdef INVERT - fprintf(DataFile,"%8.3f%8.3f%8.3f",x,-y,-z); ---- 3050,3056 ---- - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! +(double)(aptr->ztrl)/10000.0; - - #ifdef INVERT - fprintf(DataFile,"%8.3f%8.3f%8.3f",x,-y,-z); -*************** -*** 3137,3143 **** - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! -(double)(aptr->ztrl)/10000.0; - #ifdef INVERT - #ifdef __STDC__ - fprintf(DataFile,"%10.4f%10.4f%10.4f ",x,-y,-z); ---- 3137,3143 ---- - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! +(double)(aptr->ztrl)/10000.0; - #ifdef INVERT - #ifdef __STDC__ - fprintf(DataFile,"%10.4f%10.4f%10.4f ",x,-y,-z); -*************** -*** 3290,3296 **** - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! -(double)(aptr->ztrl)/10000.0; - - /* Apply Current Viewpoint Rotation Matrix */ - xpos = (float)(x*RotX[0] + y*RotX[1] + z*RotX[2]); ---- 3290,3296 ---- - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! +(double)(aptr->ztrl)/10000.0; - - /* Apply Current Viewpoint Rotation Matrix */ - xpos = (float)(x*RotX[0] + y*RotX[1] + z*RotX[2]); -*************** -*** 3368,3374 **** - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! -(double)(aptr->ztrl)/10000.0; - - #ifdef INVERT - fprintf(DataFile," %8.3f %8.3f %8.3f",x,-y,-z); ---- 3368,3374 ---- - y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 - +(double)(aptr->ytrl)/10000.0; - z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 -! +(double)(aptr->ztrl)/10000.0; - - #ifdef INVERT - fprintf(DataFile," %8.3f %8.3f %8.3f",x,-y,-z); -*** src/render.c 2005/07/16 14:40:23 1.2 ---- src/render.c 2005/07/16 14:48:21 -*************** -*** 2015,2021 **** - y = (double)(QAtom->yorg + QAtom->fyorg + OrigCY)/250.0 - +(double)(QAtom->ytrl)/10000.0; - z = (double)(QAtom->zorg + QAtom->fzorg + OrigCZ)/250.0 -! -(double)(QAtom->ztrl)/10000.0; - - #ifdef INVERT - sprintf(buffer, " Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); ---- 2015,2021 ---- - y = (double)(QAtom->yorg + QAtom->fyorg + OrigCY)/250.0 - +(double)(QAtom->ytrl)/10000.0; - z = (double)(QAtom->zorg + QAtom->fzorg + OrigCZ)/250.0 -! +(double)(QAtom->ztrl)/10000.0; - - #ifdef INVERT - sprintf(buffer, " Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); -*** src/script.c 2005/07/16 14:40:23 1.2 ---- src/script.c 2005/07/16 14:54:20 -*************** -*** 1397,1403 **** - fprintf(OutFile," P %g %g %g\n", - (src->xorg + src->fxorg + src->xtrl/40. + OrigCX)/250.0, - RestoreY((src->yorg + src->fyorg + src->ytrl/40. + OrigCY))/250.0, -! -(src->zorg + src->fzorg - src->ztrl/40. + OrigCZ)/250.0 ); - } - - if( col1 != col2 ) ---- 1397,1403 ---- - fprintf(OutFile," P %g %g %g\n", - (src->xorg + src->fxorg + src->xtrl/40. + OrigCX)/250.0, - RestoreY((src->yorg + src->fyorg + src->ytrl/40. + OrigCY))/250.0, -! -(src->zorg + src->fzorg + src->ztrl/40. + OrigCZ)/250.0 ); - } - - if( col1 != col2 ) -*************** -*** 1405,1411 **** - (src->xtrl + dst->xtrl)/40. + OrigCX + OrigCX)/500.0; - y = (src->yorg + dst->yorg + src->fyorg + dst->fyorg + - (src->ytrl + dst->ytrl)/40. + OrigCY + OrigCY)/500.0; -! z = (src->zorg + dst->zorg + src->fzorg + dst->fzorg - - (src->ztrl + dst->ztrl)/40. + OrigCZ + OrigCZ)/500.0; - - fprintf(OutFile,"{} L %g %g %g\n", x, RestoreY(y), -z ); ---- 1405,1411 ---- - (src->xtrl + dst->xtrl)/40. + OrigCX + OrigCX)/500.0; - y = (src->yorg + dst->yorg + src->fyorg + dst->fyorg + - (src->ytrl + dst->ytrl)/40. + OrigCY + OrigCY)/500.0; -! z = (src->zorg + dst->zorg + src->fzorg + dst->fzorg + - (src->ztrl + dst->ztrl)/40. + OrigCZ + OrigCZ)/500.0; - - fprintf(OutFile,"{} L %g %g %g\n", x, RestoreY(y), -z ); -*************** -*** 1420,1426 **** - fprintf(OutFile," L %g %g %g\n", - (dst->xorg + dst->fxorg + dst->xtrl/40. + OrigCX)/250.0, - RestoreY((dst->yorg + dst->fyorg + dst->ytrl/40. + OrigCY))/250.0, -! -(dst->zorg + dst->fzorg - dst->ztrl/40. + OrigCZ)/250.0 ); - - MagePrev = dst; - MageCol = col2; ---- 1420,1426 ---- - fprintf(OutFile," L %g %g %g\n", - (dst->xorg + dst->fxorg + dst->xtrl/40. + OrigCX)/250.0, - RestoreY((dst->yorg + dst->fyorg + dst->ytrl/40. + OrigCY))/250.0, -! -(dst->zorg + dst->fzorg + dst->ztrl/40. + OrigCZ)/250.0 ); - - MagePrev = dst; - MageCol = col2; -*************** -*** 1837,1843 **** - y = (double)(aptr->yorg + aptr->fyorg)/250.0 - + (double)(aptr->ytrl)/10000.; - z = (double)(aptr->zorg + aptr->fzorg)/250.0 -! - (double)(aptr->ztrl)/10000.; - #ifdef __STDC__ - fprintf(OutFile,"object {sphere {<%g, %g, %g> %g}\n", - #else ---- 1837,1843 ---- - y = (double)(aptr->yorg + aptr->fyorg)/250.0 - + (double)(aptr->ytrl)/10000.; - z = (double)(aptr->zorg + aptr->fzorg)/250.0 -! + (double)(aptr->ztrl)/10000.; - #ifdef __STDC__ - fprintf(OutFile,"object {sphere {<%g, %g, %g> %g}\n", - #else -*************** -*** 1927,1933 **** - y = (double)(aptr->yorg + aptr->fyorg)/250.0 - + (double)(aptr->ytrl)/10000.; - z = -(double)(aptr->zorg + aptr->fzorg)/250.0 -! + (double)(aptr->ztrl)/10000.; - - fputs(" Translation { translation ",OutFile); - WriteVRMLTriple(x-ox,RestoreY(y-oy),z-oz); ---- 1927,1933 ---- - y = (double)(aptr->yorg + aptr->fyorg)/250.0 - + (double)(aptr->ytrl)/10000.; - z = -(double)(aptr->zorg + aptr->fzorg)/250.0 -! - (double)(aptr->ztrl)/10000.; - - fputs(" Translation { translation ",OutFile); - WriteVRMLTriple(x-ox,RestoreY(y-oy),z-oz); -*************** -*** 2006,2012 **** - y = (double)(dst->yorg + dst->fyorg)/250.0 - + (double)(dst->ytrl)/10000.; - z = -(double)(dst->zorg + dst->fzorg)/250.0 -! + (double)(dst->ztrl)/10000.; - - fputs(" ",OutFile); - WriteVRMLTriple(x,RestoreY(y),z); ---- 2006,2012 ---- - y = (double)(dst->yorg + dst->fyorg)/250.0 - + (double)(dst->ytrl)/10000.; - z = -(double)(dst->zorg + dst->fzorg)/250.0 -! - (double)(dst->ztrl)/10000.; - - fputs(" ",OutFile); - WriteVRMLTriple(x,RestoreY(y),z); -*************** -*** 2023,2029 **** - +(double)(src->ytrl + dst->ytrl)/20000.; - z = -(double)(src->zorg + dst->zorg + - src->fzorg + dst->fzorg)/500.0 -! +(double)(src->ztrl + dst->ztrl)/20000.; - - fputs(" ",OutFile); - WriteVRMLTriple(x,RestoreY(y),z); ---- 2023,2029 ---- - +(double)(src->ytrl + dst->ytrl)/20000.; - z = -(double)(src->zorg + dst->zorg + - src->fzorg + dst->fzorg)/500.0 -! -(double)(src->ztrl + dst->ztrl)/20000.; - - fputs(" ",OutFile); - WriteVRMLTriple(x,RestoreY(y),z); +--- src/abstree.c ++++ src/abstree.c +@@ -1353,7 +1353,7 @@ + ay = atm2->yorg - atm1->yorg + atm2->fyorg - atm1->fyorg + + (double)(atm2->ytrl - atm1->ytrl)/40.; + az = atm2->zorg - atm1->zorg + atm2->fzorg - atm1->fzorg +- - (double)(atm2->ztrl - atm1->ztrl)/40.; ++ + (double)(atm2->ztrl - atm1->ztrl)/40.; + if( !ax && !ay && !az ) + return 0.0; + +@@ -1362,7 +1362,7 @@ + by = atm3->yorg - atm2->yorg + atm3->fyorg - atm2->fyorg + + (double)(atm3->ytrl - atm2->ytrl)/40.; + bz = atm3->zorg - atm2->zorg + atm3->fzorg - atm2->fzorg +- - (double)(atm3->ztrl - atm2->ztrl)/40.; ++ + (double)(atm3->ztrl - atm2->ztrl)/40.; + if( !bx && !by && !bz ) + return 0.0; + +@@ -1371,7 +1371,7 @@ + cy = atm4->yorg - atm3->yorg + atm4->fyorg - atm3->fyorg + + (double)(atm4->ytrl - atm3->ytrl)/40.; + cz = atm4->zorg - atm3->zorg + atm4->fzorg - atm3->fzorg +- - (double)(atm4->ztrl - atm3->ztrl)/40.; ++ + (double)(atm4->ztrl - atm3->ztrl)/40.; + if( !cx && !cy && !cz ) + return 0.0; + +@@ -1567,7 +1567,7 @@ + y = (double)(ptr->atm->yorg + ptr->atm->fyorg + OrigCY)/250.0 + +(double)(ptr->atm->ytrl)/10000.0; + z = (double)(ptr->atm->zorg + ptr->atm->fzorg + OrigCZ)/250.0 +- -(double)(ptr->atm->ztrl)/10000.0; ++ +(double)(ptr->atm->ztrl)/10000.0; + + #ifdef INVERT + sprintf(eptr, "\n Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); +--- src/infile.c ++++ src/infile.c +@@ -3047,7 +3047,7 @@ + y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 + +(double)(aptr->ytrl)/10000.0; + z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 +- -(double)(aptr->ztrl)/10000.0; ++ +(double)(aptr->ztrl)/10000.0; + + #ifdef INVERT + fprintf(DataFile,"%8.3f%8.3f%8.3f",x,-y,-z); +@@ -3134,7 +3134,7 @@ + y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 + +(double)(aptr->ytrl)/10000.0; + z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 +- -(double)(aptr->ztrl)/10000.0; ++ +(double)(aptr->ztrl)/10000.0; + #ifdef INVERT + #ifdef __STDC__ + fprintf(DataFile,"%10.4f%10.4f%10.4f ",x,-y,-z); +@@ -3287,7 +3287,7 @@ + y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 + +(double)(aptr->ytrl)/10000.0; + z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 +- -(double)(aptr->ztrl)/10000.0; ++ +(double)(aptr->ztrl)/10000.0; + + /* Apply Current Viewpoint Rotation Matrix */ + xpos = (float)(x*RotX[0] + y*RotX[1] + z*RotX[2]); +@@ -3365,7 +3365,7 @@ + y = (double)(aptr->yorg + aptr->fyorg + OrigCY)/250.0 + +(double)(aptr->ytrl)/10000.0; + z = (double)(aptr->zorg + aptr->fzorg + OrigCZ)/250.0 +- -(double)(aptr->ztrl)/10000.0; ++ +(double)(aptr->ztrl)/10000.0; + + #ifdef INVERT + fprintf(DataFile," %8.3f %8.3f %8.3f",x,-y,-z); +--- src/render.c ++++ src/render.c +@@ -2012,7 +2012,7 @@ + y = (double)(QAtom->yorg + QAtom->fyorg + OrigCY)/250.0 + +(double)(QAtom->ytrl)/10000.0; + z = (double)(QAtom->zorg + QAtom->fzorg + OrigCZ)/250.0 +- -(double)(QAtom->ztrl)/10000.0; ++ +(double)(QAtom->ztrl)/10000.0; + + #ifdef INVERT + sprintf(buffer, " Coordinates: %9.3f %9.3f %9.3f\n",x,-y,-z); +--- src/script.c ++++ src/script.c +@@ -1394,7 +1394,7 @@ + fprintf(OutFile," P %g %g %g\n", + (src->xorg + src->fxorg + src->xtrl/40. + OrigCX)/250.0, + RestoreY((src->yorg + src->fyorg + src->ytrl/40. + OrigCY))/250.0, +- -(src->zorg + src->fzorg - src->ztrl/40. + OrigCZ)/250.0 ); ++ -(src->zorg + src->fzorg + src->ztrl/40. + OrigCZ)/250.0 ); + } + + if( col1 != col2 ) +@@ -1402,7 +1402,7 @@ + (src->xtrl + dst->xtrl)/40. + OrigCX + OrigCX)/500.0; + y = (src->yorg + dst->yorg + src->fyorg + dst->fyorg + + (src->ytrl + dst->ytrl)/40. + OrigCY + OrigCY)/500.0; +- z = (src->zorg + dst->zorg + src->fzorg + dst->fzorg - ++ z = (src->zorg + dst->zorg + src->fzorg + dst->fzorg + + (src->ztrl + dst->ztrl)/40. + OrigCZ + OrigCZ)/500.0; + + fprintf(OutFile,"{} L %g %g %g\n", x, RestoreY(y), -z ); +@@ -1417,7 +1417,7 @@ + fprintf(OutFile," L %g %g %g\n", + (dst->xorg + dst->fxorg + dst->xtrl/40. + OrigCX)/250.0, + RestoreY((dst->yorg + dst->fyorg + dst->ytrl/40. + OrigCY))/250.0, +- -(dst->zorg + dst->fzorg - dst->ztrl/40. + OrigCZ)/250.0 ); ++ -(dst->zorg + dst->fzorg + dst->ztrl/40. + OrigCZ)/250.0 ); + + MagePrev = dst; + MageCol = col2; +@@ -1834,7 +1834,7 @@ + y = (double)(aptr->yorg + aptr->fyorg)/250.0 + + (double)(aptr->ytrl)/10000.; + z = (double)(aptr->zorg + aptr->fzorg)/250.0 +- - (double)(aptr->ztrl)/10000.; ++ + (double)(aptr->ztrl)/10000.; + #ifdef __STDC__ + fprintf(OutFile,"object {sphere {<%g, %g, %g> %g}\n", + #else +@@ -1924,7 +1924,7 @@ + y = (double)(aptr->yorg + aptr->fyorg)/250.0 + + (double)(aptr->ytrl)/10000.; + z = -(double)(aptr->zorg + aptr->fzorg)/250.0 +- + (double)(aptr->ztrl)/10000.; ++ - (double)(aptr->ztrl)/10000.; + + fputs(" Translation { translation ",OutFile); + WriteVRMLTriple(x-ox,RestoreY(y-oy),z-oz); +@@ -2003,7 +2003,7 @@ + y = (double)(dst->yorg + dst->fyorg)/250.0 + + (double)(dst->ytrl)/10000.; + z = -(double)(dst->zorg + dst->fzorg)/250.0 +- + (double)(dst->ztrl)/10000.; ++ - (double)(dst->ztrl)/10000.; + + fputs(" ",OutFile); + WriteVRMLTriple(x,RestoreY(y),z); +@@ -2020,7 +2020,7 @@ + +(double)(src->ytrl + dst->ytrl)/20000.; + z = -(double)(src->zorg + dst->zorg + + src->fzorg + dst->fzorg)/500.0 +- +(double)(src->ztrl + dst->ztrl)/20000.; ++ -(double)(src->ztrl + dst->ztrl)/20000.; + + fputs(" ",OutFile); + WriteVRMLTriple(x,RestoreY(y),z); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de